diff --git a/.gitattributes b/.gitattributes index efa6362..6d497ac 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ *.blend filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text *.kra filter=lfs diff=lfs merge=lfs -text *.vrm filter=lfs diff=lfs merge=lfs -text *.vroid filter=lfs diff=lfs merge=lfs -text diff --git a/assets/blender/characters/CMakeLists.txt b/assets/blender/characters/CMakeLists.txt index 85730f8..b48a905 100644 --- a/assets/blender/characters/CMakeLists.txt +++ b/assets/blender/characters/CMakeLists.txt @@ -40,12 +40,6 @@ set(VRM_IMPORTED_BLENDS set(VRM_SOURCE) -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/characters/shapes/male/chibi/vroid-normal-male-chibi.glb -DEPENDS ${CMAKE_BINARY_DIR}/assets/blender/characters/shapes/male/chibi/vroid-normal-male-chibi.glb -COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/assets/blender/characters/shapes/male/chibi/vroid-normal-male-chibi.glb - ${CMAKE_BINARY_DIR}/characters/shapes/male/chibi/vroid-normal-male-chibi.glb) -add_custom_target(morph ALL DEPENDS MorphTargetsResearch ${CMAKE_BINARY_DIR}/characters/shapes/male/chibi/vroid-normal-male-chibi.glb) - set(VRM_FILES buch1-chibi.vrm buch1.vrm jane2-dress.vrm jane2.vrm) file(GLOB MIXAMO_FILES RELATIVE ${CMAKE_SOURCE_DIR}/assets/blender/mixamo ${CMAKE_SOURCE_DIR}/assets/blender/mixamo/**/*.fbx) foreach(VRM_FILE ${VRM_FILES}) @@ -65,6 +59,8 @@ foreach(MIXAMO_FILE ${MIXAMO_FILES}) list(APPEND VRM_SOURCE "${OUTPUT_FILE}") endforeach() add_custom_command(OUTPUT ${VRM_IMPORTED_BLENDS} + 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 make_directory ${CREATE_DIRECTORIES} COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm.py COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${VRM_IMPORTED_BLENDS} @@ -72,8 +68,8 @@ add_custom_command(OUTPUT ${VRM_IMPORTED_BLENDS} ${VRM_SOURCE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - set(COPY_BLENDS edited-shape-test-male.blend edited-normal-male-base.blend) + foreach (COPY_BLEND_FILE ${COPY_BLENDS}) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/${COPY_BLEND_FILE} DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/${COPY_BLEND_FILE} @@ -84,6 +80,14 @@ foreach (COPY_BLEND_FILE ${COPY_BLENDS}) list(APPEND EDITED_BLEND_TARGETS ${CMAKE_BINARY_DIR}/assets/blender/${COPY_BLEND_FILE}) endforeach() +add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/characters/shapes/male/chibi/vroid-normal-male-chibi.glb + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/shapes/male/chibi/vroid-normal-male-chibi.glb + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/shapes/male/chibi/vroid-normal-male-chibi.glb + ${CMAKE_BINARY_DIR}/characters/shapes/male/chibi/vroid-normal-male-chibi.glb) +add_custom_target(morph ALL DEPENDS MorphTargetsResearch ${CHARACTER_GLBS}) + + add_custom_target(edited-blends ALL DEPENDS ${EDITED_BLEND_TARGETS}) add_custom_target(import_vrm DEPENDS ${CHARACTER_GLBS}) + diff --git a/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip b/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip new file mode 100644 index 0000000..9efacef --- /dev/null +++ b/assets/blender/scripts/addons/3.6/VRM_Addon_for_Blender-release.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e37e477e52d83684004045579c007e3ca3e9c7d781b8681cfe13add0e1f73c1e +size 1554308