Changeset 5192672 in opengl-game for vulkan-game.hpp

Timestamp:

Mar 7, 2021, 11:05:27 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

429ac01

Parents:

317ad13

Message:

Add ui-value\.hpp to the VulkanGame project and make curTime an instance variable of VulkanGame instead of a global

File:

• vulkan-game.hpp (modified) (6 diffs)

vulkan-game.hpp

@@ -5 +5 @@
 #include <chrono>
 #include <map>
+#include <vector>
 
 #define GLM_FORCE_RADIANS
@@ -135 +136 @@
 // them mamdatory
 
-// TODO: Make a singleton timer class instead
-static float curTime;
-
 
 // TODO: Look into using dynamic_cast to check types of SceneObject and EffectOverTime
@@ -144 +142 @@
    bool deleted;
 
-   virtual void applyEffect() = 0;
+   virtual void applyEffect(float curTime) = 0;
 
    BaseEffectOverTime() :
@@ -166 +164 @@
    EffectOverTime(GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
          vector<SceneObject<VertexType, SSBOType>>& objects, unsigned int objectIndex,
-         size_t effectedFieldOffset, float changePerSecond) :
+         size_t effectedFieldOffset, float startTime, float changePerSecond) :
          pipeline(pipeline),
          objects(objects),
          objectIndex(objectIndex),
          effectedFieldOffset(effectedFieldOffset),
-         startTime(curTime),
+         startTime(startTime),
          changePerSecond(changePerSecond) {
       size_t ssboOffset = offset_of(&SceneObject<VertexType, SSBOType>::ssbo);
@@ -181 +179 @@
    }
 
-   void applyEffect() {
+   void applyEffect(float curTime) {
       if (objects[objectIndex].ssbo.deleted) {
          this->deleted = true;
@@ -364 +362 @@
       vector<BaseEffectOverTime*> effects;
 
+      // TODO: Make a separate TImer class
+      // It could also deal with the steady_clock vs high_resolution_clock issue
       time_point<steady_clock> startTime;
-      float prevTime, elapsedTime;
-
-      float fpsStartTime;
+      float fpsStartTime, curTime, prevTime, elapsedTime;
+
       int frameCount;