Fix aloc import for combo primitive data types (#74)

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

.idea/vcs.xml

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

CMakeLists.txt

@@ -41,6 +41,7 @@ class Obj {
     bool blendFileOnlyExtract;
     bool glacier2ObjDebugLogsEnabled;
     bool errorBuilding;
+    bool skipExtractingAlocsOrPrims;
     bool errorExtracting;
     bool extractingAlocsOrPrims;
     bool doneExtractingAlocsOrPrims;

include/NavKit/NavKitConfig.h

@@ -37,6 +37,7 @@ Obj::Obj() : loadObjName("Load Obj"),
              errorBuilding(false),
              errorExtracting(false),
              extractingAlocsOrPrims(false),
+             skipExtractingAlocsOrPrims(false),
              blendFileOnlyExtract(false),
              doneExtractingAlocsOrPrims(false),
              doObjHitTest(false),
@@ -220,6 +221,12 @@ void Obj::buildObj() {
 }
 
 void Obj::extractAlocsOrPrimsAndStartObjBuild() {
+    if (skipExtractingAlocsOrPrims) {
+        Logger::log(NK_INFO, "Skipping extraction of Alocs / Prims from Rpkg files.");
+        doneExtractingAlocsOrPrims = true;
+        Menu::updateMenuState();
+        return;
+    }
     const Scene &scene = Scene::getInstance();
     const std::string &fileNameString = scene.lastLoadSceneFile;
     NavKitSettings &navKitSettings = NavKitSettings::getInstance();
@@ -262,7 +269,7 @@ void Obj::extractAlocsOrPrimsAndStartObjBuild() {
     std::jthread commandThread(
         &CommandRunner::runCommand, CommandRunner::getInstance(), command,
         "Glacier2ObjExtract.log", [this] {
-            Logger::log(NK_INFO, "Finished extracting Alocs / Prims from Rpkg files file.");
+            Logger::log(NK_INFO, "Finished extracting Alocs / Prims from Rpkg files.");
             doneExtractingAlocsOrPrims = true;
             Menu::updateMenuState();
         }, [this] {