Add Blender Export (#67)

Co-authored-by: Dog <dog@dog.dev>

Author: Dog

include/NavKit/Resource.h

@@ -39,6 +39,7 @@
 #define IDM_EXTRACT_SCENE_AND_BUILD_ALL         1402
 #define IDM_BUILD_OBJ_FROM_SCENE                1500
 #define IDM_BUILD_OBJ_FROM_NAVP                 1501
+#define IDM_BUILD_BLEND_FROM_SCENE				1502
 #define IDM_BUILD_NAVP                          1510
 #define IDM_BUILD_AIRG                          1520
 #define IDM_HELP_ABOUT                          1600

include/NavKit/module/Obj.h

@@ -38,6 +38,7 @@ class Obj {
     bool startedObjGeneration;
     bool blenderObjStarted;
     bool blenderObjGenerationDone;
+    bool blendFileOnlyExtract;
     bool glacier2ObjDebugLogsEnabled;
     bool errorBuilding;
     bool errorExtracting;
@@ -83,8 +84,12 @@ class Obj {
 
     bool canBuildObjFromScene() const;
 
+    bool canBuildBlendFromScene() const;
+
     void handleBuildObjFromSceneClicked();
 
+    void handleBuildBlendFromSceneClicked();
+
     void handleBuildObjFromNavpClicked();
 
     void finalizeLoad();

src/NavKit.rc

@@ -73,6 +73,8 @@ BEGIN
         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
     END
 
     POPUP "&Help"

src/module/Menu.cpp

@@ -103,6 +103,7 @@ void Menu::updateMenuState() {
     setMenuItemEnabled(IDM_BUILD_AIRG, airg.canBuildAirg());
     setMenuItemEnabled(IDM_BUILD_OBJ_FROM_SCENE, obj.canBuildObjFromScene());
     setMenuItemEnabled(IDM_BUILD_OBJ_FROM_NAVP, obj.canBuildObjFromNavp());
+    setMenuItemEnabled(IDM_BUILD_BLEND_FROM_SCENE, obj.canBuildBlendFromScene());
 
     setMenuItemEnabled(IDM_EXTRACT_SCENE, sceneExtract.canExtractFromGame());
     setMenuItemEnabled(IDM_EXTRACT_SCENE_AND_BUILD_OBJ, sceneExtract.canExtractFromGameAndBuildObj());
@@ -241,6 +242,9 @@ int Menu::handleMenuClicked(const SDL_SysWMmsg *wmMsg) {
                 case IDM_BUILD_OBJ_FROM_NAVP:
                     obj.handleBuildObjFromNavpClicked();
                     break;
+                case IDM_BUILD_BLEND_FROM_SCENE:
+                    obj.handleBuildBlendFromSceneClicked();
+                    break;
                 case IDM_BUILD_OBJ_FROM_SCENE:
                     obj.handleBuildObjFromSceneClicked();
                     break;

src/module/Obj.cpp

@@ -36,6 +36,7 @@ Obj::Obj() : loadObjName("Load Obj"),
              errorBuilding(false),
              errorExtracting(false),
              extractingAlocsOrPrims(false),
+             blendFileOnlyExtract(false),
              doneExtractingAlocsOrPrims(false),
              doObjHitTest(false),
              meshTypeForBuild(ALOC),
@@ -168,7 +169,12 @@ void Obj::buildObj() {
     command += scene.lastLoadSceneFile;
     command += "\" \"";
     command += settings.outputFolder;
-    command += "\\output.obj\"";
+    if (!blendFileOnlyExtract) {
+        command += "\\output.obj\"";
+    }
+    else {
+        command += "\\output.blend\"";
+    }
     if (meshTypeForBuild == ALOC) {
         command += " ALOC ";
     } else {
@@ -284,12 +290,13 @@ void Obj::finalizeObjBuild() {
         startedObjGeneration = false;
         objToLoad = settings.outputFolder;
         objToLoad += "\\" + generatedObjName;
-        loadObj = true;
+        loadObj = !blendFileOnlyExtract;
         lastObjFileName = settings.outputFolder;
         lastObjFileName += generatedObjName;
         blenderObjStarted = false;
         blenderObjGenerationDone = false;
         sceneExtract.alsoBuildObj = false;
+        blendFileOnlyExtract = false;
     }
     if (errorBuilding) {
         errorBuilding = false;
@@ -299,6 +306,7 @@ void Obj::finalizeObjBuild() {
         objLoaded = false;
         sceneExtract.alsoBuildAll = false;
         sceneExtract.alsoBuildObj = false;
+        blendFileOnlyExtract = false;
     }
     Menu::updateMenuState();
 }
@@ -437,10 +445,21 @@ bool Obj::canBuildObjFromScene() const {
            scene.sceneLoaded && !blenderObjStarted && !blenderObjGenerationDone;
 }
 
+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();
+}
+
 void Obj::handleBuildObjFromSceneClicked() {
     backgroundWorker.emplace(&Obj::extractAlocsOrPrims, this);
 }
 
+void Obj::handleBuildBlendFromSceneClicked() {
+    blendFileOnlyExtract = true;
+    backgroundWorker.emplace(&Obj::extractAlocsOrPrims, this);
+}
+
 void Obj::handleBuildObjFromNavpClicked() {
     return buildObjFromNavp(true);
 }

src/resource/glacier2obj.py

@@ -2566,10 +2566,16 @@ def main():
     if scenario == 1:
         log("INFO", 'Failed to import scenario "%s"' % scene_path   , "main")
         return 1
-    if bpy.app.version_string[0] == "3":
-        bpy.ops.export_scene.obj(filepath=output_path, use_selection=False)
+    if(output_path[-6:]=='.blend'):
+        log("INFO", "Attempting to save blender file to :" + output_path, "main")
+        bpy.ops.wm.save_as_mainfile(filepath=output_path)
     else:
-        bpy.ops.wm.obj_export(filepath=output_path)  # Export the entire scene
+        log("INFO", "Attempting to save obj file to :" + output_path, "main")
+        if bpy.app.version_string[0] == "3":
+            bpy.ops.export_scene.obj(filepath=output_path, use_selection=False)
+        else:
+            bpy.ops.wm.obj_export(filepath=output_path)  # Export the entire scene
+
     return None