Use navkit-rpkg-lib instead of exe (#75)

Author: dbierek

.idea/codeStyles/codeStyleConfig.xml

@@ -85,8 +85,8 @@ if(BUILD_INSTALLER)
                     RUNTIME DESTINATION .
             )
             install(FILES
+                    $<TARGET_FILE:glacier2obj>
                     $<TARGET_FILE:NavWeakness>
-                    $<TARGET_FILE:nfd::nfd>
                     $<TARGET_FILE:ResourceLib_HM3>
                     DESTINATION .
             )

.idea/editor.xml

@@ -85,7 +85,7 @@ Functions available are loading and saving Navp and Navp.json, loading Airg and
 # How NavKit generates Navp and Airg files 
 NavKit performs the following series of steps to be able to generate Navp files.
 1. Connect to the Editor server of the running Hitman game, and issue commands to: rebuild the entity tree, find the scene's ZGeomEntities, PFBox entities, and PFSeedPoint entities and send their data back to NavKit, where they are saved to `output.nav.json` in the specified output folder.
-1. Extract all the necessary Aloc or Prim files from the rpkg files to the `aloc` or `prim` folder of the specified output folder using glacier2obj.exe (A rust program included in the installer).
+1. Extract all the necessary Aloc or Prim files from the rpkg files to the `aloc` or `prim` folder of the specified output folder using glacier2obj (A rust library included in the installer).
 1. Open the blender cli and run the `glacier2obj.py` script to generate an obj by importing all the Aloc or Prim files, copy them the number if times they are used in the scene, and transform each one according to what was sent by the game, and save it to `output.obj` in the specified output folder.
 1. Load `output.obj` from the specified output folder or another specified Obj file.
 1. At this point, the build Navp section of the menu will be available, and you can customize the parameters with "Settings > Recast Settings" on the menu bar, then press "Build > Build Navp" on the menu bar to call Recast to generate the Navmesh. Then you can save the Navmesh as a Navp or Navp.json file by pressing the Save Navp button.

.idea/vcs.xml

@@ -6,7 +6,9 @@
 #define IDM_FILE_OPEN_SCENE                     1000
 #define IDM_FILE_OPEN_OBJ                       1001
 #define IDM_FILE_OPEN_NAVP                      1002
-#define IDM_FILE_OPEN_AIRG                      1003
+#define IDM_FILE_OPEN_NAVP_FROM_RPKG            1003
+#define IDM_FILE_OPEN_AIRG                      1004
+#define IDM_FILE_OPEN_AIRG_FROM_RPKG            1005
 #define IDM_FILE_SAVE_SCENE                     1010
 #define IDM_FILE_SAVE_OBJ                       1011
 #define IDM_FILE_SAVE_BLEND                     1012
@@ -147,3 +149,11 @@
 #define IDC_CHECK_FILTER_TO_INCLUDE_BOX         30413
 #define IDC_CHECK_SKIP_RPKG_EXTRACT             30414
 #define IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS       30415
+
+#define IDD_EXTRACT_NAVP_DIALOG                 30500
+#define IDC_COMBOBOX_NAVP                       30501
+#define IDC_BUTTON_LOAD_NAVP_FROM_RPKG          30502
+
+#define IDD_EXTRACT_AIRG_DIALOG                 30600
+#define IDC_COMBOBOX_AIRG                       30601
+#define IDC_BUTTON_LOAD_AIRG_FROM_RPKG          30602

CMakeLists.txt

@@ -4,6 +4,7 @@
 #include <thread>
 #include <vector>
 #define WIN32_LEAN_AND_MEAN
+#include <map>
 #include <windows.h>
 
 struct Vec3;
@@ -74,6 +75,16 @@ class Airg {
 
     void handleSaveAirgClicked();
 
+    void loadAirgFromFile(const std::string& fileName);
+
+    static void updateAirgDialogControls(HWND hwnd);
+
+    static INT_PTR CALLBACK extractAirgDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    void showExtractAirgDialog();
+
+    static void extractAirgFromRpkgs(const std::string& hash);
+
     [[nodiscard]] bool canLoad() const;
 
     [[nodiscard]] bool canSave() const;
@@ -94,6 +105,12 @@ class Airg {
 
     static HWND hAirgDialog;
 
+    std::string loadedAirgText;
+
+    static std::string selectedRpkgAirg;
+
+    static std::map<std::string, std::string> airgHashIoiStringMap;
+
 private:
     static INT_PTR CALLBACK AirgDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 

README.md

@@ -25,4 +25,5 @@ class Logger {
     static void log(LogCategory category, const char *format, ...);
 
     static void logRunner();
+    static void rustLogCallback(const char* message);
 };

bin/glacier2obj.exe

@@ -2,6 +2,8 @@
 #include <map>
 #include <string>
 #include <vector>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 
 #include "../model/ZPathfinding.h"
 
@@ -23,8 +25,9 @@ class Navp {
 
     ~Navp();
 
-    void renderPfSeedPoints() const;
+    static HWND hNavpDialog;
 
+    void renderPfSeedPoints() const;
     void renderPfSeedPointsForHitTest() const;
 
     static Navp &getInstance() {
@@ -37,8 +40,6 @@ class Navp {
         return instance;
     }
 
-    void resetDefaults();
-
     void renderExclusionBoxes() const;
 
     void renderExclusionBoxesForHitTest() const;
@@ -49,6 +50,14 @@ class Navp {
 
     void finalizeBuild();
 
+    static void updateNavpDialogControls(HWND hwnd);
+
+    static INT_PTR CALLBACK extractNavpDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+
+    void showExtractNavpDialog();
+
+    static void extractNavpFromRpkgs(const std::string& hash);
+
     void buildAreaMaps();
 
     void setSelectedNavpAreaIndex(int index);
@@ -79,10 +88,16 @@ class Navp {
 
     std::map<NavPower::Binary::Area *, int> binaryAreaToAreaIndexMap;
 
+    std::string loadedNavpText;
+
+    static std::string selectedRpkgNavp;
+
     void setLastLoadFileName(const char *fileName);
 
     void setLastSaveFileName(const char *fileName);
 
+    void loadNavpFromFile(const std::string& fileName);
+
     void handleOpenNavpClicked();
 
     void saveNavMesh(const std::string &fileName, const std::string &extension);
@@ -106,9 +121,14 @@ class Navp {
     void loadNavMesh(const std::string &fileName, bool isFromJson, bool isFromBuildingNavp, bool isFromBuildingAirg);
 
     std::atomic<bool> navpBuildDone{false};
+
     bool building;
+
     std::optional<std::jthread> backgroundWorker;
+
     void buildNavp();
+
+    static std::map<std::string, std::string> navpHashIoiStringMap;
 private:
 
     static void renderArea(const NavPower::Area &area, bool selected);