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

Cleanup the C++ code

Browse Source
This commit is contained in:
Darryl Pogue
2016-12-30 20:39:31 -08:00
parent 2a693a03c2
commit 3753714cd6
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
korlib/texture.cpp
View File

@ -364,10 +364,10 @@ static PyObject* pyGLTexture_store_in_mipmap(pyGLTexture* self, PyObject* args)
static uint32_t MakeUInt32Color(float r, float g, float b, float a) static uint32_t MakeUInt32Color(float r, float g, float b, float a)
{ {
return (uint32_t(a * 255.9f) << 24) return (uint32_t(a * 255.9f) << 24) |
|(uint32_t(r * 255.9f) << 16) (uint32_t(r * 255.9f) << 16) |
|(uint32_t(g * 255.9f) << 8) (uint32_t(g * 255.9f) << 8) |
|(uint32_t(b * 255.9f) << 0); (uint32_t(b * 255.9f) << 0);
} }
static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args) { static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args) {
@ -392,19 +392,20 @@ static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args)
int startH = delH / 2 + 1; int startH = delH / 2 + 1;
int doneH = 0; int doneH = 0;
uint32_t* pix = (uint32_t*)const_cast<void*>(texture->getImageData()); uint8_t* data = new uint8_t[texture->getTotalSize()];
uint32_t* pix = (uint32_t*)data;
int i; int i;
// Red ramps, one with G,B = 0,0, one with G,B = 127,127 // Red ramps, one with G,B = 0,0, one with G,B = 127,127
for (i = 0; i < startH; i++) { for (i = 0; i < startH; ++i) {
for(int j = 0; j < kLUTWidth; j++) { for(int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.0f, 0.0f, 1.0f); *pix++ = MakeUInt32Color(x, 0.0f, 0.0f, 1.0f);
} }
} }
doneH = i; doneH = i;
for (i = i; i < doneH + delH; i++) { for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; j++) { for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(x, 0.5f, 0.5f, 1.0f); *pix++ = MakeUInt32Color(x, 0.5f, 0.5f, 1.0f);
} }
@ -412,15 +413,15 @@ static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args)
doneH = i; doneH = i;
// Green ramps, one with R,B = 0,0, one with R,B = 127,127 // Green ramps, one with R,B = 0,0, one with R,B = 127,127
for (i = i; i < doneH + delH; i++) { for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; j++) { for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, x, 0.0f, 1.0f); *pix++ = MakeUInt32Color(0.0f, x, 0.0f, 1.0f);
} }
} }
doneH = i; doneH = i;
for (i = i; i < doneH + delH; i++) { for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; j++) { for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, x, 0.5f, 1.0f); *pix++ = MakeUInt32Color(0.5f, x, 0.5f, 1.0f);
} }
@ -428,20 +429,22 @@ static PyObject* pyGLTexture_create_bump_LUT(pyGLTexture* self, PyObject* args)
doneH = i; doneH = i;
// Blue ramps, one with R,G = 0,0, one with R,G = 127,127 // Blue ramps, one with R,G = 0,0, one with R,G = 127,127
for (i = i; i < doneH + delH; i++) { for (i = i; i < doneH + delH; ++i) {
for (int j = 0; j < kLUTWidth; j++) { for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.0f, 0.0f, x, 1.0f); *pix++ = MakeUInt32Color(0.0f, 0.0f, x, 1.0f);
} }
} }
doneH = i; doneH = i;
for (i = i; i < kLUTHeight; i++) { for (i = i; i < kLUTHeight; ++i) {
for (int j = 0; j < kLUTWidth; j++) { for (int j = 0; j < kLUTWidth; ++j) {
float x = float(j) / (kLUTWidth - 1); float x = float(j) / (kLUTWidth - 1);
*pix++ = MakeUInt32Color(0.5f, 0.5f, x, 1.0f); *pix++ = MakeUInt32Color(0.5f, 0.5f, x, 1.0f);
} }
} }
texture->setImageData(data, texture->getTotalSize());
Py_RETURN_NONE; Py_RETURN_NONE;
} }
@ -449,10 +452,10 @@ static PyMethodDef pyGLTexture_Methods[] = {
{ _pycs("__enter__"), (PyCFunction)pyGLTexture__enter__, METH_NOARGS, NULL }, { _pycs("__enter__"), (PyCFunction)pyGLTexture__enter__, METH_NOARGS, NULL },
{ _pycs("__exit__"), (PyCFunction)pyGLTexture__enter__, METH_VARARGS, 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("generate_mipmap"), (PyCFunction)pyGLTexture_generate_mipmap, METH_NOARGS, NULL },
{ _pycs("get_level_data"), (PyCFunction)pyGLTexture_get_level_data, METH_KEYWORDS | METH_VARARGS, 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 }, { _pycs("store_in_mipmap"), (PyCFunction)pyGLTexture_store_in_mipmap, METH_VARARGS, NULL },
{ _pycs("create_bump_LUT"), (PyCFunction)pyGLTexture_create_bump_LUT, METH_STATIC | METH_VARARGS, NULL },
{ NULL, NULL, 0, NULL } { NULL, NULL, 0, NULL }
}; };