Bump version to 2.3.1, fix 'Extract and Build' menu items

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.3.0
+        VERSION 2.3.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 "3"
-#define NavKit_VERSION_PATCH "0"
+#define NavKit_VERSION_PATCH "1"

include/NavKit/module/Obj.h

@@ -106,6 +106,5 @@ class Obj {
 
     void finalizeExtractAlocsOrPrims();
 
-private:
-    void extractAlocsOrPrims();
+    void extractAlocsOrPrimsAndStartObjBuild();
 };

src/module/Obj.cpp

@@ -194,7 +194,7 @@ void Obj::buildObj() {
         });
 }
 
-void Obj::extractAlocsOrPrims() {
+void Obj::extractAlocsOrPrimsAndStartObjBuild() {
     Settings &settings = Settings::getInstance();
     std::string retailFolder = "\"";
     retailFolder += settings.hitmanFolder;
@@ -444,16 +444,16 @@ bool Obj::canBuildObjFromScene() const {
 bool Obj::canBuildBlendFromScene() const {
     // Currently this is the same as Obj::canBuildObjFromScene.
     // Its expected this may change if the blend export includes features OBJ can't handle - like lights.
-    return Obj::canBuildObjFromScene();
+    return canBuildObjFromScene();
 }
 
 void Obj::handleBuildObjFromSceneClicked() {
-    backgroundWorker.emplace(&Obj::extractAlocsOrPrims, this);
+    backgroundWorker.emplace(&Obj::extractAlocsOrPrimsAndStartObjBuild, this);
 }
 
 void Obj::handleBuildBlendFromSceneClicked() {
     blendFileOnlyExtract = true;
-    backgroundWorker.emplace(&Obj::extractAlocsOrPrims, this);
+    backgroundWorker.emplace(&Obj::extractAlocsOrPrimsAndStartObjBuild, this);
 }
 
 void Obj::handleBuildObjFromNavpClicked() {

src/module/SceneExtract.cpp

@@ -129,7 +129,7 @@ void SceneExtract::finalizeExtractScene() {
                 const std::string &fileNameString = sceneFile;
                 sceneScoped.lastLoadSceneFile = sceneFile;
                 if ((alsoBuildObj || alsoBuildAll) && !obj.startedObjGeneration) {
-                    obj.buildObj();
+                    obj.extractAlocsOrPrimsAndStartObjBuild();
                 }
                 Logger::log(NK_INFO, ("Done loading nav.json file: '" + fileNameString + "'.").c_str());
                 Menu::updateMenuState();