independent slots for clothes, converted to .mesh workflow

2026-02-16 09:44:00 +03:00
parent 01c1210b1b
commit be10abda16
15 changed files with 362 additions and 98 deletions
--- a/assets/blender/characters/CMakeLists.txt
+++ b/assets/blender/characters/CMakeLists.txt
@@ -13,6 +13,7 @@ add_custom_command(
                ${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-${EDITED_BLEND}.blend
 		${CMAKE_CURRENT_SOURCE_DIR}/copy_animations.py
 		${CMAKE_BINARY_DIR}/assets/blender/mixamo
+		${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
        COMMAND ${CMAKE_COMMAND}
                -E copy ${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-${EDITED_BLEND}.blend
                ${CMAKE_CURRENT_BINARY_DIR}/edited-normal-${EDITED_BLEND}.blend
@@ -25,6 +26,7 @@ add_custom_command(
 list(APPEND EDITED_BLEND_TARGETS ${CMAKE_BINARY_DIR}/assets/blender/characters/edited-normal-${EDITED_BLEND}.blend)
 list(APPEND CHARACTER_GLBS ${CMAKE_BINARY_DIR}/characters/${EDITED_BLEND}/normal-${EDITED_BLEND}.glb)
 endforeach()
+list(APPEND CHARACTER_GLBS ${CMAKE_BINARY_DIR}/characters/male/male-clothes-toprobe.glb)
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/mixamo
 	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets/blender/mixamo ${CMAKE_BINARY_DIR}/assets/blender/mixamo
 	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/mixamo
@@ -46,7 +48,7 @@ set(VRM_IMPORTED_BLENDS
 #        DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py ${VRM_IMPORTED_BLENDS} ${EDITED_BLEND_TARGETS}
 #        WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 set(FEMALE_OBJECTS "Body;Hair;Face;BackHair;Tops;Bottoms;Shoes;Accessory")
-set(MALE_OBJECTS "BodyTop;BodyBottom;BodyFeet;Hair;Face;BackHair;Tops;Bottoms;Shoes;Accessory")
+set(MALE_OBJECTS "BodyTopRobe;BodyTop;BodyBottom;BodyFeet;Hair;Face;BackHair;Bottoms;Shoes;Accessory")
 add_custom_command(
 	OUTPUT ${CMAKE_BINARY_DIR}/characters/male/normal-male.glb
 	COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES}
@@ -56,9 +58,14 @@ add_custom_command(
 		"${MALE_OBJECTS}"
 		"male"
 		tmp-edited-male.blend
+	COMMAND ${CMAKE_COMMAND} -D FILE=${CMAKE_BINARY_DIR}/characters/male/normal-male.glb
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake
+	COMMAND ${CMAKE_COMMAND} -D FILE=${CMAKE_BINARY_DIR}/characters/male/normal-male.scene
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake
 	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models2.py
 		${VRM_IMPORTED_BLENDS}
 		${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male.blend
+		${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	VERBATIM
 )
@@ -72,12 +79,28 @@ add_custom_command(
 		"${FEMALE_OBJECTS}"
 		"female"
 		tmp-edited-female.blend
+	COMMAND ${CMAKE_COMMAND} -D FILE=${CMAKE_BINARY_DIR}/characters/female/normal-female.glb
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake
+	COMMAND ${CMAKE_COMMAND} -D FILE=${CMAKE_BINARY_DIR}/characters/female/normal-female.scene
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake
 	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models2.py
 		${VRM_IMPORTED_BLENDS}
 		${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female.blend
+		${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	VERBATIM
 )
+add_custom_command(
+	OUTPUT ${CMAKE_BINARY_DIR}/characters/male/male-clothes-toprobe.glb
+	COMMAND ${BLENDER} -b -Y ${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-male.blend
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/export_clothes.py
+		-- ${CMAKE_BINARY_DIR}/characters/male/male-clothes-toprobe.glb 
+		BodyTopRobe
+	COMMAND ${CMAKE_COMMAND} -D FILE=${CMAKE_BINARY_DIR}/characters/male/male-clothes-toprobe.glb
+		-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake
+	DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male.blend
+		${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
+)

 set(VRM_SOURCE)

@@ -100,13 +123,29 @@ foreach(MIXAMO_FILE ${MIXAMO_FILES})
        list(APPEND VRM_SOURCE "${OUTPUT_FILE}")
 endforeach()
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets/blender/scripts/addons ${CMAKE_BINARY_DIR}/assets/blender/scripts/addons
 	COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/install_addons.py
 	COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed
-	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
-		${CMAKE_SOURCE_DIR}/assets/blender/scripts/addons/3.6/io_ogre.zip
+	DEPENDS ${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
+	${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/io_ogre.zip
 		${CMAKE_SOURCE_DIR}/assets/blender/scripts/install_addons.py
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
+	COMMAND ${CMAKE_COMMAND} -E copy
+		${CMAKE_SOURCE_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
+		${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
+	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/io_ogre.zip
+	COMMAND zip -r ${CMAKE_BINARY_DIR}/assets/blender/scripts/addons/3.6/io_ogre.zip io_ogre
+	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/blender2ogre/io_ogre
+		${CMAKE_SOURCE_DIR}/assets/blender/scripts/blender2ogre/io_ogre/ui/export.py
+		${CMAKE_SOURCE_DIR}/assets/blender/scripts/blender2ogre/io_ogre/ogre/skeleton.py
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/assets/blender/scripts/blender2ogre
+)
+add_custom_target(install_addons ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/blender-addons-installed)
+

 #add_custom_command(OUTPUT ${VRM_IMPORTED_BLENDS}
 #        COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES}
--- a/assets/blender/characters/edited-normal-female.blend
+++ b/assets/blender/characters/edited-normal-female.blend
--- a/assets/blender/characters/edited-normal-male.blend
+++ b/assets/blender/characters/edited-normal-male.blend
--- a/assets/blender/scripts/addons/3.6/io_ogre.zip
+++ b/assets/blender/scripts/addons/3.6/io_ogre.zip
--- a/assets/blender/scripts/blender2ogre/io_ogre/ogre/skeleton.py
+++ b/assets/blender/scripts/blender2ogre/io_ogre/ogre/skeleton.py
@@ -32,6 +32,8 @@ def dot_skeleton(obj, path, **kwargs):
        name = kwargs.get('force_name') or obj.data.name
        if config.get('SHARED_ARMATURE') is True:
            name = kwargs.get('force_name') or arm.data.name
+        if name == "Armature":
+            name = arm.name
        name = util.clean_object_name(name)

        # Lets export the Armature only once
--- a/assets/blender/scripts/export_models2.py
+++ b/assets/blender/scripts/export_models2.py
@@ -290,6 +290,28 @@ for mapping in[CommandLineMapping()]:
            export_lights=False,
            export_skins=True)
    print("exported to: " + mapping.gltf_path)
+    obj_names = mapping.objs
+    prefix = mapping.armature_name + "_"
+
+    for name in obj_names:
+        obj = bpy.data.objects.get(name)
+
+        if obj and obj.type == 'MESH':
+            # 1. Rename Mesh Data
+            if not obj.data.name.startswith(prefix):
+                obj.data.name = prefix + obj.data.name
+
+            # 2. Iterate through all Material Slots on the object
+            for slot in obj.material_slots:
+                if slot.material:
+                    mat = slot.material
+                    # 3. Check if material already has the prefix
+                    if not mat.name.startswith(prefix):
+                        mat.name = prefix + mat.name
+                        print(f"Renamed material '{mat.name}' on object '{name}'")
+    armobj = bpy.data.objects.get(mapping.armature_name)
+    armobj.data.name = armobj.name
+    bpy.ops.ogre.export(filepath=mapping.gltf_path.replace(".glb", ".scene"), EX_SELECTED_ONLY=False, EX_SHARED_ARMATURE=True, EX_LOD_GENERATION='0', EX_GENERATE_TANGENTS='4')

 bpy.ops.wm.read_homefile(use_empty=True)
 time.sleep(2)