Hoikas/korman
4
4
Fork 0
mirror of https://github.com/H-uru/korman.git synced 2025-07-14 02:27:36 -04:00
Code Releases Activity

Move create_bump_LUT to top level korlib

Browse Source
This commit is contained in:
Darryl Pogue
2017-02-13 21:44:59 -08:00
parent 3753714cd6
commit 887700f472
8 changed files with 183 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
korlib/CMakeLists.txt
View File

@ -19,6 +19,7 @@ find_package(Vorbis REQUIRED)
# Da files
set(korlib_HEADERS
buffer.h
bumpmap.h
korlib.h
sound.h
texture.h
@ -26,6 +27,7 @@ set(korlib_HEADERS
set(korlib_SOURCES
buffer.cpp
bumpmap.cpp
module.cpp
sound.cpp
texture.cpp

113
korlib/bumpmap.cpp Normal file
View File

@ -0,0 +1,113 @@
/* This file is part of Korman.
*
* Korman is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Korman is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Korman. If not, see <http://www.gnu.org/licenses/>.
*/
#include "bumpmap.h"
#include <PRP/Surface/plMipmap.h>
static uint32_t MakeUInt32Color(float r, float g, float b, float a) {
return (uint32_t(a * 255.9f) << 24) |
(uint32_t(r * 255.9f) << 16) |
(uint32_t(g * 255.9f) << 8) |
(uint32_t(b * 255.9f) << 0);
}
typedef struct {
PyObject_HEAD
plMipmap* fThis;
bool fPyOwned;
} pyMipmap;
extern "C" {
PyObject* create_bump_LUT(PyObject*, PyObject* args) {
const int kLUTHeight = 16;
const int kLUTWidth = 16;
pyMipmap* pymipmap;
if (!PyArg_ParseTuple(args, "O", &pymipmap)) {
PyErr_SetString(PyExc_TypeError, "create_bump_LUT expects a plMipmap");
return NULL;
}
plMipmap* texture = plMipmap::Convert(pymipmap->fThis, false);
if (!texture) {
PyErr_SetString(PyExc_TypeError, "create_bump_LUT expects a plMipmap");
return NULL;
}
texture->Create(kLUTWidth, kLUTHeight, 1, plBitmap::kUncompressed, plBitmap::kRGB8888);
int delH = (kLUTHeight - 1) / 5;
int startH = delH / 2 + 1;
int doneH = 0;
uint8_t* data = new uint8_t[texture->getTotalSize()];
uint32_t* pix = (uint32_t*)data;
int i;
// Red ramps, one with G,B = 0,0, one with G,B = 127,127
for (i = 0; i < startH; ++i) {
for(int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.0f, 0.0f, 1.0f);
}
}
doneH = i;
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.5f, 0.5f, 1.0f);
}
}
doneH = i;
// Green ramps, one with R,B = 0,0, one with R,B = 127,127
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, x, 0.0f, 1.0f);
}
}
doneH = i;
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, x, 0.5f, 1.0f);
}
}
doneH = i;
// Blue ramps, one with R,G = 0,0, one with R,G = 127,127
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, 0.0f, x, 1.0f);
}
}
doneH = i;
for (i = i; i < kLUTHeight; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, 0.5f, x, 1.0f);
}
}
texture->setImageData(data, texture->getTotalSize());
Py_RETURN_NONE;
}
};

29
korlib/bumpmap.h Normal file
View File

@ -0,0 +1,29 @@
/* This file is part of Korman.
*
* Korman is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Korman is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Korman. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _KORLIB_BUMPMAP_H
#define _KORLIB_BUMPMAP_H
#include "korlib.h"
extern "C" {
PyObject* create_bump_LUT(PyObject*, PyObject* args);
};
#endif // _KORLIB_BUMPMAP_H

2
korlib/module.cpp
View File

@ -15,12 +15,14 @@
*/
#include "buffer.h"
#include "bumpmap.h"
#include "sound.h"
#include "texture.h"
extern "C" {
static PyMethodDef korlib_Methods[] = {
{ _pycs("create_bump_LUT"), (PyCFunction)create_bump_LUT, METH_VARARGS, NULL },
{ _pycs("inspect_vorbisfile"), (PyCFunction)inspect_vorbisfile, METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL },

88
korlib/texture.cpp
View File

@ -361,98 +361,10 @@ static PyObject* pyGLTexture_store_in_mipmap(pyGLTexture* self, PyObject* args)
Py_RETURN_NONE;
}
static uint32_t MakeUInt32Color(float r, float g, float b, float a)
{
return (uint32_t(a * 255.9f) << 24) |
(uint32_t(r * 255.9f) << 16) |
(uint32_t(g * 255.9f) << 8) |
(uint32_t(b * 255.9f) << 0);
}
static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args) {
const int kLUTHeight = 16;
const int kLUTWidth = 16;
pyMipmap* pymipmap;
if (!PyArg_ParseTuple(args, "O", &pymipmap)) {
PyErr_SetString(PyExc_TypeError, "create_bump_LUT expects a plMipmap");
return NULL;
}
plMipmap* texture = plMipmap::Convert(pymipmap->fThis, false);
if (!texture) {
PyErr_SetString(PyExc_TypeError, "create_bump_LUT expects a plMipmap");
return NULL;
}
texture->Create(kLUTWidth, kLUTHeight, 1, plBitmap::kUncompressed, plBitmap::kRGB8888);
int delH = (kLUTHeight - 1) / 5;
int startH = delH / 2 + 1;
int doneH = 0;
uint8_t* data = new uint8_t[texture->getTotalSize()];
uint32_t* pix = (uint32_t*)data;
int i;
// Red ramps, one with G,B = 0,0, one with G,B = 127,127
for (i = 0; i < startH; ++i) {
for(int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.0f, 0.0f, 1.0f);
}
}
doneH = i;
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.5f, 0.5f, 1.0f);
}
}
doneH = i;
// Green ramps, one with R,B = 0,0, one with R,B = 127,127
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, x, 0.0f, 1.0f);
}
}
doneH = i;
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, x, 0.5f, 1.0f);
}
}
doneH = i;
// Blue ramps, one with R,G = 0,0, one with R,G = 127,127
for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, 0.0f, x, 1.0f);
}
}
doneH = i;
for (i = i; i < kLUTHeight; ++i) {
for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, 0.5f, x, 1.0f);
}
}
texture->setImageData(data, texture->getTotalSize());
Py_RETURN_NONE;
}
static PyMethodDef pyGLTexture_Methods[] = {
{ _pycs("__enter__"), (PyCFunction)pyGLTexture__enter__, METH_NOARGS, NULL },
{ _pycs("__exit__"), (PyCFunction)pyGLTexture__enter__, METH_VARARGS, NULL },
{ _pycs("create_bump_LUT"), (PyCFunction)pyGLTexture_create_bump_LUT, METH_STATIC | METH_VARARGS, NULL },
{ _pycs("generate_mipmap"), (PyCFunction)pyGLTexture_generate_mipmap, METH_NOARGS, NULL },
{ _pycs("get_level_data"), (PyCFunction)pyGLTexture_get_level_data, METH_KEYWORDS | METH_VARARGS, NULL },
{ _pycs("store_in_mipmap"), (PyCFunction)pyGLTexture_store_in_mipmap, METH_VARARGS, NULL },