Changeset 119 for cafu/branches/cafu_to_wx/Ca3DE/Client/ClientStateInGame.cpp

Timestamp:

08/16/10 21:15:24 (21 months ago)

Author:

Carsten

Message:

Re-established most of the client functionality:

• proper (projection) matrix handling and setup for 3D rendering,
• mouse and keyboard state analysis for player control,
• taking screen-shots (F5) and opening the console (F1),
• regarding application shut-down see < http://thread.gmane.org/gmane.comp.lib.wxwidgets.general/70625> for an open issue.

Files:

• cafu/branches/cafu_to_wx/Ca3DE/Client/ClientStateInGame.cpp (modified) (3 diffs)

cafu/branches/cafu_to_wx/Ca3DE/Client/ClientStateInGame.cpp

@@ -383 +383 @@
             Graphs.PosZ   [ClientFrameNr & (512-1)]=((unsigned short)(OurEntityCurrentState->Origin.z/20.0)) & 511;
 
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::PROJECTION    );
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+            MatSys::Renderer->PushMatrix(MatSys::RendererI::WORLD_TO_VIEW );
+
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::PROJECTION,
+                // Note that the far plane is located at infinity for our stencil shadows implementation!
+                // A fovY of 67.5 corresponds to a fovX of 90.0 when the aspect ratio is 4:3.
+                MatrixT::GetProjPerspectiveMatrix(67.5f, float(FrameSize.GetWidth())/float(FrameSize.GetHeight()), 100.0f, -1.0f));
+
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::MODEL_TO_WORLD, MatrixT());
+            MatSys::Renderer->SetMatrix(MatSys::RendererI::WORLD_TO_VIEW,  MatrixT());
+
             World->Draw(FrameTime, OurEntityCurrentState);
+
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::PROJECTION    );
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::MODEL_TO_WORLD);
+            MatSys::Renderer->PopMatrix(MatSys::RendererI::WORLD_TO_VIEW );
 
             // Die Framerate ist zwar World-unabhängig, ihre Anzeige hier aber besser aufgehoben (aus rein kosmetischen Gründen).
@@ -811 +827 @@
     if (World)
     {
-        cf::GuiSys::GuiI* ActiveGui=cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
+        cf::GuiSys::GuiI*  ActiveGui =cf::GuiSys::GuiMan->GetTopmostActiveAndInteractive();
+        const wxMouseState MouseState=wxGetMouseState();
         assert(ActiveGui!=NULL);    // The GUI of the client for the world output must always be there.
 
         // This is unfortunately needed, because the users last click (in the GUI) that brought us here may still have the "LMB up" event pending.
-#if 0
-        WasLMBOnceUp|=(SingleOpenGLWindow->GetMouseButtonState() & 0x1)==0;
+        WasLMBOnceUp=WasLMBOnceUp || !MouseState.LeftIsDown();
 
         // FIXME: Should test for ActiveGui==ClientGui instead of ActiveGui->GetScriptName()=="".
         if (ActiveGui->GetScriptName()=="" && WasLMBOnceUp)
         {
-            if (SingleOpenGLWindow->GetMouseButtonState() & 0x1) PlayerCommand.Keys|=PCK_Fire1;  // Button 0
-            if (SingleOpenGLWindow->GetMouseButtonState() & 0x6) PlayerCommand.Keys|=PCK_Fire2;  // Button 1 oder 2
+            if (MouseState.LeftIsDown())                               PlayerCommand.Keys|=PCK_Fire1;
+            if (MouseState.MiddleIsDown() || MouseState.RightIsDown()) PlayerCommand.Keys|=PCK_Fire2;
 
             // Alle anderen Keys via KeyboardState bestimmen und über die volle Frametime anwenden.
@@ -828 +844 @@
             // Mit anderen Worten: Diesen Kram mit in die obige Buffer-Schleife nehmen!
             // Player movement / state
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RCONTROL   ]) ;                                       // R_Strg   Run
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RSHIFT     ] ||                                       // R_Shift  Stealth
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_LSHIFT     ]) PlayerCommand.Keys|=PCK_Walk;           // L_Shift  Stealth
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_UP         ] ||                                       // Up       Walk forward
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_W          ]) PlayerCommand.Keys|=PCK_MoveForward;    // W        Walk forward
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_DOWN       ] ||                                       // Down     Walk backward
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_S          ]) PlayerCommand.Keys|=PCK_MoveBackward;   // S        Walk backward
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_A          ] ||                                       // A        Strafe left
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_COMMA      ]) PlayerCommand.Keys|=PCK_StrafeLeft;     // ,        Strafe left
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_D          ] ||                                       // D        Strafe right
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PERIOD     ]) PlayerCommand.Keys|=PCK_StrafeRight;    // .        Strafe right
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_R          ]) PlayerCommand.Keys|=PCK_Fire1;          // R        Fire/Respawn
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RETURN     ] ||                                       // RETURN   Use
-                SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_NUMPADENTER]) PlayerCommand.Keys|=PCK_Use;            // ENTER    Use
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_LEFT       ]) PlayerCommand.Keys|=PCK_TurnLeft;       // Left     Turn left
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_RIGHT      ]) PlayerCommand.Keys|=PCK_TurnRight;      // Right    Turn right
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PGDN       ]) PlayerCommand.Keys|=PCK_LookUp;         //          Look up
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_PGUP       ]) PlayerCommand.Keys|=PCK_LookDown;       //          Look down
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_HOME       ]) PlayerCommand.Keys|=PCK_BankCW          //          Bank CW
-         // if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_INSERT     ]) PlayerCommand.Keys|=PCK_BankCCW;        //          Bank CCW
-            if (SingleOpenGLWindow->GetKeyboardState()[CaKeyboardEventT::CK_END        ]) PlayerCommand.Keys|=PCK_CenterView;
-        }
-#endif
+         // if (wxGetKeyState(WXK_CONTROL)     ) ;                                       // R_Strg   Run
+            if (wxGetKeyState(WXK_SHIFT)       ) PlayerCommand.Keys|=PCK_Walk;           // Shift  Stealth
+            if (wxGetKeyState(WXK_UP) ||                                                 // Up       Walk forward
+                wxGetKeyState(wxKeyCode('W'))  ) PlayerCommand.Keys|=PCK_MoveForward;    // W        Walk forward
+            if (wxGetKeyState(WXK_DOWN) ||                                               // Down     Walk backward
+                wxGetKeyState(wxKeyCode('S'))  ) PlayerCommand.Keys|=PCK_MoveBackward;   // S        Walk backward
+            if (wxGetKeyState(wxKeyCode('A')) ||                                         // A        Strafe left
+                wxGetKeyState(wxKeyCode(','))  ) PlayerCommand.Keys|=PCK_StrafeLeft;     // ,        Strafe left
+            if (wxGetKeyState(wxKeyCode('D')) ||                                         // D        Strafe right
+                wxGetKeyState(wxKeyCode('.'))  ) PlayerCommand.Keys|=PCK_StrafeRight;    // .        Strafe right
+            if (wxGetKeyState(wxKeyCode('R'))  ) PlayerCommand.Keys|=PCK_Fire1;          // R        Fire/Respawn
+            if (wxGetKeyState(WXK_RETURN) ||                                             // RETURN   Use
+                wxGetKeyState(WXK_NUMPAD_ENTER)) PlayerCommand.Keys|=PCK_Use;            // ENTER    Use
+            if (wxGetKeyState(WXK_LEFT        )) PlayerCommand.Keys|=PCK_TurnLeft;       // Left     Turn left
+            if (wxGetKeyState(WXK_RIGHT       )) PlayerCommand.Keys|=PCK_TurnRight;      // Right    Turn right
+            if (wxGetKeyState(WXK_PAGEDOWN    )) PlayerCommand.Keys|=PCK_LookUp;         //          Look up
+            if (wxGetKeyState(WXK_PAGEUP      )) PlayerCommand.Keys|=PCK_LookDown;       //          Look down
+         // if (wxGetKeyState(WXK_HOME        )) PlayerCommand.Keys|=PCK_BankCW          //          Bank CW
+         // if (wxGetKeyState(WXK_INSERT      )) PlayerCommand.Keys|=PCK_BankCCW;        //          Bank CCW
+            if (wxGetKeyState(WXK_END         )) PlayerCommand.Keys|=PCK_CenterView;
+        }