minor refactore

Author: codenamecpp

src/AiCharacterController.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "AiCharacterController.h"
 
-void AiCharacterController::UpdateFrame(Pedestrian* pedestrian, Timespan deltaTime)
+void AiCharacterController::UpdateFrame(Pedestrian* pedestrian)
 {
 
 }

src/AiCharacterController.h

@@ -7,6 +7,5 @@ class AiCharacterController final: public CharacterController
 {
 public:
     // process controller logic
-    // @param deltaTime: Time since last frame
-    void UpdateFrame(Pedestrian* pedestrian, Timespan deltaTime) override;
+    void UpdateFrame(Pedestrian* pedestrian) override;
 };

src/CameraController.h

@@ -14,8 +14,7 @@ class CameraController
     {
     }
     // handle camera controller logic
-    // @param deltaTime: Time since last frame
-    virtual void UpdateFrame(Timespan deltaTime)
+    virtual void UpdateFrame()
     {
     }
     // handle input events

src/Carnage3D.vcxproj

@@ -207,6 +207,7 @@
     <ClInclude Include="GraphicsContext.h" />
     <ClInclude Include="GraphicsDefs.h" />
     <ClInclude Include="GraphicsDevice.h" />
+    <ClInclude Include="TimeManager.h" />
     <ClInclude Include="UiContext.h" />
     <ClInclude Include="UiManager.h" />
     <ClInclude Include="handle.h" />
@@ -278,6 +279,7 @@
     <ClCompile Include="FileSystem.cpp" />
     <ClCompile Include="GameParams.cpp" />
     <ClCompile Include="GpuTextureArray2D.cpp" />
+    <ClCompile Include="TimeManager.cpp" />
     <ClCompile Include="UiManager.cpp" />
     <ClCompile Include="imgui.cpp" />
     <ClCompile Include="ConsoleWindow.cpp" />

src/Carnage3D.vcxproj.filters

@@ -329,6 +329,9 @@
     <ClInclude Include="InputsManager.h">
       <Filter>Application</Filter>
     </ClInclude>
+    <ClInclude Include="TimeManager.h">
+      <Filter>Application</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -513,6 +516,9 @@
     <ClCompile Include="InputsManager.cpp">
       <Filter>Application</Filter>
     </ClCompile>
+    <ClCompile Include="TimeManager.cpp">
+      <Filter>Application</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/CarnageGame.cpp

@@ -7,6 +7,7 @@
 #include "PhysicsManager.h"
 #include "Pedestrian.h"
 #include "MemoryManager.h"
+#include "TimeManager.h"
 
 static const char* InputsConfigPath = "config/inputs.json";
 static const char* GTA1MapFileExtension = ".CMP";
@@ -126,7 +127,6 @@ bool CarnageGame::Initialize()
     }
 
     SetupScreenLayout(mNumPlayers);
-    mGameTime = 0;
     return true;
 }
 
@@ -137,22 +137,21 @@ void CarnageGame::Deinit()
     gGameMap.Cleanup();
 }
 
-void CarnageGame::UpdateFrame(Timespan deltaTime)
+void CarnageGame::UpdateFrame()
 {
-    // advance game time
-    mGameTime += deltaTime;
+    float deltaTime = gTimeManager.mGameFrameDelta;
 
     gSpriteManager.UpdateBlocksAnimations(deltaTime);
-    gPhysics.UpdateFrame(deltaTime);
-    gGameObjectsManager.UpdateFrame(deltaTime);
+    gPhysics.UpdateFrame();
+    gGameObjectsManager.UpdateFrame();
 
     for (int ihuman = 0; ihuman < GAME_MAX_PLAYERS; ++ihuman)
     {
         if (mHumanSlot[ihuman].mCharPedestrian == nullptr)
             continue;
 
-        mHumanSlot[ihuman].mCharController.UpdateFrame(mHumanSlot[ihuman].mCharPedestrian, deltaTime);
-        mHumanSlot[ihuman].mCharView.UpdateFrame(deltaTime);
+        mHumanSlot[ihuman].mCharController.UpdateFrame(mHumanSlot[ihuman].mCharPedestrian);
+        mHumanSlot[ihuman].mCharView.UpdateFrame();
     }
 }
 

src/CarnageGame.h

@@ -24,8 +24,6 @@ class CarnageGame final: public cxx::noncopyable
     HumanCharacterSlot mHumanSlot[GAME_MAX_PLAYERS];
     int mNumPlayers = 0;
 
-    Timespan mGameTime;
-
     cxx::randomizer mGameRand;
 
 public:
@@ -36,7 +34,7 @@ class CarnageGame final: public cxx::noncopyable
     void Deinit();
 
     // Common processing
-    void UpdateFrame(Timespan deltaTime);
+    void UpdateFrame();
     void InputEvent(KeyInputEvent& inputEvent);
     void InputEvent(MouseButtonInputEvent& inputEvent);
     void InputEvent(MouseMovedInputEvent& inputEvent);

src/CharacterController.cpp

@@ -7,7 +7,7 @@ CharacterController::~CharacterController()
 {
 }
 
-void CharacterController::UpdateFrame(Pedestrian* pedestrian, Timespan deltaTime)
+void CharacterController::UpdateFrame(Pedestrian* pedestrian)
 {
 }
 

src/CharacterController.h

@@ -9,8 +9,7 @@ class CharacterController: public cxx::noncopyable
     virtual ~CharacterController();
 
     // process controller logic
-    // @param deltaTime: Time since last frame
-    virtual void UpdateFrame(Pedestrian* pedestrian, Timespan deltaTime);
+    virtual void UpdateFrame(Pedestrian* pedestrian);
 
     // clear current state but keep target character bound to controller
     virtual void ResetControlState(Pedestrian* pedestrian);

src/CommonTypes.h

@@ -23,8 +23,8 @@ struct Color32
     // @param cr, cg, cb, ca: Color components
     inline void SetComponents(unsigned char cr, unsigned char cg, unsigned char cb, unsigned char ca)
     {
-        mA = cr;
-        mR = cg;
+        mA = ca;
+        mR = cr;
         mG = cg;
         mB = cb;
     }
@@ -253,73 +253,4 @@ struct Palette256
     }
 public:
     Color32 mColors[256];
-};
-
-// defines time interval in milliseconds
-struct Timespan
-{
-public:    
-    // @param timeMilliseconds: Milliseconds
-    Timespan() = default;
-    Timespan(long long timeMilliseconds) : mMilliseconds(timeMilliseconds)
-    {
-    }
-    inline Timespan& operator += (const Timespan& timespan)
-    {
-        mMilliseconds += timespan.mMilliseconds;
-        return *this;
-    }
-    inline Timespan& operator -= (const Timespan& timespan)
-    {
-        mMilliseconds -= timespan.mMilliseconds;
-        return *this;
-    }
-
-	static const long long MillisecondsPerSecond = 1000LL;
-	static const long long MillisecondsPerMinute = 60000LL;
-	static const long long MillisecondsPerHour = 3600000LL;
-	static const long long MillisecondsPerDay = 86400000LL;
-
-    // convert time to timespan
-    // @param intime: Input amount of time specified in days/hours/minutes/seconds
-    static Timespan FromDays(float intime)
-    {
-        return (long long)(intime * MillisecondsPerDay);
-    }
-
-    static Timespan FromHours(float intime)
-    {
-        return (long long)(intime * MillisecondsPerHour);
-    }
-
-    static Timespan FromMinutes(float intime)
-    {
-        return (long long)(intime * MillisecondsPerMinute);
-    }
-
-    static Timespan FromSeconds(float intime)
-    {
-        return (long long)(intime * MillisecondsPerSecond);
-    }
-
-    // convert timespan to specific time values
-    inline float ToMinutes() const { return (mMilliseconds * 1.0f) / (MillisecondsPerMinute * 1.0f); }
-    inline float ToSeconds() const { return (mMilliseconds * 1.0f) / (MillisecondsPerSecond * 1.0f); }
-    inline float ToDays() const { return (mMilliseconds * 1.0f) / (MillisecondsPerDay * 1.0f); }
-    inline float ToHours() const { return (mMilliseconds * 1.0f) / (MillisecondsPerHour * 1.0f); }
-
-public:
-    long long mMilliseconds = 0;
-};
-
-inline bool operator == (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds == theR.mMilliseconds; }
-inline bool operator != (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds != theR.mMilliseconds; }
-
-inline bool operator > (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds > theR.mMilliseconds; }
-inline bool operator < (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds < theR.mMilliseconds; }
-
-inline bool operator >= (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds >= theR.mMilliseconds; }
-inline bool operator <= (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds <= theR.mMilliseconds; }
-
-inline Timespan operator - (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds - theR.mMilliseconds; }
-inline Timespan operator + (const Timespan& theL, const Timespan& theR) { return theL.mMilliseconds + theR.mMilliseconds; }
+};