2.7.1: add option to enable filter, save blend menu item

Author: dbierek

.idea/editor.xml

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

CMakeLists.txt

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

include/NavKit/NavKitConfig.h

@@ -9,8 +9,9 @@
 #define IDM_FILE_OPEN_AIRG                      1003
 #define IDM_FILE_SAVE_SCENE                     1010
 #define IDM_FILE_SAVE_OBJ                       1011
-#define IDM_FILE_SAVE_NAVP                      1012
-#define IDM_FILE_SAVE_AIRG                      1013
+#define IDM_FILE_SAVE_BLEND                     1012
+#define IDM_FILE_SAVE_NAVP                      1013
+#define IDM_FILE_SAVE_AIRG                      1014
 #define IDM_FILE_EXIT                           1020
 #define IDM_EDIT_NAVP_STAIRS                    1100
 #define IDM_EDIT_AIRG_CONNECT_WAYPOINT          1101
@@ -143,5 +144,6 @@
 #define IDC_CHECK_PRIM_LOD_8                    30410
 #define IDC_RADIO_BUILD_TYPE_COPY               30411
 #define IDC_RADIO_BUILD_TYPE_INSTANCE           30412
-#define IDC_CHECK_SKIP_RPKG_EXTRACT             30413
-#define IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS       30414
+#define IDC_CHECK_FILTER_TO_INCLUDE_BOX         30413
+#define IDC_CHECK_SKIP_RPKG_EXTRACT             30414
+#define IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS       30415

include/NavKit/Resource.h

@@ -44,6 +44,7 @@ class Obj {
     bool blenderObjGenerationDone;
     bool blendFileOnlyBuild;
     bool blendFileAndObjBuild;
+    bool filterToIncludeBox;
     bool glacier2ObjDebugLogsEnabled;
     bool errorBuilding;
     bool skipExtractingAlocsOrPrims;
@@ -55,6 +56,7 @@ class Obj {
     MeshType meshTypeForBuild;
     SceneMeshBuildType sceneMeshBuildType;
     bool primLods[8];
+    bool blendFileBuilt;
     static HWND hObjDialog;
 
     static char *openSetBlenderFileDialog(const char *lastBlenderFile);
@@ -65,10 +67,12 @@ class Obj {
 
     void handleBuildBlendAndObjFromSceneClicked();
 
-    static void copyObjFile(const std::string &from, const std::string &to);
+    static void copyFile(const std::string &from, const std::string &to, const std::string& filetype);
 
     void saveObjMesh(char *objToCopy, char *newFileName);
 
+    void saveBlendMesh(std::string objToCopy, std::string newFileName);
+
     void buildObjFromNavp(bool alsoLoadIntoUi);
 
     void buildObjFromScene();
@@ -77,9 +81,11 @@ class Obj {
 
     static void renderObj();
 
-    static char *openLoadObjFileDialog(const char *lastObjFolder);
+    static char *openLoadObjFileDialog();
+
+    static char *openSaveObjFileDialog();
 
-    static char *openSaveObjFileDialog(char *lastObjFolder);
+    static char* openSaveBlendFileDialog();
 
     void setLastLoadFileName(const char *fileName);
 
@@ -88,12 +94,14 @@ class Obj {
     void handleOpenObjClicked();
 
     void handleSaveObjClicked();
+    void handleSaveBlendClicked();
 
     [[nodiscard]] bool canLoad() const;
 
     static bool canBuildObjFromNavp();
 
     [[nodiscard]] bool canBuildObjFromScene() const;
+    bool canSaveBlend() const;
 
     [[nodiscard]] bool canBuildBlendFromScene() const;
 

include/NavKit/module/Obj.h

@@ -15,6 +15,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Save &Scene",                              IDM_FILE_SAVE_SCENE
         MENUITEM "Save &Obj",                                IDM_FILE_SAVE_OBJ
+        MENUITEM "Save &Blend",                              IDM_FILE_SAVE_BLEND
         MENUITEM "Save &Navp",                               IDM_FILE_SAVE_NAVP
         MENUITEM "Save &Airg",                               IDM_FILE_SAVE_AIRG
         MENUITEM SEPARATOR
@@ -64,20 +65,19 @@ BEGIN
     BEGIN
         MENUITEM "Extract &Scene from game",                 IDM_EXTRACT_SCENE
         MENUITEM "Extract Scene from game and build &Obj",   IDM_EXTRACT_SCENE_AND_BUILD_OBJ
-        MENUITEM "Extract Scene from game and build &all",   IDM_EXTRACT_SCENE_AND_BUILD_ALL
+        MENUITEM "Extract Scene, build &navp and airg",      IDM_EXTRACT_SCENE_AND_BUILD_ALL
     END
 
     POPUP "&Build"
     BEGIN
         MENUITEM "Build Obj from &Scene",                    IDM_BUILD_OBJ_FROM_SCENE
         MENUITEM "Build Obj from &Navp",                     IDM_BUILD_OBJ_FROM_NAVP
+        MENUITEM "Build Obj and Blend from &Scene"           IDM_BUILD_BLEND_AND_OBJ_FROM_SCENE
+        MENUITEM "Build Blend from &Scene"                   IDM_BUILD_BLEND_FROM_SCENE
         MENUITEM SEPARATOR
         MENUITEM "Build &Navp from Obj and Scene",           IDM_BUILD_NAVP
         MENUITEM SEPARATOR
         MENUITEM "Build &Airg from Navp",                    IDM_BUILD_AIRG
-        MENUITEM SEPARATOR
-        MENUITEM "Build Blend from &Scene"                   IDM_BUILD_BLEND_FROM_SCENE
-        MENUITEM "Build Blend and Obj from &Scene"           IDM_BUILD_BLEND_AND_OBJ_FROM_SCENE
     END
 
     POPUP "&Help"
@@ -252,7 +252,7 @@ BEGIN
     PUSHBUTTON      "Reset Defaults",IDC_BUTTON_RESET_DEFAULTS,188,490,65,14
 END
 
-IDD_OBJ_SETTINGS DIALOGEX 0, 0, 260, 285
+IDD_OBJ_SETTINGS DIALOGEX 0, 0, 260, 325
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Scene Mesh Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -278,8 +278,11 @@ BEGIN
     GROUPBOX        "Skip Aloc / Prim Extraction from RPKG files",IDC_STATIC,7,180,246,35
     AUTOCHECKBOX    "Skip Extraction",IDC_CHECK_SKIP_RPKG_EXTRACT,14,195,80,10
 
-    GROUPBOX        "Show Blender Debug logs",IDC_STATIC,7,225,246,35
-    AUTOCHECKBOX    "Show Debug Logs",IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS,14,240,80,10
+    GROUPBOX        "Filter meshes to include box",IDC_STATIC,7,225,246,35
+    AUTOCHECKBOX    "Filter meshes",IDC_CHECK_FILTER_TO_INCLUDE_BOX,14,240,80,10
+
+    GROUPBOX        "Show Blender Debug logs",IDC_STATIC,7,265,246,35
+    AUTOCHECKBOX    "Show Debug Logs",IDC_CHECK_SHOW_BLENDER_DEBUG_LOGS,14,280,80,10
 
-    PUSHBUTTON      "Reset Defaults",IDC_BUTTON_RESET_DEFAULTS,188,265,65,14
+    PUSHBUTTON      "Reset Defaults",IDC_BUTTON_RESET_DEFAULTS,188,305,65,14
 END

src/NavKit.rc

@@ -384,11 +384,11 @@ void RecastAdapter::setSceneBBoxToMesh() const {
 
 void RecastAdapter::handleMeshChanged() const {
     sample->handleMeshChanged(inputGeom);
-    if (const Scene &scene = Scene::getInstance();
-        !scene.sceneLoaded ||
-        scene.includeBox.id == ZPathfinding::PfBoxes::NO_INCLUDE_BOX_FOUND) {
-        setSceneBBoxToMesh();
-    }
+    // if (const Scene &scene = Scene::getInstance();
+    //     !scene.sceneLoaded ||
+    //     scene.includeBox.id == ZPathfinding::PfBoxes::NO_INCLUDE_BOX_FOUND) {
+    //     setSceneBBoxToMesh();
+    // }
 }
 
 void RecastAdapter::cleanup() const {

src/adapter/RecastAdapter.cpp

@@ -96,6 +96,7 @@ void Menu::updateMenuState() {
     setMenuItemEnabled(IDM_FILE_SAVE_NAVP, isNavpLoaded);
     setMenuItemEnabled(IDM_FILE_SAVE_AIRG, airg.canSave());
     setMenuItemEnabled(IDM_FILE_SAVE_OBJ, isObjLoaded);
+    setMenuItemEnabled(IDM_FILE_SAVE_BLEND, obj.canSaveBlend());
 
     setMenuItemEnabled(IDM_EDIT_NAVP_STAIRS, isAreaSelected);
     setMenuItemEnabled(IDM_EDIT_AIRG_CONNECT_WAYPOINT, airg.canEnterConnectWaypointMode());
@@ -162,6 +163,10 @@ int Menu::handleMenuClicked(const SDL_SysWMmsg *wmMsg) {
                     Obj::getInstance().handleSaveObjClicked();
                     Logger::log(NK_DEBUG, "File -> Save Obj clicked");
                     break;
+                case IDM_FILE_SAVE_BLEND:
+                    Obj::getInstance().handleSaveBlendClicked();
+                    Logger::log(NK_DEBUG, "File -> Save Blend clicked");
+                    break;
                 case IDM_FILE_SAVE_NAVP:
                     Navp::getInstance().handleSaveNavpClicked();
                     Logger::log(NK_DEBUG, "File -> Save Navp clicked");