Add a BaseApp class

Author: adepierre

ficsit-companion/CMakeLists.txt

@@ -1,29 +1,31 @@
 project(ficsit-companion)
 
 set(HEADER_FILES
-	include/app.hpp
+	include/base_app.hpp
 	include/building.hpp
 	include/fractional_number.hpp
 	include/game_data.hpp
 	include/json.hpp
 	include/link.hpp
 	include/node.hpp
 	include/pin.hpp
+	include/production_app.hpp
 	include/recipe.hpp
 	include/utils.hpp
 )
 
 set(SOURCE_FILES
     ${imgui_SOURCE}
 
-    src/app.cpp
+    src/base_app.cpp
     src/building.cpp
     src/fractional_number.cpp
     src/game_data.cpp
     src/json.cpp
     src/link.cpp
     src/node.cpp
     src/pin.cpp
+    src/production_app.cpp
     src/recipe.cpp
     src/utils.cpp
 

ficsit-companion/include/base_app.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <chrono>
+
+class BaseApp
+{
+public:
+    BaseApp();
+    virtual ~BaseApp();
+    void Render();
+
+    virtual void SaveSession() = 0;
+
+    bool HasRecentInteraction() const;
+
+protected:
+    virtual void RenderImpl() = 0;
+
+private:
+    std::chrono::steady_clock::time_point last_time_interacted;
+};

ficsit-companion/include/app.hpp …sit-companion/include/production_app.hppficsit-companion/include/app.hpp renamed to ficsit-companion/include/production_app.hpp ficsit-companion/include/app.hpp renamed to ficsit-companion/include/production_app.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <chrono>
 #include <map>
 #include <memory>
 #include <string>
@@ -9,25 +8,24 @@
 
 #include <imgui_node_editor.h>
 
+#include "base_app.hpp"
 #include "fractional_number.hpp"
 
 struct Link;
 struct Node;
 struct Pin;
 struct Recipe;
 
-class App
+class ProductionApp : public BaseApp
 {
 public:
-    App();
-    ~App();
-    void Render();
-
-public:
+    ProductionApp();
+    virtual ~ProductionApp();
     /// @brief Save current session (should NOT require an active ImGui context)
-    void SaveSession();
+    virtual void SaveSession() override;
 
-    bool HasRecentInteraction() const;
+protected:
+    virtual void RenderImpl() override;
 
 private:
     /// @brief Load saved session if present
@@ -165,8 +163,6 @@ class App
 
     unsigned int somersloop_texture_id;
 
-    std::chrono::steady_clock::time_point last_time_interacted;
-
     float error_time;
 
     // Used to cycle through the nodes when clicking on the corresponding

ficsit-companion/src/base_app.cpp

@@ -0,0 +1,39 @@
+#include "base_app.hpp"
+
+#include <imgui.h>
+
+BaseApp::BaseApp()
+{
+    last_time_interacted = std::chrono::steady_clock::now();
+}
+
+BaseApp::~BaseApp()
+{
+
+}
+
+void BaseApp::Render()
+{
+    RenderImpl();
+
+    // If any user input happened, reset last time interaction
+    const ImGuiIO& io = ImGui::GetIO();
+    for (const auto& k : io.KeysData)
+    {
+        if (k.Down)
+        {
+            last_time_interacted = std::chrono::steady_clock::now();
+            break;
+        }
+    }
+
+    if (ImGui::IsAnyMouseDown() || io.MouseDelta.x != 0.0f || io.MouseDelta.y != 0.0f)
+    {
+        last_time_interacted = std::chrono::steady_clock::now();
+    }
+}
+
+bool BaseApp::HasRecentInteraction() const
+{
+    return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - last_time_interacted).count() < 10000;
+}

ficsit-companion/src/main.cpp

@@ -25,10 +25,10 @@
 #endif
 #endif
 
-#include "app.hpp"
+#include "production_app.hpp"
 #include "game_data.hpp"
 
-bool Render(SDL_Window* window, App* app)
+bool Render(SDL_Window* window, BaseApp* app)
 {
     SDL_Event event;
     while (SDL_PollEvent(&event))
@@ -207,7 +207,7 @@ int main(int argc, char* argv[])
 
     Data::LoadData("satisfactory");
 
-    App app;
+    ProductionApp app;
 #if !defined(__EMSCRIPTEN__)
     while (Render(window, &app))
     {
@@ -217,12 +217,12 @@ int main(int argc, char* argv[])
     // Write to localStorage when quitting
     emscripten_set_beforeunload_callback(static_cast<void*>(&app), [](int event_type, const void* reserved, void* user_data) {
         // Save current session to disk
-        static_cast<App*>(user_data)->SaveSession();
+        static_cast<BaseApp*>(user_data)->SaveSession();
         // return empty string does not trigger the popup asking if we *really* want to quit
         return "";
     });
 
-    struct WindowApp { SDL_Window* window; App* app; };
+    struct WindowApp { SDL_Window* window; BaseApp* app; };
     WindowApp arg{ window, &app };
     emscripten_set_main_loop_arg([](void* arg) {
         WindowApp* window_app = static_cast<WindowApp*>(arg);