-

Author: codenamecpp

src/CarnageGame.cpp

@@ -206,10 +206,10 @@ bool CarnageGame::SetInputActionsFromConfig()
     for (int iplayer = 0; iplayer < GAME_MAX_PLAYERS; ++iplayer)
     {
         HumanCharacterController& currentChar = mHumanCharacters[iplayer];
-        currentChar.mInputActionsMapping.SetNull();
+        currentChar.mInputs.SetNull();
         if (iplayer == 0) 
         {
-            currentChar.mInputActionsMapping.SetDefaults();
+            currentChar.mInputs.SetDefaults();
         }  
     }
 
@@ -236,7 +236,7 @@ bool CarnageGame::SetInputActionsFromConfig()
         tempString.printf("player%d", iplayer + 1);
 
         cxx::config_node configNode = configDocument.get_root_node().get_child(tempString.c_str());
-        currentChar.mInputActionsMapping.SetFromConfig(configNode);
+        currentChar.mInputs.SetFromConfig(configNode);
     }
 
     return true;

src/DebugRenderer.cpp

@@ -68,7 +68,7 @@ void DebugRenderer::RenderFrame()
         return;
 
     gRenderManager.mDebugProgram.Activate();
-    gRenderManager.mDebugProgram.UploadCameraTransformMatrices();
+    gRenderManager.mDebugProgram.UploadCameraTransformMatrices(gCamera);
     FlushPrimitives();
     gRenderManager.mDebugProgram.Deactivate();
 }

src/GameCheatsWindow.cpp

@@ -59,11 +59,6 @@ void GameCheatsWindow::DoUI(Timespan deltaTime)
         ImGui::Text("b slope: %d", currBlock->mSlopeType);
         ImGui::Text("b directions: %d, %d, %d, %d", currBlock->mUpDirection, currBlock->mRightDirection, 
             currBlock->mDownDirection, currBlock->mLeftDirection);
-        //ImGui::Text("b flat: %d", currBlock->mIsFlat);
-        //for (int iface = 0; iface < eBlockFace_COUNT; ++iface)
-        //{
-        //    ImGui::Text("b face %s : %d", cxx::enum_to_string((eBlockFace) iface), currBlock->mFaces[iface]);
-        //}
 
         ImGui::Separator();
         ImGui::SliderInt("ped remap", &pedestrian->mRemapIndex, -1, MAX_PED_REMAPS - 1);

src/HumanCharacterController.cpp

@@ -141,24 +141,24 @@ void HumanCharacterController::InputEvent(KeyInputEvent& inputEvent)
     if (mCharacter == nullptr || inputEvent.mKeycode == eKeycode_null)
         return;
 
-    if (mInputActionsMapping.mControllerType != eInputControllerType_Keyboard)
+    if (mInputs.mControllerType != eInputControllerType_Keyboard)
     {
         return;
     }
 
     ePedestrianAction action = ePedestrianAction_null;
     if (mCharacter->IsCarPassenger())
     {
-        auto iaction = mInputActionsMapping.mKeysInCarActions.find(inputEvent.mKeycode);
-        if (iaction != mInputActionsMapping.mKeysInCarActions.end())
+        auto iaction = mInputs.mKeysInCarActions.find(inputEvent.mKeycode);
+        if (iaction != mInputs.mKeysInCarActions.end())
         {
             action = iaction->second;
         }
     }
     else
     {
-        auto iaction = mInputActionsMapping.mKeysOnFootActions.find(inputEvent.mKeycode);
-        if (iaction != mInputActionsMapping.mKeysOnFootActions.end())
+        auto iaction = mInputs.mKeysOnFootActions.find(inputEvent.mKeycode);
+        if (iaction != mInputs.mKeysOnFootActions.end())
         {
             action = iaction->second;
         }
@@ -189,22 +189,22 @@ void HumanCharacterController::InputEvent(GamepadInputEvent& inputEvent)
     if (inputEvent.mGamepad < MAX_GAMEPADS)
     {
         eInputControllerType controllerType = gamepadControllers[inputEvent.mGamepad];
-        if (controllerType != mInputActionsMapping.mControllerType)
+        if (controllerType != mInputs.mControllerType)
             return;
 
         ePedestrianAction action = ePedestrianAction_null;
         if (mCharacter->IsCarPassenger())
         {
-            auto iaction = mInputActionsMapping.mGpButtonsInCarActions.find(inputEvent.mButton);
-            if (iaction != mInputActionsMapping.mGpButtonsInCarActions.end())
+            auto iaction = mInputs.mGpButtonsInCarActions.find(inputEvent.mButton);
+            if (iaction != mInputs.mGpButtonsInCarActions.end())
             {
                 action = iaction->second;
             }
         }
         else
         {
-            auto iaction = mInputActionsMapping.mGpButtonsOnFootActions.find(inputEvent.mButton);
-            if (iaction != mInputActionsMapping.mGpButtonsOnFootActions.end())
+            auto iaction = mInputs.mGpButtonsOnFootActions.find(inputEvent.mButton);
+            if (iaction != mInputs.mGpButtonsOnFootActions.end())
             {
                 action = iaction->second;
             }

src/HumanCharacterController.h

@@ -32,7 +32,7 @@ class HumanCharacterController final: public CharacterController
 {
 public:
     // public for convenience
-    InputActionsMapping mInputActionsMapping;
+    InputActionsMapping mInputs;
 
 public:
     // process controller logic

src/MapRenderer.cpp

@@ -183,7 +183,7 @@ void MapRenderer::DrawCityMesh()
     gGraphicsDevice.SetRenderStates(cityMeshRenderStates);
 
     gRenderManager.mCityMeshProgram.Activate();
-    gRenderManager.mCityMeshProgram.UploadCameraTransformMatrices();
+    gRenderManager.mCityMeshProgram.UploadCameraTransformMatrices(gCamera);
 
     if (mCityMeshBufferV && mCityMeshBufferI)
     {

src/RenderProgram.cpp

@@ -94,7 +94,7 @@ void RenderProgram::Deactivate()
     gGraphicsDevice.BindRenderProgram(nullptr);
 }
 
-void RenderProgram::UploadCameraTransformMatrices()
+void RenderProgram::UploadCameraTransformMatrices(GameCamera& gameCamera)
 {
     bool isInited = IsProgramInited();
     if (isInited)
@@ -105,10 +105,10 @@ void RenderProgram::UploadCameraTransformMatrices()
                 mGpuProgram->SetUniform(uniform_id, matrix_reference); \
             }
 
-        SET_UNIFORM(eRenderUniform_ViewMatrix, gCamera.mViewMatrix);
-        SET_UNIFORM(eRenderUniform_ProjectionMatrix, gCamera.mProjectionMatrix);
-        SET_UNIFORM(eRenderUniform_ViewProjectionMatrix, gCamera.mViewProjectionMatrix);
-        SET_UNIFORM(eRenderUniform_CameraPosition, gCamera.mPosition);
+        SET_UNIFORM(eRenderUniform_ViewMatrix, gameCamera.mViewMatrix);
+        SET_UNIFORM(eRenderUniform_ProjectionMatrix, gameCamera.mProjectionMatrix);
+        SET_UNIFORM(eRenderUniform_ViewProjectionMatrix, gameCamera.mViewProjectionMatrix);
+        SET_UNIFORM(eRenderUniform_CameraPosition, gameCamera.mPosition);
 
         #undef SET_UNIFORM
     }

src/RenderProgram.h

@@ -31,7 +31,7 @@ class RenderProgram: public cxx::noncopyable
 
     // will update projection and view parameters of render program
     // the matrices stored in game camera class, make sure compute them first
-    void UploadCameraTransformMatrices();
+    void UploadCameraTransformMatrices(GameCamera& gameCamera);
 
 protected:
     // overridable

src/SpriteBatch.cpp

@@ -145,7 +145,7 @@ void SpriteBatch::RenderSpritesBatches()
     gGraphicsDevice.SetRenderStates(cityMeshRenderStates);
 
     gRenderManager.mSpritesProgram.Activate();
-    gRenderManager.mSpritesProgram.UploadCameraTransformMatrices();
+    gRenderManager.mSpritesProgram.UploadCameraTransformMatrices(gCamera);
 
     SpriteVertex3D_Format vFormat;
     mTrimeshBuffer.SetVertices(Sizeof_SpriteVertex3D * mDrawVertices.size(), mDrawVertices.data());