Log output to file, Texture optimization, Json parsing fixes (#82)

Author: dbierek

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_policy(SET CMP0141 NEW)
 set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<CONFIG:Debug>,EditAndContinue,ProgramDatabase>" CACHE STRING "MSVC debug information format")
 project(
         NavKit
-        VERSION 2.11.1
+        VERSION 2.12.0
         DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman: World of Assassination"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)

include/NavKit/NavKitConfig.h

@@ -1,5 +1,3 @@
-#pragma once
-
-#define NavKit_VERSION_MAJOR "2"
-#define NavKit_VERSION_MINOR "11"
-#define NavKit_VERSION_PATCH "1"
+#define NavKit_VERSION_MAJOR "2"
+#define NavKit_VERSION_MINOR "12"
+#define NavKit_VERSION_PATCH "0"

include/NavKit/Resource.h

@@ -20,7 +20,7 @@
 #define IDM_SETTINGS_NAVKIT                     1200
 #define IDM_SETTINGS_SCENE                      1201
 #define IDM_SETTINGS_RECAST                     1202
-#define IDM_SETTINGS_OBJ                        1203
+#define IDM_SETTINGS_SCENE_MESH                 1203
 #define IDM_SETTINGS_AIRG                       1204
 #define IDM_VIEW_NAVP_SHOW_NAVP                 1300
 #define IDM_VIEW_NAVP_SHOW_INDICES              1301
@@ -38,13 +38,14 @@
 #define IDM_VIEW_AIRG_CELL_COLOR_LAYER          1327
 #define IDM_VIEW_LOG_SHOW_LOG                   1330
 #define IDM_VIEW_SCENE_SHOW_BBOX                1340
+#define IDM_VIEW_SCENE_SHOW_AXES                1341
 #define IDM_EXTRACT_SCENE                       1400
 #define IDM_EXTRACT_SCENE_AND_BUILD_OBJ         1401
 #define IDM_EXTRACT_SCENE_AND_BUILD_ALL         1402
 #define IDM_BUILD_OBJ_FROM_SCENE                1500
 #define IDM_BUILD_OBJ_FROM_NAVP                 1501
-#define IDM_BUILD_BLEND_FROM_SCENE				1502
-#define IDM_BUILD_BLEND_AND_OBJ_FROM_SCENE  	1503
+#define IDM_BUILD_BLEND_FROM_SCENE              1502
+#define IDM_BUILD_BLEND_AND_OBJ_FROM_SCENE      1503
 #define IDM_BUILD_NAVP                          1510
 #define IDM_BUILD_AIRG                          1520
 #define IDM_HELP_ABOUT                          1600
@@ -66,6 +67,7 @@
 #define IDC_EDIT_HITMAN_PATH                    30006
 #define IDC_EDIT_OUTPUT_PATH                    30007
 #define IDC_EDIT_BLENDER_PATH                   30008
+#define IDC_CHECK_SHOW_DEBUG_LOGS               30009
 #define IDC_BG_COLOR_TEXT                       30010
 #define IDC_HITMAN_DIR_TEXT                     30011
 #define IDC_OUTPUT_DIR_TEXT                     30012
@@ -148,9 +150,8 @@
 #define IDC_RADIO_BUILD_TYPE_INSTANCE           30412
 #define IDC_CHECK_FILTER_TO_INCLUDE_BOX         30413
 #define IDC_CHECK_SKIP_RPKG_EXTRACT             30414
-#define IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS       30415
-#define IDC_CHECK_EXTRACT_TEXTURE_FILES         30416
-#define IDC_CHECK_APPLY_TEXTURES                30417
+#define IDC_CHECK_EXTRACT_TEXTURE_FILES         30415
+#define IDC_CHECK_APPLY_TEXTURES                30416
 
 #define IDD_EXTRACT_NAVP_DIALOG                 30500
 #define IDC_COMBOBOX_NAVP                       30501

include/NavKit/adapter/RecastAdapter.h

@@ -83,16 +83,10 @@ class RecastAdapter {
 
     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;
-
     void addConvexVolume(Json::PfBox& pfBox) const;
 
     [[nodiscard]] const ConvexVolume* getConvexVolumes() const;
@@ -139,7 +133,6 @@ class RecastAdapter {
     dtQueryFilter* filter;
     dtQueryFilter* filterWithExcluded;
     bool markerPositionSet;
-    bool processHitTestShift;
     float markerPosition[3]{};
     std::string selectedObject;
 

include/NavKit/model/Json.h

@@ -1,12 +1,31 @@
 #pragma once
 
 #include <filesystem>
-#include <map>
 #include <string>
 #include <vector>
+#include <string_view>
 #include "../../../extern/simdjson/simdjson.h"
 
 namespace Json {
+    template <typename t> struct SimdJsonTypeMap;
+
+    template <> struct SimdJsonTypeMap<float> { using type = double; };
+    template <> struct SimdJsonTypeMap<double> { using type = double; };
+    template <> struct SimdJsonTypeMap<int> { using type = int64_t; };
+    template <> struct SimdJsonTypeMap<bool> { using type = bool; };
+    template <> struct SimdJsonTypeMap<std::string> { using type = std::string_view; };
+    std::string toString(double val);
+    std::string toString(int64_t val);
+    std::string toString(bool val);
+    std::string toString(std::string_view val);
+    struct JsonValueProxy {
+        simdjson::ondemand::object json;
+        std::string field;
+        template <typename t, typename = typename SimdJsonTypeMap<t>::type>
+        operator t();
+    };
+    JsonValueProxy getValue(simdjson::ondemand::object json, const std::string& field);
+
     class Vec3 {
     public:
         Vec3(): x(0), y(0), z(0) {

include/NavKit/module/Logger.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <string>
 #include "../../include/ConcurrentQueue/ConcurrentQueue.h"
+#include <fstream>
 
 enum LogCategory {
     NK_INFO = 1,
@@ -10,21 +11,34 @@ enum LogCategory {
 };
 
 class Logger {
+    static const int MAX_MESSAGES = 250;
+    const char* messages[MAX_MESSAGES];
+    std::mutex logMutex;
+    std::ofstream logFile;
+    std::deque<std::string> logBuffer;
+    int messageCount;
+    int textPoolSize;
+    std::unique_ptr<rsj::ConcurrentQueue<std::pair<LogCategory, std::string>>> logQueue;
+
+public:
     explicit Logger();
 
-    std::unique_ptr<rsj::ConcurrentQueue<std::pair<LogCategory, std::string>>> logQueue;
+    int getLogCount() const;
 
-    bool debugLogsEnabled;
+    std::deque<std::string>& getLogBuffer();
+
+    void doLog(const char* msg, int len);
 
-public:
     static Logger& getInstance() {
         static Logger instance;
         return instance;
     }
 
     static void log(LogCategory category, const char* format, ...);
 
-    static void logRunner();
+    [[noreturn]] static void logRunner();
 
     static void rustLogCallback(const char* message);
+
+    std::mutex& getLogMutex();
 };

include/NavKit/module/NavKitSettings.h

@@ -6,6 +6,7 @@ struct DialogSettings {
     std::string hitmanFolder;
     std::string outputFolder;
     std::string blenderPath;
+    bool showDebugLogs;
 };
 
 class NavKitSettings {
@@ -30,6 +31,7 @@ class NavKitSettings {
     std::string hitmanFolder;
     std::string outputFolder;
     std::string blenderPath;
+    bool showDebugLogs;
     static HWND hSettingsDialog;
 
     void setHitmanFolder(const std::string& folderName);

include/NavKit/module/Renderer.h

@@ -46,8 +46,8 @@ class Renderer {
 
     void drawText(const std::string& text, Vec3 pos, Vec3 color = {0.0, 0.0, 0.0}, double size = 32.0) const;
 
-    static void drawBox(Vec3 pos, Vec3 size, Math::Quaternion rotation, bool filled, Vec3 fillColor, bool outlined,
-                        Vec3 outlineColor, float alpha);
+    void drawBox(Vec3 pos, Vec3 size, Math::Quaternion rotation, bool filled, Vec3 fillColor, bool outlined,
+                        Vec3 outlineColor, float alpha) const;
 
     bool initWindowAndRenderer();
 
@@ -65,7 +65,7 @@ class Renderer {
 
     void finalizeFrame() const;
 
-    static void drawBounds();
+    void drawBounds();
 
     void drawAxes();
 

include/NavKit/module/Scene.h

@@ -82,6 +82,7 @@ class Scene {
     float bBoxPos[3]{};
     float bBoxScale[3]{};
     bool showBBox;
+    bool showAxes;
     int version;
     static HWND hSceneDialog;
 

include/NavKit/module/Obj.h include/NavKit/module/SceneMesh.hinclude/NavKit/module/Obj.h renamed to include/NavKit/module/SceneMesh.h

@@ -23,8 +23,8 @@ enum SceneMeshBuildType {
     COPY
 };
 
-class Obj {
-    explicit Obj();
+class SceneMesh {
+    explicit SceneMesh();
 
     static GLuint tileTextureId;
 
@@ -33,8 +33,8 @@ class Obj {
     static void updateObjDialogControls(HWND hDlg);
 
 public:
-    static Obj& getInstance() {
-        static Obj instance;
+    static SceneMesh& getInstance() {
+        static SceneMesh instance;
         return instance;
     }
 
@@ -49,13 +49,12 @@ class Obj {
     std::vector<std::string> files;
     std::string objToLoad;
     std::vector<bool> objLoadDone;
-    bool startedObjGeneration;
-    bool blenderObjStarted;
-    bool blenderObjGenerationDone;
+    bool startedSceneMeshGeneration;
+    bool blenderSceneMeshBuildStarted;
+    bool blenderSceneMeshGenerationDone;
     bool blendFileOnlyBuild;
     bool blendFileAndObjBuild;
     bool filterToIncludeBox;
-    bool glacier2ObjDebugLogsEnabled;
     bool errorBuilding;
     bool skipExtractingAlocsOrPrims;
     bool errorExtracting;
@@ -69,7 +68,7 @@ class Obj {
     bool blendFileBuilt;
     bool extractTextures;
     bool applyTextures;
-    static HWND hObjDialog;
+    static HWND hSceneMeshDialog;
     Model model;
 
     static char* openSetBlenderFileDialog();
@@ -88,9 +87,9 @@ class Obj {
 
     void buildObjFromNavp(bool alsoLoadIntoUi);
 
-    void buildObjFromScene();
+    void buildSceneMeshFromScene();
 
-    void finalizeObjBuild();
+    void finalizeSceneMeshBuild();
 
     void renderObj() const;
 
@@ -140,13 +139,13 @@ class Obj {
 
     static INT_PTR ObjSettingsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-    void showObjDialog();
+    void showSceneMeshDialog();
 
     std::optional<std::jthread> backgroundWorker;
 
     void finalizeExtractResources();
 
     bool shouldExtractTextures() const;
 
-    void extractResourcesAndStartObjBuild();
+    void extractResourcesAndStartSceneMeshBuild();
 };