Major reorganization, code cleanup, and refactor

Author: dbierek

include/NavKit/GameConnection.h

@@ -1,111 +1,11 @@
 #pragma once
 
-#include <iostream>
-#include <vector>
-#include <queue>
-#include <time.h>
-#include <stdlib.h>
-#include <chrono>
-
-#include <SDL.h>
-#include <GL/glew.h>
-#include <SDL_opengl.h>
-#include <GL/glu.h>
-#include <GL/glut.h>
-
-#include <SimpleIni.h>
-
-#include <RecastDebugDraw.h>
-
-#include "..\nativefiledialog-extended\nfd.h"
-
-#include "..\..\extern\vcpkg\packages\recastnavigation_x64-windows\include\recastnavigation\RecastAlloc.h"
-#include "..\RecastDemo\ChunkyTriMesh.h"
-#include "..\RecastDemo\imgui.h"
-#include "..\RecastDemo\imguiRenderGL.h"
-#include "..\RecastDemo\InputGeom.h"
-#include "..\RecastDemo\MeshLoaderObj.h"
-#include "..\RecastDemo\SampleInterfaces.h"
-#include "..\RecastDemo\Sample.h"
-#include "..\RecastDemo\Sample_SoloMesh.h"
-
-#include "..\NavWeakness\NavWeakness.h"
-#include "..\NavWeakness\NavPower.h"
-#include "..\ResourceLib_HM3\ResourceConverter.h"
-#include "..\ResourceLib_HM3\ResourceGenerator.h"
-#include "..\ResourceLib_HM3\ResourceLib.h"
-#include "..\ResourceLib_HM3\ResourceLibCommon.h"
-#include "..\ResourceLib_HM3\ResourceLib_HM3.h"
-#include "..\ResourceLib_HM3\Generated\ZHMGen.h"
-
-#include "NavKitConfig.h"
-#include "GameConnection.h"
-#include "ReasoningGrid.h"
-#include "SceneExtract.h"
-#include "Navp.h"
-#include "Obj.h"
-#include "Airg.h"
-#include "FileUtil.h"
-#include "VisionData.h"
-#include "Renderer.h"
-#include "InputHandler.h"
-#include "Gui.h"
-#include <iomanip>
-#include <dbghelp.h>
-#include "Resource.h"
-#include <SDL_syswm.h>
-#include <cpptrace/from_current.hpp>
-#include <stdexcept>
-#pragma comment(lib, "dbghelp.lib")
-#undef main
-
-class Navp;
-class Obj;
-class Airg;
-class SceneExtract;
-class Renderer;
-class InputHandler;
-class GameConnection;
-class Gui;
-
 class NavKit {
 public:
-    NavKit();
-
-    ~NavKit();
-
-    SceneExtract *sceneExtract;
-    Navp *navp;
-    Obj *obj;
-    Airg *airg;
-    Renderer *renderer;
-    InputHandler *inputHandler;
-    Gui *gui;
-
-    GameConnection *gameConnection;
-    Sample *sample;
-    BuildContext ctx;
-
-    bool done;
-
-    float scrollZoom;
-    bool rotate;
-    bool movedDuringRotate;
-    float keybSpeed = 22.0f;
-
-    InputGeom *geom;
-    DebugDrawGL m_dd;
-
-    CSimpleIniA ini;
-
-    int runProgram(int argc, char **argv);
-
-    static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-    static std::string *errorMessage;
-
-private:
-
-    void loadSettings();
+    static NavKit& getInstance() {
+        static NavKit instance;
+        return instance;
+    }
 
+    [[nodiscard]] static int runProgram();
 };

include/NavKit/InputHandler.h

@@ -0,0 +1,57 @@
+#pragma once
+#include <deque>
+#include <mutex>
+#include <string>
+
+class Sample;
+class BuildContext;
+class InputGeom;
+class DebugDrawGL;
+
+class RecastAdapter {
+    RecastAdapter();
+
+public:
+    static RecastAdapter &getInstance() {
+        static RecastAdapter instance;
+        return instance;
+    }
+
+    void log(int category, const std::string &message) const;
+
+    void drawInputGeom() const;
+
+    [[nodiscard]] bool loadInputGeom(const std::string & fileName);
+
+    void resetInputGeom();
+
+    void setMeshBBox(const float * bBoxMin, const float * bBoxMax) const;
+    [[nodiscard]] const float* getBBoxMin() const;
+    [[nodiscard]] const float* getBBoxMax() const;
+
+    [[nodiscard]] std::pair<int, int> getGridSize() const;
+
+    void handleMeshChanged() const;
+    [[nodiscard]] bool handleBuild() const;
+
+    void handleCommonSettings() const;
+
+    void resetCommonSettings() const;
+
+    void save(const std::string &data) const;
+
+    [[nodiscard]] std::mutex &getLogMutex() const;
+
+    [[nodiscard]] int getVertCount() const;
+
+    [[nodiscard]] int getTriCount() const;
+
+    [[nodiscard]] int getLogCount() const;
+
+    std::deque<std::string> &getLogBuffer() const;
+
+    Sample *sample;
+    BuildContext *buildContext;
+    InputGeom *inputGeom;
+    DebugDrawGL *debugDraw;
+};

include/NavKit/Logger.h

@@ -2,11 +2,8 @@
 
 #include <string>
 #include <vector>
-#include <iostream>
 #include <filesystem>
-#include <fstream>
-#include <stdlib.h>
-#include "..\..\extern\simdjson\simdjson.h"
+#include "../../../extern/simdjson/simdjson.h"
 
 namespace PfBoxes {
     class Vec3 {
@@ -94,12 +91,12 @@ namespace PfBoxes {
 
     class PfBoxes {
     public:
-        PfBoxes() : hashesAndEntities() {
+        PfBoxes() {
         }
 
         static inline const std::string INCLUDE_TYPE = "PFBT_INCLUDE_MESH_COLLISION";
 
-        PfBoxes(char *fileName);
+        PfBoxes(const char *fileName);
 
         PfBox getPathfindingBBox();
 

include/NavKit/NavKit.h

@@ -1,18 +1,8 @@
 #pragma once
 
-#include <string>
 #include <vector>
-#include <set>
-#include <iostream>
-#include <filesystem>
-#include <fstream>
-#include <stdlib.h>
-#include "..\NavWeakness\NavPower.h"
-#include "..\RecastDemo\SampleInterfaces.h"
-#include "..\..\extern\simdjson\simdjson.h"
-#include "NavKit.h"
-
-class NavKit;
+#include "../../NavWeakness/NavPower.h"
+#include "../../../extern/simdjson/simdjson.h"
 
 class Vec4 {
 public:
@@ -51,8 +41,8 @@ class SizedArray {
 
 class Waypoint {
 public:
-    Waypoint() : vPos({}), nVisionDataOffset(0), nLayerIndex(0), xi(-1), yi(-1), zi(-1), cellBitmap{false},
-                 nNeighbors{65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535} {
+    Waypoint() : nNeighbors{65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535}, vPos({}), nVisionDataOffset(0), nLayerIndex(0), cellBitmap{false}, xi(-1), yi(-1),
+                 zi(-1) {
     }
 
     std::vector<uint16_t> nNeighbors;
@@ -89,8 +79,7 @@ class ReasoningGridBuilderHelper {
 
 class ReasoningGrid {
 public:
-    ReasoningGrid() : m_Properties(), m_HighVisibilityBits(), m_LowVisibilityBits(), m_deadEndData(), m_nNodeCount(),
-                      m_WaypointList(), m_pVisibilityData() {
+    ReasoningGrid() : m_Properties(), m_HighVisibilityBits(), m_LowVisibilityBits(), m_deadEndData(), m_nNodeCount() {
     }
 
     Properties m_Properties;
@@ -107,6 +96,6 @@ class ReasoningGrid {
 
     std::vector<uint8_t> getWaypointVisionData(int waypointIndex);
 
-    static void build(ReasoningGrid *airg, NavPower::NavMesh *navMesh, NavKit *ctx, float spacing, float zSpacing,
+    static void build(ReasoningGrid *airg, NavPower::NavMesh *navMesh, float spacing, float zSpacing,
                       float tolerance, float zTolerance);
 };

include/NavKit/adapter/RecastAdapter.h

@@ -20,15 +20,15 @@ class VisionData {
 public:
     VisionData() = default;
 
-    constexpr VisionData(VisionDataType type) : visionDataType(type) {
+    explicit constexpr VisionData(const VisionDataType type) : visionDataType(type) {
     }
 
-    constexpr bool operator==(VisionData a) const { return visionDataType == a.visionDataType; }
-    constexpr bool operator!=(VisionData a) const { return visionDataType != a.visionDataType; }
+    constexpr bool operator==(const VisionData a) const { return visionDataType == a.visionDataType; }
+    constexpr bool operator!=(const VisionData a) const { return visionDataType != a.visionDataType; }
 
-    std::string getName();
+    std::string getName() const;
 
-    Vec4 getColor();
+    Vec4 getColor() const;
 
     static VisionData GetVisionDataType(int size);