[Opentnl-cvs] tnl/zap UIGame.cpp,1.46,1.47 UIMenus.cpp,1.24,1.25 ZAP.vcproj,1.39,1.40 game.h,1.64,1.
Brought to you by:
mark_frohnmayer,
s_alanet
Menu
▾
▴
[Opentnl-cvs] tnl/zap UIGame.cpp,1.46,1.47 UIMenus.cpp,1.24,1.25 ZAP.vcproj,1.39,1.40 game.h,1.64,1.65 input.cpp,1.3,1.4 main.cpp,1.70,1.71 winJoystick.cpp,1.20,1.21
|
From: Mark F. <mar...@us...> - 2004-09-29 23:53:31
|
Update of /cvsroot/opentnl/tnl/zap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3717/zap Modified Files: UIGame.cpp UIMenus.cpp ZAP.vcproj game.h input.cpp main.cpp winJoystick.cpp Log Message: Updated input code for some tweakage Win32 release build is not console app All builds start in fullscreen mode by default Index: main.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/main.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** main.cpp 28 Sep 2004 17:34:13 -0000 1.70 --- main.cpp 29 Sep 2004 23:53:21 -0000 1.71 *************** *** 594,597 **** --- 594,601 ---- gMaxPlayers = atoi(argv[i+1]); } + else if(!stricmp(argv[i], "-window")) + { + OptionsMenuUserInterface::fullscreen = false; + } else if(!stricmp(argv[i], "-edit")) { *************** *** 717,720 **** --- 721,726 ---- atexit(onExit); + if(OptionsMenuUserInterface::fullscreen) + glutFullScreen(); glutMainLoop(); Index: UIMenus.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/UIMenus.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** UIMenus.cpp 25 Sep 2004 01:26:37 -0000 1.24 --- UIMenus.cpp 29 Sep 2004 23:53:21 -0000 1.25 *************** *** 252,256 **** bool OptionsMenuUserInterface::controlsRelative = false; ! bool OptionsMenuUserInterface::fullscreen = false; S32 OptionsMenuUserInterface::joystickType = -1; bool OptionsMenuUserInterface::echoVoice = false; --- 252,256 ---- bool OptionsMenuUserInterface::controlsRelative = false; ! bool OptionsMenuUserInterface::fullscreen = true; S32 OptionsMenuUserInterface::joystickType = -1; bool OptionsMenuUserInterface::echoVoice = false; Index: ZAP.vcproj =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/ZAP.vcproj,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** ZAP.vcproj 17 Sep 2004 00:14:34 -0000 1.39 --- ZAP.vcproj 29 Sep 2004 23:53:21 -0000 1.40 *************** *** 88,92 **** LinkIncremental="1" GenerateDebugInformation="TRUE" ! SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" --- 88,92 ---- LinkIncremental="1" GenerateDebugInformation="TRUE" ! SubSystem="2" OptimizeReferences="2" EnableCOMDATFolding="2" Index: game.h =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/game.h,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** game.h 17 Sep 2004 00:14:34 -0000 1.64 --- game.h 29 Sep 2004 23:53:21 -0000 1.65 *************** *** 234,238 **** extern void endGame(); ! #define ZAP_GAME_STRING "ZAP 1.4.2" }; --- 234,238 ---- extern void endGame(); ! #define ZAP_GAME_STRING "ZAP 1.4.3" }; Index: UIGame.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/UIGame.cpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** UIGame.cpp 20 Aug 2004 18:26:58 -0000 1.46 --- UIGame.cpp 29 Sep 2004 23:53:21 -0000 1.47 *************** *** 52,56 **** mCurrentMode = PlayMode; mInScoreboardMode = false; ! #ifdef TNL_OS_XBOX mFPSVisible = true; #else --- 52,56 ---- mCurrentMode = PlayMode; mInScoreboardMode = false; ! #if 0 //defined(TNL_OS_XBOX) mFPSVisible = true; #else Index: input.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/input.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** input.cpp 28 Sep 2004 17:34:13 -0000 1.3 --- input.cpp 29 Sep 2004 23:53:21 -0000 1.4 *************** *** 39,42 **** --- 39,45 ---- { F32 axes[MaxJoystickAxes]; + static F32 minValues[2] = { - 0.5, -0.5 }; + static F32 maxValues[2] = { 0.5, 0.5 }; + if(!ReadJoystick(axes, buttonMask)) return false; *************** *** 49,52 **** --- 52,74 ---- controls[1] = axes[1]; + if(controls[0] < minValues[0]) + minValues[0] = controls[0]; + if(controls[0] > maxValues[0]) + maxValues[0] = controls[0]; + if(controls[1] < minValues[1]) + minValues[1] = controls[1]; + if(controls[1] > maxValues[1]) + maxValues[1] = controls[1]; + + if(controls[0] < 0) + controls[0] = - (controls[0] / minValues[0]); + else if(controls[0] > 0) + controls[0] = (controls[0] / maxValues[0]); + + if(controls[1] < 0) + controls[1] = - (controls[1] / minValues[1]); + else if(controls[1] > 0) + controls[1] = (controls[1] / maxValues[1]); + // xbox control inputs are in a circle, not a square, which makes // diagonal movement inputs "slower" *************** *** 223,226 **** --- 245,250 ---- if(!strncmp(joystickName, "WingMan", 7)) ret = LogitechWingman; + else if(!strcmp(joystickName, "XBoxOnXBox")) + ret = XBoxControllerOnXBox; else if(strstr(joystickName, "XBox")) ret = XBoxController; Index: winJoystick.cpp =================================================================== RCS file: /cvsroot/opentnl/tnl/zap/winJoystick.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** winJoystick.cpp 28 Sep 2004 17:34:13 -0000 1.20 --- winJoystick.cpp 29 Sep 2004 23:53:21 -0000 1.21 *************** *** 153,157 **** return false; // The device should have been acquired during the Poll() ! F32 scale = 1.15 / 32768.0f; axes[0] = (F32(js.lX) - 32768.0f) * scale; axes[1] = (F32(js.lY) - 32768.0f) * scale; --- 153,157 ---- return false; // The device should have been acquired during the Poll() ! F32 scale = 1 / 32768.0f; axes[0] = (F32(js.lX) - 32768.0f) * scale; axes[1] = (F32(js.lY) - 32768.0f) * scale; *************** *** 166,176 **** axes[10] = 0; axes[11] = 0; - for(S32 i = 0; i < 12; i++) - { - if(axes[i] > 1) - axes[i] = 1; - if(axes[i] < -1) - axes[i] = -1; - } // check the state of the buttons: --- 166,169 ---- *************** *** 179,189 **** for( U32 i = 0; i < 12; i++ ) - { if((js.rgbButtons[i] & 0x80) != 0) - { - logprintf("Button down %d", i); buttonMask |= BIT(i); - } - } switch(pov) --- 172,177 ---- |