X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameDraw.cpp;h=3e076067f232acdf3e68ed03e0bc61688ffb0e3a;hb=440a61a70a5eb14dea5d26aa7cd050e0a3e0e069;hp=ec4ec3f6e7d96eef6eed0d4d153e60c962c4141b;hpb=0cfa6130ff61b2d0f749386f16b206a46d857f8a;p=lugaru.git diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index ec4ec3f..3e07606 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -211,7 +211,7 @@ long long Game::MD5_string (char *string){ //return 1111111111111111; } -int Game::DrawGLScene(void) +int Game::DrawGLScene(StereoSide side) { static float texcoordwidth,texcoordheight; static float texviewwidth, texviewheight; @@ -230,9 +230,18 @@ int Game::DrawGLScene(void) lastcheck+=multiplier; - glColorMask( 1.0, 1.0, 1.0, 1.0 ); - if(!registered)debugmode=0; - + if ( stereomode == stereoAnaglyph ) { + switch(side) { + case stereoLeft: glColorMask( 0.0, 1.0, 1.0, 1.0 ); break; + case stereoRight: glColorMask( 1.0, 0.0, 0.0, 1.0 ); break; + } + } else { + glColorMask( 1.0, 1.0, 1.0, 1.0 ); + + if ( stereomode == stereoHorizontalInterlaced || stereomode == stereoVerticalInterlaced ) { + glStencilFunc(side == stereoLeft ? GL_NOTEQUAL : GL_EQUAL, 0x01, 0x01); + } + } if(freeze||winfreeze||(mainmenu&&gameon)||(!gameon&&gamestarted)){ tempmult=multiplier; @@ -348,6 +357,11 @@ int Game::DrawGLScene(void) glMatrixMode (GL_MODELVIEW); glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); glLoadIdentity (); + + // Move the camera for the current eye's point of view. + // Reverse the movement if we're reversing stereo + glTranslatef((stereoseparation/2) * side * (stereoreverse ? -1 : 1), 0, 0); + if(!cameramode&&!freeze&&!winfreeze){ glRotatef(float(Random()%100)/10*camerashake/*+(woozy*woozy)/10*/,0,0,1); glRotatef(rotation2+sin(woozy/2)*(player[0].damage/player[0].damagetolerance)*5,1,0,0); @@ -2240,10 +2254,10 @@ int Game::DrawGLScene(void) } if(mainmenu){ -#if USE_SDL + // !!! FIXME: hack: clamp framerate in menu so text input works correctly on fast systems. SDL_Delay(15); -#endif + glDrawBuffer(GL_BACK); glReadBuffer(GL_BACK); glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); @@ -2358,7 +2372,7 @@ int Game::DrawGLScene(void) /*if(mainmenu!=0)*/oldmainmenu=mainmenu; - if(mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==8||mainmenu==9||mainmenu==10||mainmenu==119||mainmenu==12||mainmenu==13||mainmenu==14||mainmenu==15||mainmenu==16||mainmenu==17){ + if(mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==8||mainmenu==9||mainmenu==10||mainmenu==119||mainmenu==13||mainmenu==17){ glClear(GL_DEPTH_BUFFER_BIT); glEnable(GL_ALPHA_TEST); glAlphaFunc(GL_GREATER, 0.001f); @@ -3058,128 +3072,6 @@ int Game::DrawGLScene(void) } } - if(mainmenu==12){ - menupulse+=multiplier*2; - - nummenuitems=6; - char temp[255]; - - sprintf (menustring[0], "Register now for only $19.95!"); - startx[0]=160; - starty[0]=270; - endx[0]=startx[0]+strlen(menustring[0])*10; - endy[0]=starty[0]+20; - movex[0]=0; - movey[0]=0; - - sprintf (menustring[1], "Confront raiders, wolves, and more!"); - startx[1]=130; - starty[1]=240; - endx[1]=startx[1]+strlen(menustring[1])*10; - endy[1]=starty[1]+20; - movex[1]=0; - movey[1]=0; - - sprintf (menustring[2], "Fight using swords, staves and armor!"); - startx[2]=125; - starty[2]=210; - endx[2]=startx[2]+strlen(menustring[2])*10; - endy[2]=starty[2]+20; - movex[2]=0; - movey[2]=0; - - if(!tryquit)sprintf (menustring[3], "Back"); - else sprintf (menustring[3], "Quit"); - startx[3]=10; - endx[3]=startx[3]+strlen(menustring[3])*10; - starty[3]=10; - endy[3]=starty[3]+20; - movex[3]=0; - movey[3]=0; - - sprintf (menustring[4], "Register now!"); - startx[4]=250; - endx[4]=startx[4]+strlen(menustring[4])*10; - starty[4]=140; - endy[4]=starty[4]+20; - movex[4]=0; - movey[4]=0; - - sprintf (menustring[5], "Enter registration code!"); - startx[5]=190; - endx[5]=startx[5]+strlen(menustring[5])*10; - starty[5]=120; - endy[5]=starty[5]+20; - movex[5]=0; - movey[5]=0; - } - - if(mainmenu==15){ - nummenuitems=2; - char temp[255]; - - sprintf (menustring[0], "Thank you for supporting Wolfire Software!"); - startx[0]=100; - starty[0]=270; - endx[0]=startx[0]+strlen(menustring[0])*10; - endy[0]=starty[0]+20; - movex[0]=0; - movey[0]=0; - - sprintf (menustring[1], "Back"); - startx[1]=10; - endx[1]=startx[1]+strlen(menustring[1])*10; - starty[1]=10; - endy[1]=starty[1]+20; - movex[1]=0; - movey[1]=0; - } - - if(mainmenu==16){ - nummenuitems=5; - char temp[255]; - - sprintf (menustring[0], "Sorry, that name/serial number combination is incorrect."); - startx[0]=40; - starty[0]=270; - endx[0]=startx[0]+strlen(menustring[0])*10; - endy[0]=starty[0]+20; - movex[0]=0; - movey[0]=0; - - sprintf (menustring[1], "Back"); - startx[1]=10; - endx[1]=startx[1]+strlen(menustring[1])*10; - starty[1]=10; - endy[1]=starty[1]+20; - movex[1]=0; - movey[1]=0; - - sprintf (menustring[2], "Please make sure you are copying your name and serial"); - startx[2]=50; - starty[2]=240; - endx[2]=startx[2]+strlen(menustring[2])*10; - endy[2]=starty[2]+20; - movex[2]=0; - movey[2]=0; - - sprintf (menustring[3], "number exactly as they appear in your email."); - startx[3]=90; - starty[3]=210; - endx[3]=startx[3]+strlen(menustring[3])*10; - endy[3]=starty[3]+20; - movex[3]=0; - movey[3]=0; - - sprintf (menustring[4], "Capitalization and punctuation matter!"); - startx[4]=120; - starty[4]=180; - endx[4]=startx[4]+strlen(menustring[4])*10; - endy[4]=starty[4]+20; - movex[4]=0; - movey[4]=0; - } - if(mainmenu==13){ nummenuitems=2; char temp[255]; @@ -3200,49 +3092,6 @@ int Game::DrawGLScene(void) movex[1]=0; movey[1]=0; } - - if(mainmenu==14){ - nummenuitems=2; - char temp[255]; - - sprintf (menustring[0], "Please enter your number:"); - startx[0]=30; - starty[0]=250; - endx[0]=startx[0]+strlen(menustring[0])*10; - endy[0]=starty[0]+20; - movex[0]=0; - movey[0]=0; - - sprintf (menustring[1], "Please enter your name:"); - startx[1]=290; - starty[1]=250; - endx[1]=startx[1]+strlen(menustring[1])*10; - endy[1]=starty[1]+20; - movex[1]=0; - movey[1]=0; - /* - char tempstring[256]; - sprintf (tempstring, "%s", registrationname); - long num1; - long num2; - long num3; - long num4; - long long longnum; - longnum = MD5_string ( tempstring); - //longnum = 1111111111111111; - num1 = longnum/100000000; - num2 = longnum%100000000; - sprintf (tempstring, "%d-%d-%d-%d", num1/10000, num1%10000, num2/10000, num2%10000); - - sprintf (menustring[2], "%s", tempstring); - startx[2]=290; - starty[2]=230; - endx[2]=startx[2]+strlen(menustring[2])*10; - endy[2]=starty[2]+20; - movex[2]=0; - movey[2]=0; */ - } - if(mainmenu==1||mainmenu==2){ nummenuitems=7; startx[0]=150; @@ -3410,7 +3259,7 @@ int Game::DrawGLScene(void) } } - if(mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==8||mainmenu==9||mainmenu==10||mainmenu==11||mainmenu==12||mainmenu==13||mainmenu==14||mainmenu==15||mainmenu==16||mainmenu==17) + if(mainmenu==3||mainmenu==4||mainmenu==5||mainmenu==6||mainmenu==7||mainmenu==8||mainmenu==9||mainmenu==10||mainmenu==11||mainmenu==13||mainmenu==17) for(i=0;istartx[i]&&(mousecoordh/screenwidth*640)starty[i]&&480-(mousecoordv/screenheight*480)accountprogress[accountactive]&&jaccountprogress[accountactive]&&j0){ glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glPushMatrix(); - if((mainmenu!=7||j!=0||!entername)&&(mainmenu!=13||j!=1)&&(mainmenu!=14||j!=1))text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480); + if(mainmenu!=7||j!=0||!entername)text.glPrint(startx[j],starty[j],menustring[j],0,1,640,480); else { if(displayblink){ @@ -3644,7 +3492,6 @@ int Game::DrawGLScene(void) if(1-((float)i)/15-(1-selectedlong[j])>0) { glColor4f(1,0,0,(1-((float)i)/10-(1-selectedlong[j]))*.25); - if(mainmenu==12&&j==4)glColor4f(1,(sin(menupulse)+1)/2,(sin(menupulse)+1)/2,(1-((float)i)/10-(1-selectedlong[j]))*.25); if(mainmenu==9&&j>accountprogress[accountactive]&&jaccountprogress[accountactive]&&j