Pipeline update clothes

assets/blender/characters/CMakeLists.txt

@@ -324,8 +324,8 @@ function(add_blend_consolidation INPUT_BLEND COMBINED_BLEND OUTPUT_BLEND)
     
     # Get the base name from the combined blend file for stamp derivation
     get_filename_component(COMBINED_NAME "${COMBINED_BLEND}" NAME_WE)
-    # Remove "_combined" suffix if present
-    string(REGEX REPLACE "_combined$" "" TARGET_BASE "${COMBINED_NAME}")
+    # Remove "_combined" or "_shaped" suffix if present
+    string(REGEX REPLACE "_(combined|shaped)$" "" TARGET_BASE "${COMBINED_NAME}")
     
     # Derive stamp dependency
     get_filename_component(COMBINED_DIR "${COMBINED_BLEND}" DIRECTORY)
@@ -404,10 +404,10 @@ function(add_clothes_pipeline INPUT_BLEND WEIGHTED_BLEND FINAL_OUTPUT_BLEND)
 	    ${COMBINED_BLEND}
 	    ${SHAPED_BLEND}
     )
-    # Step 2: Consolidate
+    # Step 2: Consolidate (use shaped blend which has shape keys transferred)
     add_blend_consolidation(
         "${INPUT_BLEND}"
-        "${COMBINED_BLEND}"
+        "${SHAPED_BLEND}"
         "${FINAL_OUTPUT_BLEND}"
     )
 
@@ -420,8 +420,11 @@ endfunction()
 
 weight_clothes(${CMAKE_CURRENT_SOURCE_DIR}/clothes-male-top.blend)
 weight_clothes(${CMAKE_CURRENT_SOURCE_DIR}/clothes-male-bottom.blend)
+weight_clothes(${CMAKE_CURRENT_SOURCE_DIR}/clothes-female-top.blend)
 weight_clothes(${CMAKE_CURRENT_SOURCE_DIR}/clothes-female-bottom.blend)
+weight_clothes(${CMAKE_CURRENT_SOURCE_DIR}/clothes-female-feet.blend)
 
+# male
 add_clothes_pipeline(
     "${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-male.blend"                   # INPUT_BLEND
     "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-male-bottom_weighted.blend" # WEIGHTED_BLEND
@@ -431,12 +434,31 @@ add_clothes_pipeline(
 add_clothes_pipeline(
     "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male-consolidated-bottom.blend" # INPUT_BLEND
     "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-male-top_weighted.blend" # WEIGHTED_BLEND
-    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male-consolidated.blend"      # FINAL_OUTPUT_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male-consolidated-top.blend"      # FINAL_OUTPUT_BLEND
 )
 
+add_clothes_pipeline(
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male-consolidated-top.blend" # INPUT_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-male-feet_weighted.blend" # WEIGHTED_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-male-consolidated.blend"      # FINAL_OUTPUT_BLEND
+)
+
+# female
 add_clothes_pipeline(
     "${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-female.blend"                   # INPUT_BLEND
     "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-female-bottom_weighted.blend" # WEIGHTED_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female-consolidated-bottom.blend"      # FINAL_OUTPUT_BLEND
+)
+
+add_clothes_pipeline(
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female-consolidated-bottom.blend"                   # INPUT_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-female-top_weighted.blend" # WEIGHTED_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female-consolidated-top.blend"      # FINAL_OUTPUT_BLEND
+)
+
+add_clothes_pipeline(
+    "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female-consolidated-top.blend"                   # INPUT_BLEND
+    "${CMAKE_CURRENT_BINARY_DIR}/clothes/clothes-female-feet_weighted.blend" # WEIGHTED_BLEND
     "${CMAKE_CURRENT_BINARY_DIR}/edited-normal-female-consolidated.blend"      # FINAL_OUTPUT_BLEND
 )