Add option to build OBJs with PRIMs (#65)

Author: dbierek

.idea/NavKit.iml

@@ -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.1.0
+        VERSION 2.2.0
         DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman: World of Assassination"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 20)

.idea/misc.xml

@@ -1,3 +1,3 @@
 #define NavKit_VERSION_MAJOR "2"
-#define NavKit_VERSION_MINOR "1"
+#define NavKit_VERSION_MINOR "2"
 #define NavKit_VERSION_PATCH "0"

CMakeLists.txt

@@ -17,7 +17,8 @@
 #define IDM_SETTINGS_NAVKIT                     1200
 #define IDM_SETTINGS_SCENE                      1201
 #define IDM_SETTINGS_RECAST                     1202
-#define IDM_SETTINGS_AIRG                       1203
+#define IDM_SETTINGS_OBJ                        1203
+#define IDM_SETTINGS_AIRG                       1204
 #define IDM_VIEW_NAVP_SHOW_NAVP                 1300
 #define IDM_VIEW_NAVP_SHOW_INDICES              1301
 #define IDM_VIEW_NAVP_SHOW_PF_EXCLUDE_BOXES     1302
@@ -127,3 +128,15 @@
 #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
+#define IDC_RADIO_MESH_TYPE_PRIM                30402
+#define IDC_CHECK_PRIM_LOD_1                    30403
+#define IDC_CHECK_PRIM_LOD_2                    30404
+#define IDC_CHECK_PRIM_LOD_3                    30405
+#define IDC_CHECK_PRIM_LOD_4                    30406
+#define IDC_CHECK_PRIM_LOD_5                    30407
+#define IDC_CHECK_PRIM_LOD_6                    30408
+#define IDC_CHECK_PRIM_LOD_7                    30409
+#define IDC_CHECK_PRIM_LOD_8                    30410

bin/glacier2obj.exe

@@ -82,21 +82,23 @@ namespace ZPathfinding {
         void readJson(simdjson::ondemand::object json);
     };
 
-    class HashAndEntity {
+    class HashesAndEntity {
     public:
-        HashAndEntity() = default;
+        HashesAndEntity() = default;
 
-        std::string hash;
+        std::string alocHash;
+        std::string primHash;
         Entity entity;
 
         void readJson(simdjson::ondemand::object json);
     };
 
-    class Aloc {
+    class Mesh {
     public:
-        Aloc() = default;
+        Mesh() = default;
 
-        std::string hash;
+        std::string alocHash;
+        std::string primHash;
         std::string id;
         std::string name;
         std::string tblu;
@@ -107,16 +109,16 @@ namespace ZPathfinding {
         void writeJson(std::ostream &f) const;
     };
 
-    class Alocs {
+    class Meshes {
     public:
-        Alocs() {
+        Meshes() {
         }
 
-        Alocs(std::string fileName);
+        Meshes(simdjson::ondemand::array alocs);
 
-        std::vector<Aloc> readAlocs() const;
+        std::vector<Mesh> readMeshes() const;
 
-        std::vector<HashAndEntity> hashesAndEntities{};
+        std::vector<HashesAndEntity> hashesAndEntities{};
     };
 
     class PfBox {
@@ -149,13 +151,11 @@ namespace ZPathfinding {
 
         static inline const std::string NO_EXCLUDE_BOX_FOUND = "NO_EXCLUDE_BOX_FOUND";
 
-        PfBoxes(std::string fileName);
+        PfBoxes(simdjson::ondemand::array);
 
         void readPathfindingBBoxes();
 
-        std::vector<PfBox> readExclusionBoxes() const;
-
-        std::vector<HashAndEntity> hashesAndEntities{};
+        std::vector<Entity> entities{};
     };
 
     class PfSeedPoint {
@@ -180,10 +180,10 @@ namespace ZPathfinding {
         PfSeedPoints() {
         }
 
-        PfSeedPoints(std::string fileName);
+        PfSeedPoints(simdjson::ondemand::array pfSeedPoints);
 
         std::vector<PfSeedPoint> readPfSeedPoints() const;
 
-        std::vector<HashAndEntity> hashesAndEntities{};
+        std::vector<Entity> entities{};
     };
 }

include/NavKit/NavKitConfig.h

@@ -42,7 +42,6 @@ class Airg {
     ResourceConverter *airgResourceConverter;
     ResourceGenerator *airgResourceGenerator;
     ReasoningGrid *reasoningGrid;
-    int airgScroll;
     int selectedWaypointIndex;
     bool doAirgHitTest;
     bool buildingVisionAndDeadEndData;

include/NavKit/Resource.h

@@ -73,7 +73,6 @@ class Navp {
     bool doNavpHitTest;
     bool doNavpExclusionBoxHitTest;
     bool doNavpPfSeedPointHitTest;
-    int navpScroll;
     bool loading;
 
     bool stairsCheckboxValue;

include/NavKit/model/ZPathfinding.h

@@ -1,84 +1,106 @@
-#pragma once
-#include <map>
-#include <optional>
-#include <string>
-#include <thread>
-#include <vector>
-
-
-class Obj {
-    explicit Obj();
-
-public:
-    static Obj &getInstance() {
-        static Obj instance;
-        return instance;
-    }
-
-    std::string loadObjName;
-    std::string saveObjName;
-    std::string lastObjFileName;
-    std::string lastSaveObjFileName;
-    std::string generatedObjName;
-    bool objLoaded;
-    bool showObj;
-    bool loadObj;
-    std::vector<std::string> files;
-    const std::string meshesFolder = "Obj";
-    std::string objToLoad;
-    std::vector<bool> objLoadDone;
-    int objScroll;
-    bool startedObjGeneration;
-    bool blenderObjStarted;
-    bool blenderObjGenerationDone;
-    bool glacier2ObjDebugLogsEnabled;
-    bool blenderSet;
-    bool errorBuilding;
-    std::string blenderPath;
-    std::map<std::string, std::pair<int, int> > objectTriangleRanges;
-    bool doObjHitTest;
-
-    static char *openSetBlenderFileDialog(const char *lastBlenderFile);
-
-    void loadObjMesh();
-
-    static void copyObjFile(const std::string &from, const std::string &to);
-
-    void saveObjMesh(char *objToCopy, char *newFileName);
-
-    void setBlenderFile(const std::string &fileName);
-
-    void buildObjFromNavp(bool alsoLoadIntoUi);
-
-    void buildObj(const char *blenderPath, const char *sceneFilePath, const char *outputFolder);
-
-    void finalizeObjBuild();
-
-    static void renderObj();
-
-    static char *openLoadObjFileDialog(const char *lastObjFolder);
-
-    static char *openSaveObjFileDialog(char *lastObjFolder);
-
-    void setLastLoadFileName(const char *fileName);
-
-    void setLastSaveFileName(const char *fileName);
-
-    void handleOpenObjClicked();
-
-    void handleSaveObjClicked();
-
-    bool canLoad() const;
-
-    bool canBuildObjFromNavp() const;
-
-    bool canBuildObjFromScene() const;
-
-    void handleBuildObjFromSceneClicked();
-
-    void handleBuildObjFromNavpClicked();
-
-    void finalizeLoad();
-
-    std::optional<std::jthread> backgroundWorker;
-};
+#pragma once
+#include <map>
+#include <optional>
+#include <string>
+#include <thread>
+#include <vector>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+enum MeshType {
+    ALOC,
+    PRIM
+};
+
+class Obj {
+    explicit Obj();
+
+    static void updateObjDialogControls(HWND hDlg);
+
+public:
+    static Obj &getInstance() {
+        static Obj instance;
+        return instance;
+    }
+
+    std::string loadObjName;
+    std::string saveObjName;
+    std::string lastObjFileName;
+    std::string lastSaveObjFileName;
+    std::string generatedObjName;
+    bool objLoaded;
+    bool showObj;
+    bool loadObj;
+    std::vector<std::string> files;
+    const std::string meshesFolder = "Obj";
+    std::string objToLoad;
+    std::vector<bool> objLoadDone;
+    bool startedObjGeneration;
+    bool blenderObjStarted;
+    bool blenderObjGenerationDone;
+    bool glacier2ObjDebugLogsEnabled;
+    bool errorBuilding;
+    bool errorExtracting;
+    bool extractingAlocsOrPrims;
+    bool doneExtractingAlocsOrPrims;
+    std::map<std::string, std::pair<int, int> > objectTriangleRanges;
+    bool doObjHitTest;
+    MeshType meshTypeForBuild;
+    bool primLods[8];
+    static HWND hObjDialog;
+
+    static char *openSetBlenderFileDialog(const char *lastBlenderFile);
+
+    void loadObjMesh();
+
+    static void copyObjFile(const std::string &from, const std::string &to);
+
+    void saveObjMesh(char *objToCopy, char *newFileName);
+
+    void buildObjFromNavp(bool alsoLoadIntoUi);
+
+    void buildObj();
+
+    void finalizeObjBuild();
+
+    static void renderObj();
+
+    static char *openLoadObjFileDialog(const char *lastObjFolder);
+
+    static char *openSaveObjFileDialog(char *lastObjFolder);
+
+    void setLastLoadFileName(const char *fileName);
+
+    void setLastSaveFileName(const char *fileName);
+
+    void handleOpenObjClicked();
+
+    void handleSaveObjClicked();
+
+    bool canLoad() const;
+
+    static bool canBuildObjFromNavp();
+
+    bool canBuildObjFromScene() const;
+
+    void handleBuildObjFromSceneClicked();
+
+    void handleBuildObjFromNavpClicked();
+
+    void finalizeLoad();
+
+    [[nodiscard]] std::string buildPrimLodsString() const;
+
+    void saveObjSettings() const;
+
+    static INT_PTR ObjSettingsDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    void showObjDialog();
+
+    std::optional<std::jthread> backgroundWorker;
+
+    void finalizeExtractAlocsOrPrims();
+
+private:
+    void extractAlocsOrPrims();
+};