#23

Author: codenamecpp

gamedata/config/inputs.json.default

@@ -0,0 +1,70 @@
+{
+    "player1":
+    {
+        "controller_type": "Keyboard",
+        "keys":
+        {
+            "in_car":
+            {
+                "LeaveCar": "Enter",
+                "HandBrake": "Space",
+                "Accelerate": "Up",
+                "Reverse": "Down",
+                "SteerLeft": "Left",
+                "SteerRight": "Right",
+                "Horn": "Tab"
+            },
+            "on_foot":
+            {
+                "TurnLeft": "Left",
+                "TurnRight": "Right",
+                "Jump": "Space",
+                "WalkBackward": "Down",
+                "Run": "Up",
+                "Shoot": "LCtrl",
+                "NextWeapon": "x",
+                "PrevWeapon": "z",
+                "EnterCar": "Enter",
+                "EnterCarAsPassenger": "f"
+            }
+        },
+        "gamepad":
+        {
+            "in_car":
+            {
+                "LeaveCar": "X",
+                "HandBrake": "Y",
+                "Accelerate": "Up",
+                "Reverse": "Down",
+                "SteerLeft": "Left",
+                "SteerRight": "Right",
+                "Horn": "A"
+            },
+            "on_foot":
+            {
+                "TurnLeft": "Left",
+                "TurnRight": "Right",
+                "Jump": "LeftTrigger",
+                "WalkBackward": "Down",
+                "Run": "Up",
+                "Shoot": "B",
+                "NextWeapon": "LeftBumper",
+                "PrevWeapon": "RightBumper",
+                "EnterCar": "X",
+                "EnterCarAsPassenger": "A"
+            }
+        }
+    },
+    "player2":
+    {
+        "controller_type": "Gamepad2"
+    },
+    "player3":
+    {
+        "controller_type": "Gamepad3"
+    },
+    "player4":
+    {
+        "controller_type": "Gamepad4"
+    }
+}

src/Carnage3D.vcxproj

@@ -158,7 +158,6 @@ copy "$(SDKDIR)\glfw\lib-vc2015\glfw3.dll" "$(TargetDir)"</Command>
     <ClInclude Include="AiCharacterController.h" />
     <ClInclude Include="aux_math.h" />
     <ClInclude Include="Convert.h" />
-    <ClInclude Include="InputActionsMapping.h" />
     <ClInclude Include="macro.h" />
     <ClInclude Include="MemoryManager.h" />
     <ClInclude Include="mem_allocators.h" />
@@ -243,7 +242,6 @@ copy "$(SDKDIR)\glfw\lib-vc2015\glfw3.dll" "$(TargetDir)"</Command>
     <ClCompile Include="GameObjectsManager.cpp" />
     <ClCompile Include="GpuBufferTexture.cpp" />
     <ClCompile Include="CharacterController.cpp" />
-    <ClCompile Include="InputActionsMapping.cpp" />
     <ClCompile Include="MemoryManager.cpp" />
     <ClCompile Include="mem_allocators.cpp" />
     <ClCompile Include="path_utils.cpp" />
@@ -308,6 +306,7 @@ copy "$(SDKDIR)\glfw\lib-vc2015\glfw3.dll" "$(TargetDir)"</Command>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="..\gamedata\config\inputs.json.default" />
     <None Include="..\gamedata\config\sys_config.json.default" />
     <None Include="..\gamedata\shaders\city_mesh.glsl" />
     <None Include="..\gamedata\shaders\debug.glsl" />

src/Carnage3D.vcxproj.filters

@@ -304,9 +304,6 @@
     <ClInclude Include="TrimeshBuffer.h">
       <Filter>Game\Rendering</Filter>
     </ClInclude>
-    <ClInclude Include="InputActionsMapping.h">
-      <Filter>Game</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -476,9 +473,6 @@
     <ClCompile Include="TrimeshBuffer.cpp">
       <Filter>Game\Rendering</Filter>
     </ClCompile>
-    <ClCompile Include="InputActionsMapping.cpp">
-      <Filter>Game</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">
@@ -499,6 +493,9 @@
     <None Include="..\gamedata\shaders\texture_color.glsl">
       <Filter>Data\shaders</Filter>
     </None>
+    <None Include="..\gamedata\config\inputs.json.default">
+      <Filter>Data\config</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\docs\CorrectionsToCDS.txt">

src/CarnageGame.cpp

@@ -8,12 +8,20 @@
 #include "Pedestrian.h"
 #include "MemoryManager.h"
 
+static const char* InputsConfigPath = "config/inputs.json";
+
+//////////////////////////////////////////////////////////////////////////
+
 CarnageGame gCarnageGame;
 
+//////////////////////////////////////////////////////////////////////////
+
 bool CarnageGame::Initialize()
 {
     gGameCheatsWindow.mWindowShown = true; // show by default
 
+    SetInputActionsFromConfig();
+
     gGameRules.LoadDefaults();
     if (gSystem.mStartupParams.mDebugMapName.empty())
     {
@@ -70,7 +78,7 @@ bool CarnageGame::Initialize()
     }
 
     mPlayerPedestrian = mObjectsManager.CreatePedestrian(pos);
-    mHumanController.SetCharacter(mPlayerPedestrian);
+    mHumanCharacters[0].SetCharacter(mPlayerPedestrian);
 
     SetCameraController(&mFollowCameraController);
 
@@ -115,22 +123,30 @@ void CarnageGame::InputEvent(KeyInputEvent& inputEvent)
         return;
     }
 
-    mHumanController.InputEvent(inputEvent);
-
     if (inputEvent.mKeycode == eKeycode_ESCAPE && inputEvent.mPressed)
     {
         gSystem.QuitRequest();
+        return;
     }
 
     if (inputEvent.mKeycode == eKeycode_C && inputEvent.mPressed)
     {
         gGameCheatsWindow.mWindowShown = !gGameCheatsWindow.mWindowShown;
+        return;
     }
 
     if (mCameraController)
     {
         mCameraController->InputEvent(inputEvent);
     }
+
+    for (HumanCharacterController& currentController: mHumanCharacters)
+    {
+        if (inputEvent.mConsumed)
+            break;
+
+        currentController.InputEvent(inputEvent);
+    }
 }
 
 void CarnageGame::InputEvent(MouseButtonInputEvent& inputEvent)
@@ -163,7 +179,13 @@ void CarnageGame::InputEvent(KeyCharEvent& inputEvent)
 
 void CarnageGame::InputEvent(GamepadInputEvent& inputEvent)
 {
-
+    for (int icurr = 0; icurr < GAME_MAX_PLAYERS; ++icurr)
+    {
+        if (inputEvent.mConsumed)
+            break;
+
+        mHumanCharacters[icurr].InputEvent(inputEvent);
+    }
 }
 
 void CarnageGame::SetCameraController(CameraController* controller)
@@ -177,3 +199,38 @@ void CarnageGame::SetCameraController(CameraController* controller)
         mCameraController->SetupInitial();
     }
 }
+
+bool CarnageGame::SetInputActionsFromConfig()
+{
+    std::string jsonContent;
+    if (!gFiles.ReadTextFile(InputsConfigPath, jsonContent))
+    {
+        gConsole.LogMessage(eLogMessage_Warning, "Cannot load input config from '%s'", InputsConfigPath);
+        return false;
+    }
+
+    cxx::config_document configDocument;
+    if (!configDocument.parse_document(jsonContent.c_str()))
+    {
+        gConsole.LogMessage(eLogMessage_Warning, "Cannot parse input config document");
+        return false;
+    }
+
+    cxx::string_buffer_32 tempString;
+    for (int iplayer = 0; iplayer < GAME_MAX_PLAYERS; ++iplayer)
+    {
+        HumanCharacterController& currentChar = mHumanCharacters[iplayer];
+        currentChar.mInputActionsMapping.SetNull();
+
+        if (iplayer == 0) // force default mapping for first player
+        {
+            currentChar.mInputActionsMapping.SetDefaults();
+        }
+
+        tempString.printf("player%d", iplayer + 1);
+
+        cxx::config_node configNode = configDocument.get_root_node().get_child(tempString.c_str());
+        currentChar.mInputActionsMapping.SetFromConfig(configNode);
+    }
+    return true;
+}

src/CarnageGame.h

@@ -16,7 +16,7 @@ class CarnageGame final: public cxx::noncopyable
     // gamestate
     Pedestrian* mPlayerPedestrian = nullptr;
     CameraController* mCameraController = nullptr;
-    HumanCharacterController mHumanController;
+    HumanCharacterController mHumanCharacters[GAME_MAX_PLAYERS];
 
     Timespan mGameTime;
 
@@ -40,6 +40,7 @@ class CarnageGame final: public cxx::noncopyable
     void SetCameraController(CameraController* controller);
 
 private:
+    bool SetInputActionsFromConfig();
 
 };
 

src/GameDefs.h

@@ -4,21 +4,17 @@
 
 // side length of block cube, do not change
 #define MAP_BLOCK_LENGTH 1.0f
-
 #define MAP_BLOCK_TEXTURE_DIMS 64
 #define MAP_BLOCK_TEXTURE_AREA (MAP_BLOCK_TEXTURE_DIMS * MAP_BLOCK_TEXTURE_DIMS)
-
 #define MAX_MAP_BLOCK_ANIM_FRAMES 32
 #define MAX_CAR_DOORS 4
 #define MAX_CAR_REMAPS 12
 #define MAX_PED_REMAPS 64
 #define NO_REMAP -1
 #define MAX_SPRITE_DELTAS 32
-
 // map width and height is same
 #define MAP_DIMENSIONS 256
 #define MAP_LAYERS_COUNT 6
-
 #define MAP_PIXELS_PER_TILE MAP_BLOCK_TEXTURE_DIMS
 
 #define SPRITE_ZERO_ANGLE 90.0f // all sprites in game are rotated at 90 degrees
@@ -27,6 +23,8 @@
 #define PED_SPRITE_DRAW_BOX_SIZE_PX 24 // with, height
 #define PED_SPRITE_DRAW_BOX_SIZE ((1.0f * PED_SPRITE_DRAW_BOX_SIZE_PX) / MAP_BLOCK_TEXTURE_DIMS)
 
+#define GAME_MAX_PLAYERS 4
+
 // car sprite deltas - damage
 #define CAR_DAMAGE_SPRITE_DELTA_FR 0 // front right
 #define CAR_DAMAGE_SPRITE_DELTA_BL 1 // back left
@@ -709,7 +707,10 @@ enum ePedestrianAction
     ePedestrianAction_Run, // overrides walk_forward and walk_backward
     ePedestrianAction_Shoot,
     ePedestrianAction_EnterCar,
+    ePedestrianAction_EnterCarAsPassenger,
     ePedestrianAction_LeaveCar,
+    ePedestrianAction_NextWeapon,
+    ePedestrianAction_PrevWeapon,
 
     // in car
     ePedestrianAction_HandBrake,