Moved calls to level.Render and SwapBuffers into DrawGLScene method which will probably be renamed.
Fixed a syntax error where String was used instead of string. ~g2k
This commit is contained in:
@@ -58,19 +58,14 @@ void ResizeGLScene(GLsizei width, GLsizei height)
|
|||||||
|
|
||||||
int DrawGLScene()
|
int DrawGLScene()
|
||||||
{
|
{
|
||||||
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
|
level.Render();
|
||||||
glLoadIdentity();
|
|
||||||
glTranslatef(-1.5f, 0.0f, -6.0f);
|
//Maybe this should be integrated into the Window class
|
||||||
glBegin(GL_TRIANGLES);
|
|
||||||
glVertex3f(0.0f, 1.0f, 0.0f);
|
|
||||||
glVertex3f(-1.0f, -1.0f, 0.0f);
|
|
||||||
glVertex3f(1.0f, 1.0f, 0.0f);
|
|
||||||
glEnd();
|
|
||||||
if(g_Screen.doubleBuffered)
|
if(g_Screen.doubleBuffered)
|
||||||
{
|
{
|
||||||
glXSwapBuffers(g_Screen.display, g_Screen.window);
|
glXSwapBuffers(g_Screen.display, g_Screen.window);
|
||||||
}
|
}
|
||||||
return 1;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
@@ -251,7 +246,7 @@ int main(int argc, char** argv)
|
|||||||
XEvent event;
|
XEvent event;
|
||||||
bool done = false;
|
bool done = false;
|
||||||
|
|
||||||
String commandLine = "";
|
string commandLine = "";
|
||||||
int i;
|
int i;
|
||||||
for(i=1; i<argc; i++)
|
for(i=1; i<argc; i++)
|
||||||
{
|
{
|
||||||
@@ -635,12 +630,11 @@ int main(int argc, char** argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
level.Render();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
SwapBuffers(hDC);
|
DrawGLScene();
|
||||||
|
|
||||||
if(keys[KEY_F1])
|
if(keys[KEY_F1])
|
||||||
{
|
{
|
||||||
keys[KEY_F1] = false;
|
keys[KEY_F1] = false;
|
||||||
|
|||||||
Reference in New Issue
Block a user