Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved glEnable(GL_TEXTURE_2D) to fix issue 484

Browse Source
This commit is contained in:
Xawotihs
2010-10-09 10:08:59 +00:00
parent 62e0a789eb
commit 977257aee3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/Qtmain.cpp
+3 -4
View File
@@ -163,13 +163,12 @@ void JGEQtRenderer::initializeGL()
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); // Set Line Antialiasing glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); // Set Line Antialiasing
glEnable(GL_LINE_SMOOTH); // Enable it! glEnable(GL_LINE_SMOOTH); // Enable it!
glEnable(GL_TEXTURE_2D);
#endif #endif
glEnable(GL_CULL_FACE); // do not calculate inside of poly's glEnable(GL_CULL_FACE); // do not calculate inside of poly's
glFrontFace(GL_CCW); // counter clock-wise polygons are out glFrontFace(GL_CCW); // counter clock-wise polygons are out
glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -324,7 +323,7 @@ void JGEQtRenderer::keyPressEvent(QKeyEvent *event)
{ {
JGEToggleFullscreen(); JGEToggleFullscreen();
} }
g_engine->HoldKey_NoRepeat(event->key()); g_engine->HoldKey_NoRepeat((LocalKeySym)event->key());
event->accept(); event->accept();
QWidget::keyPressEvent(event); QWidget::keyPressEvent(event);
return; return;
@@ -332,7 +331,7 @@ void JGEQtRenderer::keyPressEvent(QKeyEvent *event)
void JGEQtRenderer::keyReleaseEvent(QKeyEvent *event) void JGEQtRenderer::keyReleaseEvent(QKeyEvent *event)
{ {
g_engine->ReleaseKey(event->key()); g_engine->ReleaseKey((LocalKeySym)event->key());
event->accept(); event->accept();
QWidget::keyReleaseEvent(event); QWidget::keyReleaseEvent(event);
return; return;