Make all settings persist to the ini file (#71)

Author: dbierek

.idea/dictionaries/project.xml

@@ -34,6 +34,7 @@
 #define IDM_VIEW_AIRG_CELL_COLOR_VISION_DATA    1326
 #define IDM_VIEW_AIRG_CELL_COLOR_LAYER          1327
 #define IDM_VIEW_LOG_SHOW_LOG                   1330
+#define IDM_VIEW_SCENE_SHOW_BBOX                1340
 #define IDM_EXTRACT_SCENE                       1400
 #define IDM_EXTRACT_SCENE_AND_BUILD_OBJ         1401
 #define IDM_EXTRACT_SCENE_AND_BUILD_ALL         1402
@@ -82,13 +83,12 @@
 #define IDC_SLIDER_BBOX_SCALE_X                 30204
 #define IDC_SLIDER_BBOX_SCALE_Y                 30205
 #define IDC_SLIDER_BBOX_SCALE_Z                 30206
-#define IDC_BUTTON_BBOX_RESET                   30207
-#define IDC_STATIC_BBOX_POS_X_VAL               30208
-#define IDC_STATIC_BBOX_POS_Y_VAL               30209
-#define IDC_STATIC_BBOX_POS_Z_VAL               30210
-#define IDC_STATIC_BBOX_SCALE_X_VAL             30211
-#define IDC_STATIC_BBOX_SCALE_Y_VAL             30212
-#define IDC_STATIC_BBOX_SCALE_Z_VAL             30213
+#define IDC_STATIC_BBOX_POS_X_VAL               30207
+#define IDC_STATIC_BBOX_POS_Y_VAL               30208
+#define IDC_STATIC_BBOX_POS_Z_VAL               30209
+#define IDC_STATIC_BBOX_SCALE_X_VAL             30210
+#define IDC_STATIC_BBOX_SCALE_Y_VAL             30211
+#define IDC_STATIC_BBOX_SCALE_Z_VAL             30212
 
 #define IDD_RECAST_MENU                         30300
 #define IDC_SLIDER_CELL_SIZE                    30301
@@ -128,7 +128,6 @@
 #define IDC_STATIC_TILING_INFO_TILES            30335
 #define IDC_STATIC_TILING_INFO_MAX_TILES        30336
 #define IDC_STATIC_TILING_INFO_MAX_POLYS        30337
-#define IDC_BUTTON_RECAST_RESET                 30338
 
 #define IDD_OBJ_SETTINGS                        30400
 #define IDC_RADIO_MESH_TYPE_ALOC                30401

include/NavKit/Resource.h

@@ -103,14 +103,16 @@ class RecastAdapter {
 
     dtPolyRef getPolyRefForLink(const dtLink &link) const;
 
-    dtPolyRef getFirstLink(dtPolyRef polyRef) const;
-
     bool PFLineBlocked(const Vec3 &recastStart, const Vec3 &recastEnd) const;
 
     dtPolyRef getAdjacentPoly(dtPolyRef poly, int edgeIndex) const;
 
     void doHitTest(int mx, int my);
 
+    void loadSettings() const;
+
+    void saveSettings() const;
+
     static Vec3 convertFromNavPowerToRecast(Vec3 pos);
 
     static Vec3 convertFromRecastToNavPower(Vec3 pos);
@@ -142,7 +144,9 @@ class RecastAdapter {
     std::string selectedObject;
 
     static HWND hRecastDialog;
+
 private:
     std::vector<dtPolyRef> pfSeedPointAreas;
-    static INT_PTR CALLBACK RecastDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    static INT_PTR CALLBACK recastDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 };

include/NavKit/adapter/RecastAdapter.h

@@ -88,6 +88,8 @@ namespace ZPathfinding {
 
         std::string alocHash;
         std::string primHash;
+        std::string roomName;
+        std::string roomFolderName;
         Entity entity;
 
         void readJson(simdjson::ondemand::object json);
@@ -99,6 +101,8 @@ namespace ZPathfinding {
 
         std::string alocHash;
         std::string primHash;
+        std::string roomName;
+        std::string roomFolderName;
         std::string id;
         std::string name;
         std::string tblu;
@@ -149,7 +153,7 @@ namespace ZPathfinding {
         static inline const std::string INCLUDE_TYPE = "PFBT_INCLUDE_MESH_COLLISION";
         static inline const std::string EXCLUDE_TYPE = "PFBT_EXCLUDE_MESH_COLLISION";
 
-        static inline const std::string NO_EXCLUDE_BOX_FOUND = "NO_EXCLUDE_BOX_FOUND";
+        static inline const std::string NO_INCLUDE_BOX_FOUND = "NO_EXCLUDE_BOX_FOUND";
 
         PfBoxes(simdjson::ondemand::array);
 

include/NavKit/model/ZPathfinding.h

@@ -27,8 +27,6 @@ class GameConnection {
 
     ~GameConnection();
 
-    void sendChunk(const std::vector<NavPower::Area> &areas, int chunkIndex, int chunkCount) const;
-
     int connectToGame();
 
     [[nodiscard]] int closeConnection() const;

include/NavKit/module/GameConnection.h

@@ -1,16 +1,25 @@
 #pragma once
 #include <SimpleIni.h>
 
-class Settings {
-    static INT_PTR SettingsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+struct DialogSettings {
+    float backgroundColor{};
+    std::string hitmanFolder;
+    std::string outputFolder;
+    std::string blenderPath;
+};
 
-    explicit Settings();
+class NavKitSettings {
+    static void resetDefaults(DialogSettings &settings);
 
-    CSimpleIniA ini;
+    static void setDialogInputs(HWND hDlg, const DialogSettings &tempSettings);
+
+    static INT_PTR SettingsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    explicit NavKitSettings();
 
 public:
-    static Settings &getInstance() {
-        static Settings instance;
+    static NavKitSettings &getInstance() {
+        static NavKitSettings instance;
         return instance;
     }
 
@@ -23,17 +32,13 @@ class Settings {
     std::string blenderPath;
     static HWND hSettingsDialog;
 
-    void setValue(const std::string &folder, const std::string &key, const std::string &value);
-
     void setHitmanFolder(const std::string &folderName);
 
     void setOutputFolder(const std::string &folderName);
 
     void setBlenderFile(const std::string &fileName);
 
-    void save() const;
-
-    void load();
+    void showNavKitSettingsDialog();
 
-    void showSettingsDialog();
+    void loadSettings();
 };

include/NavKit/module/Settings.h include/NavKit/module/NavKitSettings.hinclude/NavKit/module/Settings.h renamed to include/NavKit/module/NavKitSettings.h

@@ -52,6 +52,8 @@ class Obj {
 
     static char *openSetBlenderFileDialog(const char *lastBlenderFile);
 
+    void loadSettings();
+
     void loadObjMesh();
 
     static void copyObjFile(const std::string &from, const std::string &to);
@@ -98,6 +100,8 @@ class Obj {
 
     void saveObjSettings() const;
 
+    void resetDefaults();
+
     static INT_PTR ObjSettingsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
     void showObjDialog();

include/NavKit/module/Obj.h

@@ -0,0 +1,22 @@
+#pragma once
+#include <SimpleIni.h>
+
+class PersistedSettings {
+    explicit PersistedSettings();
+
+    CSimpleIniA ini;
+
+public:
+    static PersistedSettings &getInstance() {
+        static PersistedSettings instance;
+        return instance;
+    }
+
+    const char *getValue(const std::string &folder, const std::string &key, const std::string &defaultValue) const;
+
+    void setValue(const std::string &folder, const std::string &key, const std::string &value);
+
+    void save() const;
+
+    void load();
+};

include/NavKit/module/PersistedSettings.h

@@ -10,10 +10,10 @@ typedef int GLint;
 
 enum HitTestType {
     NONE = 0,
-    NAVMESH_AREA = 60,
-    AIRG_WAYPOINT = 61,
-    PF_SEED_POINT = 62,
-    PF_EXCLUSION_BOX = 63
+    NAVMESH_AREA = 240,
+    AIRG_WAYPOINT = 241,
+    PF_SEED_POINT = 242,
+    PF_EXCLUSION_BOX = 243
 };
 
 class HitTestResult {
@@ -31,6 +31,8 @@ class Renderer {
 
     ~Renderer();
 
+    void handleMoved();
+
     static Renderer &getInstance() {
         static Renderer instance;
         return instance;
@@ -47,6 +49,8 @@ class Renderer {
 
     void closeWindow() const;
 
+    void loadSettings();
+
     void initFrameRate(float frameRateValue);
 
     void updateFrameRate();

include/NavKit/module/Renderer.h

@@ -63,9 +63,12 @@ class Scene {
     std::optional<std::jthread> backgroundWorker;
     float bBoxPos[3]{};
     float bBoxScale[3]{};
+    bool showBBox;
     int version;
     static HWND hSceneDialog;
 
+    const ZPathfinding::Mesh *findMeshByHashAndIdAndPos(const std::string &hash, const std::string &id, const float *pos) const;
+
 private:
     std::string loadSceneName;
     std::string saveSceneName;