fix #18

Author: codenamecpp

src/CameraController.h

@@ -31,6 +31,9 @@ class CameraController
     virtual void InputEvent(MouseScrollInputEvent& inputEvent)
     {
     }
+    virtual void InputEventLost()
+    {
+    }
 
 public:
     GameCamera* mCamera = nullptr;

src/CarnageGame.cpp

@@ -68,29 +68,38 @@ void CarnageGame::UpdateFrame()
     }
 }
 
+void CarnageGame::InputEventLost()
+{
+    for (int ihuman = 0; ihuman < GAME_MAX_PLAYERS; ++ihuman)
+    {
+        if (mHumanSlot[ihuman].mCharPedestrian == nullptr)
+            continue;
+
+        mHumanSlot[ihuman].mCharController.InputEventLost();
+        mHumanSlot[ihuman].mCharView.InputEventLost();
+    }
+}
+
 void CarnageGame::InputEvent(KeyInputEvent& inputEvent)
 {
-    if (inputEvent.mConsumed)
-        return;
-
-    if (inputEvent.mKeycode == eKeycode_TILDE && inputEvent.mPressed) // show debug console
+    if (inputEvent.HasPressed(eKeycode_TILDE)) // show debug console
     {
         gDebugConsoleWindow.mWindowShown = !gDebugConsoleWindow.mWindowShown;
         return;
     }
-    if (inputEvent.mKeycode == eKeycode_F3 && inputEvent.mPressed)
+    if (inputEvent.HasPressed(eKeycode_F3))
     {
         gRenderManager.ReloadRenderPrograms();
         return;
     }
 
-    if (inputEvent.mKeycode == eKeycode_ESCAPE && inputEvent.mPressed)
+    if (inputEvent.HasPressed(eKeycode_ESCAPE))
     {
         gSystem.QuitRequest();
         return;
     }
 
-    if (inputEvent.mKeycode == eKeycode_C && inputEvent.mPressed)
+    if (inputEvent.HasPressed(eKeycode_C))
     {
         gGameCheatsWindow.mWindowShown = !gGameCheatsWindow.mWindowShown;
         return;
@@ -103,9 +112,6 @@ void CarnageGame::InputEvent(KeyInputEvent& inputEvent)
 
         mHumanSlot[ihuman].mCharController.InputEvent(inputEvent);
         mHumanSlot[ihuman].mCharView.InputEvent(inputEvent);
-
-        if (inputEvent.mConsumed)
-            break;
     }
 }
 
@@ -117,9 +123,6 @@ void CarnageGame::InputEvent(MouseButtonInputEvent& inputEvent)
             continue;
 
         mHumanSlot[ihuman].mCharView.InputEvent(inputEvent);
-
-        if (inputEvent.mConsumed)
-            break;
     }
 }
 
@@ -131,9 +134,6 @@ void CarnageGame::InputEvent(MouseMovedInputEvent& inputEvent)
             continue;
 
         mHumanSlot[ihuman].mCharView.InputEvent(inputEvent);
-
-        if (inputEvent.mConsumed)
-            break;
     }
 }
 
@@ -145,9 +145,6 @@ void CarnageGame::InputEvent(MouseScrollInputEvent& inputEvent)
             continue;
 
         mHumanSlot[ihuman].mCharView.InputEvent(inputEvent);
-
-        if (inputEvent.mConsumed)
-            break;
     }
 }
 
@@ -163,9 +160,6 @@ void CarnageGame::InputEvent(GamepadInputEvent& inputEvent)
             continue;
 
         mHumanSlot[ihuman].mCharController.InputEvent(inputEvent);
-
-        if (inputEvent.mConsumed)
-            break;
     }
 }
 

src/CarnageGame.h

@@ -6,7 +6,7 @@
 #include "HumanCharacterView.h"
 
 // top level game application controller
-class CarnageGame final: public cxx::noncopyable
+class CarnageGame final: public InputEventsHandler
 {
 public:
     // temporary
@@ -35,12 +35,15 @@ class CarnageGame final: public cxx::noncopyable
 
     // Common processing
     void UpdateFrame();
-    void InputEvent(KeyInputEvent& inputEvent);
-    void InputEvent(MouseButtonInputEvent& inputEvent);
-    void InputEvent(MouseMovedInputEvent& inputEvent);
-    void InputEvent(MouseScrollInputEvent& inputEvent);
-    void InputEvent(KeyCharEvent& inputEvent);
-    void InputEvent(GamepadInputEvent& inputEvent);
+
+    // override InputEventsHandler
+    void InputEvent(KeyInputEvent& inputEvent) override;
+    void InputEvent(MouseButtonInputEvent& inputEvent) override;
+    void InputEvent(MouseMovedInputEvent& inputEvent) override;
+    void InputEvent(MouseScrollInputEvent& inputEvent) override;
+    void InputEvent(KeyCharEvent& inputEvent) override;
+    void InputEvent(GamepadInputEvent& inputEvent) override;
+    void InputEventLost() override;
 
     // Initialize player data
     void SetupHumanCharacter(int playerIndex, Pedestrian* pedestrian);

src/CharacterController.cpp

@@ -16,7 +16,7 @@ void CharacterController::ResetControlState(Pedestrian* pedestrian)
     // reset control actions
     for (int iaction = 0; iaction < ePedestrianAction_COUNT; ++iaction)
     {
-        pedestrian->mCtlActions[iaction] = false;
+        pedestrian->mCtlState.Clear();
     }
 }
 

src/FollowCameraController.cpp

@@ -85,3 +85,7 @@ void FollowCameraController::SetFollowTarget(Pedestrian* pedestrian)
 {
     mFollowPedestrian = pedestrian;
 }
+
+void FollowCameraController::InputEventLost()
+{
+}

src/FollowCameraController.h

@@ -20,7 +20,8 @@ class FollowCameraController final: public CameraController
     void InputEvent(KeyInputEvent& inputEvent) override;
     void InputEvent(MouseButtonInputEvent& inputEvent) override;
     void InputEvent(MouseMovedInputEvent& inputEvent) override;
-    void InputEvent(MouseScrollInputEvent& inputEvent) override;    
+    void InputEvent(MouseScrollInputEvent& inputEvent) override;
+    void InputEventLost() override;
 
 private:
     // parameters

src/FreeLookCameraController.cpp

@@ -17,12 +17,7 @@ void FreeLookCameraController::Setup(GameCamera* gameCamera)
     mCamera->SetTopDownOrientation();
     mCamera->SetPosition(cameraPosition);
 
-    // reset controls flags
-    mMoveLeft = false;
-    mMoveRight = false;
-    mMoveForward = false;
-    mMoveBackward = false;
-    mMouseDragCamera = false;
+    ClearConstrols();
 }
 
 void FreeLookCameraController::UpdateFrame()
@@ -145,4 +140,18 @@ void FreeLookCameraController::InputEvent(MouseScrollInputEvent& inputEvent)
     glm::vec3 position = mCamera->mPosition;
     position.y = glm::max(position.y + (0.5f * -inputEvent.mScrollY), MAP_LAYERS_COUNT * 1.0f);
     mCamera->SetPosition(position);
-}
+}
+
+void FreeLookCameraController::InputEventLost()
+{
+    ClearConstrols();
+}
+
+void FreeLookCameraController::ClearConstrols()
+{
+    mMoveLeft = false;
+    mMoveRight = false;
+    mMoveForward = false;
+    mMoveBackward = false;
+    mMouseDragCamera = false;
+}

src/FreeLookCameraController.h

@@ -17,6 +17,10 @@ class FreeLookCameraController final: public CameraController
     void InputEvent(MouseButtonInputEvent& inputEvent) override;
     void InputEvent(MouseMovedInputEvent& inputEvent) override;
     void InputEvent(MouseScrollInputEvent& inputEvent) override;
+    void InputEventLost() override;
+
+private:
+    void ClearConstrols();
 
 private:
     bool mMoveLeft, mMoveRight;

src/GameDefs.h

@@ -805,6 +805,22 @@ enum eProjectileType
 };
 decl_enum_strings(eProjectileType);
 
+// Pedestrian control actions status
+struct PedestrianCtlState
+{
+public:
+    // Reset current state
+    inline void Clear()
+    {
+        for (int icurrent = 0; icurrent < ePedestrianAction_COUNT; ++icurrent)
+        {
+            mCtlActions[icurrent] = false;
+        }
+    }
+public:
+    bool mCtlActions[ePedestrianAction_COUNT]; // control actions
+};
+
 // projectile type data
 struct ProjectileStyle
 {

src/HumanCharacterController.cpp

@@ -234,8 +234,18 @@ void HumanCharacterController::InputEvent(GamepadInputEvent& inputEvent)
     }
 }
 
+void HumanCharacterController::InputEventLost()
+{
+    if (mCharacter)
+    {
+        // reset actions
+        mCharacter->mCtlState.Clear();
+    }
+}
+
 bool HumanCharacterController::HandleInputAction(ePedestrianAction action, bool isActivated)
 {    
+    PedestrianCtlState& ctlState = mCharacter->mCtlState;
     switch (action)
     {
         case ePedestrianAction_SteerLeft:
@@ -250,13 +260,13 @@ bool HumanCharacterController::HandleInputAction(ePedestrianAction action, bool
         case ePedestrianAction_Jump:
         case ePedestrianAction_HandBrake:
         case ePedestrianAction_Shoot:
-            mCharacter->mCtlActions[action] = isActivated;
+            ctlState.mCtlActions[action] = isActivated;
         break;
 
         case ePedestrianAction_Horn:
             if (mCharacter->IsCarPassenger())
             {
-                mCharacter->mCtlActions[ePedestrianAction_Horn] = isActivated;
+                ctlState.mCtlActions[ePedestrianAction_Horn] = isActivated;
                 if (mCharacter->mCurrentCar->HasEmergencyLightsAnimation())
                 {
                     mCharacter->mCurrentCar->EnableEmergencyLights(isActivated);