CommandPattern Implementation for user Inputs/Bindings

PixelProject/AnyClickCommand.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "ICommand.h"
+
+class AnyClickCommand : public ICommand
+{
+public:
+   void Execute() override = 0;
+};

PixelProject/AnyInputCommand.h

@@ -0,0 +1,8 @@
+#pragma once
+#include "ICommand.h"
+
+class AnyInputCommand : public ICommand
+{
+public:
+   void Execute() override = 0;
+};

PixelProject/Game.cpp

@@ -115,6 +115,8 @@ void Game::Run()
 
       fixedRemainingTime+= deltaTime;
 
+      //? ======
+      // Fixed Update
       uint8_t frameFixedStepCounter = 0;
       while (fixedRemainingTime > game_settings->target_sand_update_time) {
          world_sim->FixedUpdate();
@@ -128,7 +130,7 @@ void Game::Run()
 
       //? ======
       //! Update
-      input_manager->Update();
+      input_manager->UpdateInputs();
       if (input_manager->IsShuttingDown()) break;
 
       //TODO maybe don't leave this here

PixelProject/ICommand.h

@@ -0,0 +1,14 @@
+#pragma once
+#include <SDL_stdinc.h>
+
+/// <summary>
+/// Command Pattern Implementation with a couple choices for Args
+/// </summary>
+class ICommand
+{
+public:
+   virtual ~ICommand() = default;
+
+   virtual void Execute() = 0;
+   virtual void Execute(Uint32 value) = 0;
+};

PixelProject/InputConfig.h

@@ -0,0 +1,52 @@
+#pragma once
+#include "InputKeyCodes.h"
+#include "ISerializable.h"
+
+struct InputConfig : public ISerializable
+{
+protected:
+   void Save(cereal::JSONOutputArchive out_archive) override;
+   void Load(cereal::JSONInputArchive in_archive) override;
+
+   SaveTypes SaveType() override
+   {
+      return SaveTypes::Json;
+   }
+public:
+   std::string FilePath() override
+   {
+      return std::string("InputConfig");
+   }
+
+   MouseCode m_fire1 = MouseCode::MouseLeft;
+   MouseCode m_fire2 = MouseCode::MouseRight;
+
+   KeyCode m_move_left[2]{ KeyCode::A, KeyCode::Left };
+   KeyCode m_move_north[2]{ KeyCode::W, KeyCode::Up};
+   KeyCode m_move_east[2]{ KeyCode::D, KeyCode::Right };
+   KeyCode m_move_south[2]{ KeyCode::S, KeyCode::Down };
+
+   KeyCode m_action1 = KeyCode::Space;
+};
+
+inline void InputConfig::Save(cereal::JSONOutputArchive out_archive)
+{
+   out_archive(::cereal::make_nvp("Fire1", m_fire1));
+   out_archive(::cereal::make_nvp("Fire2", m_fire2));
+   out_archive(::cereal::make_nvp("Left", m_move_left));
+   out_archive(::cereal::make_nvp("Up", m_move_north));
+   out_archive(::cereal::make_nvp("Right", m_move_east));
+   out_archive(::cereal::make_nvp("Down", m_move_south));
+   out_archive(::cereal::make_nvp("Action", m_action1));
+}
+
+inline void InputConfig::Load(cereal::JSONInputArchive in_archive)
+{
+   in_archive(::cereal::make_nvp("Fire1", m_fire1));
+   in_archive(::cereal::make_nvp("Fire2", m_fire2));
+   in_archive(::cereal::make_nvp("Left", m_move_left));
+   in_archive(::cereal::make_nvp("Up", m_move_north));
+   in_archive(::cereal::make_nvp("Right", m_move_east));
+   in_archive(::cereal::make_nvp("Down", m_move_south));
+   in_archive(::cereal::make_nvp("Action", m_action1));
+}

PixelProject/InputManager.cpp

@@ -8,13 +8,23 @@ bool InputManager::IsValidKey(KeyCode& key_code)
    return true;
 }
 
+InputManager::InputManager()
+{
+   input_configuration_.StartLoad(input_configuration_.FilePath().c_str(), true);
+}
+
 InputManager& InputManager::Instance()
 {
    static InputManager instance;
    return instance;
 }
 
-void InputManager::Update()
+void InputManager::CallInputHandler()
+{
+
+}
+
+void InputManager::UpdateInputs()
 {
    // We clear all our states
    // Keyboard

PixelProject/InputManager.h

@@ -6,16 +6,21 @@
 #include <vector>
 
 
+#include "InputConfig.h"
 #include "InputKeyCodes.h"
 //TODO Implement an event system? Would be nice to call events from here
 
+/// <summary>
+/// A low level Input Management System, 
+/// </summary>
 class InputManager
 {
 public:
 
    static InputManager& Instance();
 
-   void Update();
+   void UpdateInputs();
+   void CallInputHandler();
 
    bool IsAnyKeyDown() const;
    bool IsMovementKeysDown();
@@ -53,9 +58,11 @@ class InputManager
 protected:
    static inline bool IsValidKey(KeyCode& key_code);
 private:
-   InputManager() = default;
+   InputManager();
    ~InputManager() = default;
 
+   InputConfig input_configuration_;
+
    const Uint8* keyboard_ = nullptr;
    uint32_t mouse_ = 0;
 

PixelProject/PixelProject.vcxproj

@@ -305,6 +305,7 @@ XCOPY "$(SolutionDir)$(ProjectName)\textures" "$(TargetDir)textures\" /S/E /Y</C
     <ClInclude Include="..\Includes\imgui-master\imstb_textedit.h" />
     <ClInclude Include="..\Includes\imgui-master\imstb_truetype.h" />
     <ClInclude Include="AcidPixel.h" />
+    <ClInclude Include="AnyClickCommand.h" />
     <ClInclude Include="BitWise.h" />
     <ClInclude Include="boost\threadpool.hpp" />
     <ClInclude Include="Camera.h" />
@@ -317,8 +318,11 @@ XCOPY "$(SolutionDir)$(ProjectName)\textures" "$(TargetDir)textures\" /S/E /Y</C
     <ClInclude Include="FlyCamera.h" />
     <ClInclude Include="GoldPixel.h" />
     <ClInclude Include="GUIManager.h" />
+    <ClInclude Include="ICommand.h" />
+    <ClInclude Include="AnyInputCommand.h" />
     <ClInclude Include="InputKeyCodes.h" />
     <ClInclude Include="InputManager.h" />
+    <ClInclude Include="InputConfig.h" />
     <ClInclude Include="IO.h" />
     <ClInclude Include="ISerializable.h" />
     <ClInclude Include="IVec2.h" />

PixelProject/PixelProject.vcxproj.filters

@@ -127,6 +127,15 @@
     <Filter Include="Resource Files\textures">
       <UniqueIdentifier>{9ae9cd85-b312-4b2c-b5ba-331d28309b1d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Input\Commands">
+      <UniqueIdentifier>{b3d5f49d-0b60-4182-a5a4-208e886f2132}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Input\Commands\Interface">
+      <UniqueIdentifier>{278696e8-d1e1-444e-bba9-76de276bbb3a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\Input\InputSettings">
+      <UniqueIdentifier>{bb3998af-5673-4a15-8463-45f1360c763a}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -408,7 +417,19 @@
       <Filter>Header Files\Rendering</Filter>
     </ClInclude>
     <ClInclude Include="RenderObject.h">
-      <Filter>Header Files\Rendering\FastRender</Filter>
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="AnyInputCommand.h">
+      <Filter>Header Files\Input\Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="AnyClickCommand.h">
+      <Filter>Header Files\Input\Commands</Filter>
+    </ClInclude>
+    <ClInclude Include="ICommand.h">
+      <Filter>Header Files\Input\Commands\Interface</Filter>
+    </ClInclude>
+    <ClInclude Include="InputConfig.h">
+      <Filter>Header Files\Input\InputSettings</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>