eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 11:09:18 +02:00
Code Issues 121 Wiki Activity

GLES fixes, update GLM, build fixes

Browse Source
This commit is contained in:
milek7
2018-10-17 16:00:26 +02:00
parent d16d96f2b2
commit 2ffdb35d0f
403 changed files with 32998 additions and 28034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
PyInt.cpp
View File

@@ -34,14 +34,41 @@ void render_task::run() {
&& tex.id != -1) {
::glBindTexture( GL_TEXTURE_2D, tex.id );
// build texture
glTexImage2D(
GL_TEXTURE_2D, 0,
GL_SRGB8,
PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0,
GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast<GLubyte const *>( PyString_AsString( output ) ) );
glGenerateMipmap(GL_TEXTURE_2D);
int w = PyInt_AsLong( outputwidth );
int h = PyInt_AsLong( outputheight );
const unsigned char *image = reinterpret_cast<const unsigned char *>( PyString_AsString( output ) );
// build texture
if (!Global.use_gles)
{
glTexImage2D(
GL_TEXTURE_2D, 0,
GL_SRGB8,
w, h, 0,
GL_RGB, GL_UNSIGNED_BYTE, image);
}
else
{
unsigned char *data = new unsigned char[w * h * 4];
for (int y = 0; y < h; y++)
for (int x = 0; x < w; x++)
{
data[(y * w + x) * 4 + 0] = image[(y * w + x) * 3 + 0];
data[(y * w + x) * 4 + 1] = image[(y * w + x) * 3 + 1];
data[(y * w + x) * 4 + 2] = image[(y * w + x) * 3 + 2];
data[(y * w + x) * 4 + 3] = 0xFF;
}
glTexImage2D(
GL_TEXTURE_2D, 0,
GL_SRGB8_ALPHA8,
w, h, 0,
GL_RGBA, GL_UNSIGNED_BYTE, data);
delete[] data;
}
glGenerateMipmap(GL_TEXTURE_2D);
glFlush();
}
if( outputheight != nullptr ) { Py_DECREF( outputheight ); }