Fix build obj from loaded scene, fix long room names, bump version to 2.5.1

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.5.0
+        VERSION 2.5.1
         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,3 +1,3 @@
 #define NavKit_VERSION_MAJOR "2"
 #define NavKit_VERSION_MINOR "5"
-#define NavKit_VERSION_PATCH "0"
+#define NavKit_VERSION_PATCH "1"

src/module/Obj.cpp

@@ -220,14 +220,14 @@ void Obj::buildObj() {
 }
 
 void Obj::extractAlocsOrPrimsAndStartObjBuild() {
+    const Scene &scene = Scene::getInstance();
+    const std::string &fileNameString = scene.lastLoadSceneFile;
     NavKitSettings &navKitSettings = NavKitSettings::getInstance();
     std::string retailFolder = "\"";
     retailFolder += navKitSettings.hitmanFolder;
     retailFolder += "\\Retail\"";
     std::string gameVersion = "HM3";
-    std::string navJsonFilePath = "\"";
-    navJsonFilePath += navKitSettings.outputFolder;
-    navJsonFilePath += "\\output.nav.json\"";
+    std::string navJsonFilePath = "\"" + fileNameString + "\"";
     std::string runtimeFolder = "\"";
     runtimeFolder += navKitSettings.hitmanFolder;
     runtimeFolder += "\\Runtime\"";
@@ -276,8 +276,6 @@ char *Obj::openSetBlenderFileDialog(const char *lastBlenderFile) {
 }
 
 void Obj::finalizeExtractAlocsOrPrims() {
-    NavKitSettings &navKitSettings = NavKitSettings::getInstance();
-
     if (errorExtracting) {
         errorBuilding = false;
         startedObjGeneration = false;
@@ -291,12 +289,9 @@ void Obj::finalizeExtractAlocsOrPrims() {
     }
     if (doneExtractingAlocsOrPrims) {
         doneExtractingAlocsOrPrims = false;
-        std::string sceneFile = navKitSettings.outputFolder;
-        sceneFile += "\\output.nav.json";
-        Scene &scene = Scene::getInstance();
-        const std::string &fileNameString = sceneFile;
+        const Scene &scene = Scene::getInstance();
+        const std::string &fileNameString = scene.lastLoadSceneFile;
         extractingAlocsOrPrims = false;
-        scene.lastLoadSceneFile = sceneFile;
         buildObj();
         Logger::log(NK_INFO, ("Done loading nav.json file: '" + fileNameString + "'.").c_str());
         errorExtracting = false;

src/resource/glacier2obj.py

@@ -2450,21 +2450,24 @@ def load_scenario(context, path_to_nav_json, path_to_output_obj_file, mesh_type,
         else:
             mesh_hash = hash_and_entity['primHash']
 
-        room_folder_name = hash_and_entity["roomFolderName"]
+        room_folder_name = hash_and_entity["roomFolderName"][:63]
         if room_folder_name not in bpy.data.collections:
             coll = bpy.data.collections.new(room_folder_name)
             bpy.context.scene.collection.children.link(coll)
             coll.color_tag = "COLOR_0" + str(room_folder_color_index%8 + 1)
             room_folder_color_index += 1
+            log("INFO", "Adding new collection for room folder name: " + room_folder_name, "load_scenario")
+
         room_folder_coll = bpy.data.collections.get(room_folder_name)
-        
-        room_name = hash_and_entity["roomName"]
+
+        room_name = hash_and_entity["roomName"][:63]
         if room_name not in bpy.data.collections:
             coll = bpy.data.collections.new(room_name)
             room_folder_coll.children.link(coll)
-            coll.color_tag = "COLOR_0" + str(room_color_index%8 + 1)
+            coll.color_tag = "COLOR_0" + str(room_color_index % 8 + 1)
             room_color_index += 1
-            
+            log("INFO", "Adding new collection for room name: " + room_name, "load_scenario")
+
         entity = hash_and_entity['entity']
         transform = {"position": entity["position"], "rotate": entity["rotation"],
                      "scale": entity["scale"]["data"], "id": entity["id"]}
@@ -2554,7 +2557,7 @@ def load_scenario(context, path_to_nav_json, path_to_output_obj_file, mesh_type,
             p = mesh_transform["position"]
             r = mesh_transform["rotate"]
             s = mesh_transform["scale"]
-            log("INFO", "Transforming " + mesh_type + " [" + str(current_mesh_in_scene_index) + "/" + str(meshes_in_scenario_count) + "]: " + mesh_hash + " #" + str(i) + " Mesh: [" + str(mesh_i + 1) + "/" + str(mesh_count) + "]", "load_scenario")
+            log("INFO", "Transforming " + mesh_type + " [" + str(current_mesh_in_scene_index) + "/" + str(meshes_in_scenario_count) + "]: " + mesh_hash + " #" + str(i) + " Mesh: [" + str(mesh_i + 1) + "/" + str(mesh_count) + "] Room name: " + room_name, "load_scenario")
             mesh_i += 1
             for obj in objects:
                 if i != 0:

src/util/CommandRunner.cpp

@@ -108,14 +108,10 @@ void CommandRunner::runCommand(std::string command, std::string logFileName, std
             errorCallback();
             return;
         }
-        bool pythonError = false;
         if (outputString.find("Error") != std::string::npos) {
-            pythonError = true;
-        }
-        if (pythonError) {
             Logger::log(
                 NK_ERROR,
-                "Error extracting scene from game. The blender python script threw an unhandled exception. Please report this to AtomicForce.");
+                "Error building obj or blend file. The blender python script threw an unhandled exception. Please report this to AtomicForce.");
             errorCallback();
             WaitForSingleObject(pi.hProcess, INFINITE);
             CloseHandle(hReadPipe);
@@ -130,7 +126,7 @@ void CommandRunner::runCommand(std::string command, std::string logFileName, std
             }
             errorMessage += outputString;
             errorMessage +=
-                    "Error extracting scene from game. The blender python script threw an unhandled exception. Please report this to AtomicForce.";
+                    "Error building obj or blend file. The blender python script threw an unhandled exception. Please report this to AtomicForce.";
             ErrorHandler::openErrorDialog(errorMessage);
             fclose(logFile);
             return;