X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=51edee1a289e28dd437392c1f8bc969cb5787293;hb=acc0e37a142590af4d878d2b92e4e3a0d8c51653;hp=af0eb18561371085d221b4b53572ad92529dfe73;hpb=7de3125ca72d91329f0d4d0980635cf7355c3082;p=lugaru.git diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index af0eb18..51edee1 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -40,7 +40,6 @@ extern Light light; extern Objects objects; extern int detail; extern float usermousesensitivity; -extern bool osx; extern float camerashake; extern int slomo; extern float slomodelay; @@ -230,16 +229,6 @@ int Game::DrawGLScene(StereoSide side) if (winfreeze || mainmenu) drawmode = normalmode; -#if PLATFORM_MACOSX - if (drawmode == glowmode) { - RGBColor color2; - color2.red = 0; - color2.green = 0; - color2.blue = 0; - DSpContext_FadeGamma(NULL, 200, &color2); - } -#endif - if (drawtoggle != 2) drawtoggle = 1 - drawtoggle; @@ -262,7 +251,6 @@ int Game::DrawGLScene(StereoSide side) glDrawBuffer(GL_BACK); glReadBuffer(GL_BACK); - //glFinish(); static XYZ terrainlight; static float distance; if (drawmode == normalmode) @@ -416,9 +404,6 @@ int Game::DrawGLScene(StereoSide side) terrain.draw(0); terraintexture2.bind(); terrain.draw(1); - //glBindTexture( GL_TEXTURE_2D, terraintexture3); - //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - //terrain.draw(2); terrain.drawdecals(); @@ -1680,7 +1665,6 @@ int Game::DrawGLScene(StereoSide side) text->glPrint(1024 / 2 - 90, 768 / 2, string, 1, 2, 1024, 768); } loading = 2; - //if(ismotionblur)drawmode=motionblurmode; drawmode = normalmode; } @@ -1767,7 +1751,6 @@ int Game::DrawGLScene(StereoSide side) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_EXT); GLfloat subtractColor[4] = { 0.5, 0.5, 0.5, 0.0 }; glTexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, subtractColor); - //glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_EXT, GL_SUBTRACT); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_EXT, GL_TEXTURE); glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_RGB_EXT, GL_CONSTANT_EXT); glTexEnvf(GL_TEXTURE_ENV, GL_RGB_SCALE_EXT, 2.0f); @@ -1795,7 +1778,6 @@ int Game::DrawGLScene(StereoSide side) glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, kTextureSize, kTextureSize, 0); } } - //glFlush(); } glClear(GL_DEPTH_BUFFER_BIT); @@ -1832,7 +1814,6 @@ int Game::DrawGLScene(StereoSide side) if (drawmode == motionblurmode) { if (motionbluramount < .2) motionbluramount = .2; - //glColor4f(1,1,1,fast_sqrt(multiplier)*2.9*motionbluramount); glColor4f(1, 1, 1, motionbluramount); glPushMatrix(); glBegin(GL_QUADS); @@ -1981,7 +1962,6 @@ int Game::DrawGLScene(StereoSide side) } if (drawmode == radialzoommode) { for (int i = 0; i < 3; i++) { - //glRotatef((float)i*.1,0,0,1); glColor4f(1, 1, 1, 1 / ((float)i + 1)); glPushMatrix(); glScalef(1 + (float)i * .01, 1 + (float)i * .01, 1); @@ -2043,17 +2023,14 @@ int Game::DrawGLScene(StereoSide side) multiplier = 0; } - //glFlush(); if ( side == stereoRight || side == stereoCenter ) { if (drawmode != motionblurmode || mainmenu) { swap_gl_buffers(); } } - //myassert(glGetError() == GL_NO_ERROR); glDrawBuffer(GL_BACK); glReadBuffer(GL_BACK); - //glFlush(); weapons.DoStuff(); @@ -2175,7 +2152,6 @@ void DrawMenu() glColor4f(1, 1, 1, 1); Game::cursortexture.bind(); glPushMatrix(); - //glScalef(.25,.25,.25); glBegin(GL_QUADS); glTexCoord2f(0, 0); glVertex3f(-1, -1, 0.0f);