Skip to content

Commit 6d4d419

Browse files
committed
Bump version to 2.3.0, update log message
1 parent 237b3a7 commit 6d4d419

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_policy(SET CMP0141 NEW)
33
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<IF:$<CONFIG:Debug>,EditAndContinue,ProgramDatabase>" CACHE STRING "MSVC debug information format")
44
project(
55
NavKit
6-
VERSION 2.2.0
6+
VERSION 2.3.0
77
DESCRIPTION "An app to create NAVP and AIRG files for use with Hitman: World of Assassination"
88
LANGUAGES CXX)
99
set(CMAKE_CXX_STANDARD 20)

include/NavKit/NavKitConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#define NavKit_VERSION_MAJOR "2"
2-
#define NavKit_VERSION_MINOR "2"
2+
#define NavKit_VERSION_MINOR "3"
33
#define NavKit_VERSION_PATCH "0"

src/module/Obj.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,24 +157,20 @@ void Obj::buildObjFromNavp(bool alsoLoadIntoUi) {
157157
}
158158

159159
void Obj::buildObj() {
160-
Settings &settings = Settings::getInstance();
161-
Scene &scene = Scene::getInstance();
160+
const Settings &settings = Settings::getInstance();
161+
const Scene &scene = Scene::getInstance();
162162
objLoaded = false;
163163
Menu::updateMenuState();
164164
startedObjGeneration = true;
165-
Logger::log(NK_INFO, "Generating obj from nav.json file.");
165+
std::string buildOutputFileType = blendFileOnlyExtract ? "blend" : "obj";
166+
Logger::log(NK_INFO, "Generating %s from nav.json file.", buildOutputFileType.c_str());
166167
std::string command = "\"";
167168
command += settings.blenderPath;
168169
command += "\" -b --factory-startup -P glacier2obj.py -- \""; //--debug-all
169170
command += scene.lastLoadSceneFile;
170171
command += "\" \"";
171172
command += settings.outputFolder;
172-
if (!blendFileOnlyExtract) {
173-
command += "\\output.obj\"";
174-
}
175-
else {
176-
command += "\\output.blend\"";
177-
}
173+
command += "\\output." + buildOutputFileType + "\"";
178174
if (meshTypeForBuild == ALOC) {
179175
command += " ALOC ";
180176
} else {
@@ -190,8 +186,8 @@ void Obj::buildObj() {
190186
generatedObjName = "output.obj";
191187

192188
backgroundWorker.emplace(
193-
&CommandRunner::runCommand, CommandRunner::getInstance(), command, "Glacier2ObjBlender.log", [this] {
194-
Logger::log(NK_INFO, "Finished generating obj from nav.json file.");
189+
&CommandRunner::runCommand, CommandRunner::getInstance(), command, "Glacier2ObjBlender.log", [this, buildOutputFileType] {
190+
Logger::log(NK_INFO, "Finished generating %s from nav.json file.", buildOutputFileType.c_str());
195191
blenderObjGenerationDone = true;
196192
}, [this] {
197193
errorBuilding = true;

0 commit comments

Comments
 (0)