diff --git a/assets/blender/characters/CMakeLists.txt b/assets/blender/characters/CMakeLists.txt index c3472b1..a21694f 100644 --- a/assets/blender/characters/CMakeLists.txt +++ b/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 ) diff --git a/assets/blender/characters/clothes-female-bottom.blend b/assets/blender/characters/clothes-female-bottom.blend index db42a4c..341f6ed 100644 --- a/assets/blender/characters/clothes-female-bottom.blend +++ b/assets/blender/characters/clothes-female-bottom.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a07d9e6f7db75eccbdfe3f349bffdeb9f98bd560f41e5adfcb385b8eb4519c4f -size 21246936 +oid sha256:c7a5cff31917b176c53aab88d9b22b816ad684ff906d1af856e146a4e3167beb +size 18365756 diff --git a/assets/blender/characters/clothes-female-feet.blend b/assets/blender/characters/clothes-female-feet.blend new file mode 100644 index 0000000..aa9c78d --- /dev/null +++ b/assets/blender/characters/clothes-female-feet.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f07ea8aa5145137297b3b556a63e93ba8effa87fb123abb99754925553e0ace1 +size 10787188 diff --git a/assets/blender/characters/clothes-female-top.blend b/assets/blender/characters/clothes-female-top.blend new file mode 100644 index 0000000..5a678f1 --- /dev/null +++ b/assets/blender/characters/clothes-female-top.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0115190c186d740ac54527dbba944e7b2f0f448f4fa6bff89f3aaba2a02d1439 +size 13212156 diff --git a/assets/blender/characters/clothes-male-feet.blend b/assets/blender/characters/clothes-male-feet.blend new file mode 100644 index 0000000..edbd156 --- /dev/null +++ b/assets/blender/characters/clothes-male-feet.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f720ce5cd154ae967673dbc2c6a93a25640dad56760586d205a18ec7b550e39c +size 5131276