Changeset 40eb092 in opengl-game for sdl-game.hpp

Timestamp:

Mar 9, 2021, 2:47:00 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

20e4c2b

Parents:

429ac01

Message:

In SDLGame, implement the game UI using ImGui

File:

• sdl-game.hpp (modified) (5 diffs)

sdl-game.hpp

@@ -2 +2 @@
 #define _SDL_GAME_H
 
+#include <chrono>
+#include <map>
 #include <vector>
+
 #include <vulkan/vulkan.h>
 
@@ -15 +18 @@
 
 using namespace std;
+using namespace std::chrono;
 
 #define VulkanGame NewVulkanGame
@@ -23 +27 @@
    const bool ENABLE_VALIDATION_LAYERS = true;
 #endif
+
+// TODO: Maybe move this to a different header
+
+enum UIValueType {
+   UIVALUE_INT,
+   UIVALUE_DOUBLE,
+};
+
+struct UIValue {
+   UIValueType type;
+   string label;
+   void* value;
+
+   UIValue(UIValueType _type, string _label, void* _value) : type(_type), label(_label), value(_value) {}
+};
 
 class VulkanGame {
@@ -88 +107 @@
       bool shouldRecreateSwapChain;
 
-      // My code, but not complete. Skips creating the SDL renderer, probably because it doesn't use hardware acceleration.
-      // I should try to get uncapped framerate and compare performance w/ and w/out an SDL renderer
+      /*** High-level vars ***/
+
+      void (VulkanGame::* currentRenderScreenFn)();
+
+      map<string, vector<UIValue>> valueLists;
+
+      int score;
+      float fps;
+
+      // TODO: Make a separate singleton Timer class
+      // It could also deal with the steady_clock vs high_resolution_clock issue
+      time_point<steady_clock> startTime;
+      float fpsStartTime, curTime;
+
+      int frameCount;
+
+      /*** Functions ***/
+
       bool initUI(int width, int height, unsigned char guiFlags);
-      void initVulkan(); // Mostly example code
-      void cleanup(); // Mostly example
+      void initVulkan();
+      void renderLoop();
+      void cleanup();
 
       void createVulkanInstance(const vector<const char*>& validationLayers);
@@ -120 +156 @@
       void cleanupSwapChain();
 
+      /*** High-level functions ***/
+
+      void renderMainScreen();
+      void renderGameScreen();
+
+      void initGuiValueLists(map<string, vector<UIValue>>& valueLists);
+      void renderGuiValueList(vector<UIValue>& values);
+
+      void goToScreen(void (VulkanGame::* renderScreenFn)());
+      void quitGame();
+
       // Pipeline variables. Hopefully, I can eventually use the GraphicsPipeline_Vulkan class for the imgui pipeline
       VkDescriptorPool descriptorPool;
-
 };