-

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -158,6 +158,7 @@ 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" />
@@ -242,6 +243,7 @@ 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" />

src/Carnage3D.vcxproj.filters

@@ -304,6 +304,9 @@
     <ClInclude Include="TrimeshBuffer.h">
       <Filter>Game\Rendering</Filter>
     </ClInclude>
+    <ClInclude Include="InputActionsMapping.h">
+      <Filter>Game</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -473,6 +476,9 @@
     <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">

src/GraphicsDevice.cpp

@@ -11,6 +11,11 @@
 
 GraphicsDevice gGraphicsDevice;
 
+#if (GLFW_VERSION_MAJOR == 3) && (GLFW_VERSION_MINOR < 3)
+#else
+#define GLFW_SUPPORTS_GAMEPADS
+#endif
+
 //////////////////////////////////////////////////////////////////////////
 
 // glfw to native input mapping
@@ -86,6 +91,7 @@ static eMButton GlfwMouseButtonToNative(int mbutton)
 
 static eGamepadButton GlfwGamepadButtonToNative(int gpbutton)
 {
+#ifdef GLFW_SUPPORTS_GAMEPADS
     switch(gpbutton)
     {
         case GLFW_GAMEPAD_BUTTON_A: return eGamepadButton_A;
@@ -104,6 +110,7 @@ static eGamepadButton GlfwGamepadButtonToNative(int gpbutton)
         case GLFW_GAMEPAD_BUTTON_DPAD_DOWN: return eGamepadButton_DPAD_Down;
         case GLFW_GAMEPAD_BUTTON_DPAD_LEFT: return eGamepadButton_DPAD_Left;
     };
+#endif
     return eGamepadButton_null;
 }
 
@@ -233,14 +240,15 @@ bool GraphicsDevice::Initialize(int screensizex, int screensizey, bool fullscree
             };
             gSystem.HandleEvent(ev);
         });
+#ifdef GLFW_SUPPORTS_GAMEPADS
     ::glfwSetJoystickCallback([](int gamepad, int gamepadStatus)
         {
             if (gamepad < MAX_GAMEPADS)
             {
                 gInputs.SetGamepadPresent(gamepad, (gamepadStatus == GLFW_CONNECTED));
             }
         });
-
+#endif
     // setup opengl extensions
     if (!InitializeOGLExtensions())
     {
@@ -298,12 +306,13 @@ bool GraphicsDevice::Initialize(int screensizex, int screensizey, bool fullscree
     EnableVSync(vsync);
 
     // init gamepads
+#ifdef GLFW_SUPPORTS_GAMEPADS
     for (int icurr = 0; icurr < MAX_GAMEPADS; ++icurr)
     {
         bool isGamepad = ::glfwJoystickIsGamepad(icurr) == GLFW_TRUE;
         gInputs.SetGamepadPresent(icurr, isGamepad);
     }
-
+#endif
     return true;
 }
 
@@ -783,6 +792,7 @@ void GraphicsDevice::Present()
 
 void GraphicsDevice::ProcessGamepadsInputs()
 {
+#ifdef GLFW_SUPPORTS_GAMEPADS
     GLFWgamepadstate gamepadstate;
 
     for (int icurr = 0; icurr < MAX_GAMEPADS; ++icurr)
@@ -823,6 +833,7 @@ void GraphicsDevice::ProcessGamepadsInputs()
             gSystem.HandleEvent(inputEvent);
         }
     }
+#endif
 }
 
 void GraphicsDevice::SetViewportRect(const Rect2D& sourceRectangle)

src/InputActionsMapping.cpp

@@ -0,0 +1,2 @@
+#include "stdafx.h"
+#include "InputActionsMapping.h"

src/InputActionsMapping.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "GameDefs.h"
+
+class InputActionsMapping
+{
+public:
+
+public:
+    eInputControllerType mControllerType = eInputControllerType_None;
+    // keyboard mapping
+    ePedestrianAction mKeycodesToActions[eKeycode_COUNT];
+    eKeycode mActionsToKeycodes[ePedestrianAction_COUNT];
+    // gamepad mapping
+    ePedestrianAction mGamepadButtonsToActions[eGamepadButton_COUNT];
+    eGamepadButton mActionsToGamepadButtons[ePedestrianAction_COUNT];
+};

src/Inputs.h

@@ -116,6 +116,7 @@ decl_enum_strings(eGamepadButton);
 // input controller
 enum eInputControllerType
 {
+    eInputControllerType_None,
     eInputControllerType_Keyboard,
     eInputControllerType_Gamepad1,
     eInputControllerType_Gamepad2,

src/enums_impl.cpp

@@ -89,6 +89,7 @@ impl_enum_strings(eGamepadButton)
 
 impl_enum_strings(eInputControllerType)
 {
+    {eInputControllerType_None, "None"},
     {eInputControllerType_Keyboard, "Keyboard"},
     {eInputControllerType_Gamepad1, "Gamepad1"},
     {eInputControllerType_Gamepad2, "Gamepad2"},