diff --git a/CMakeLists.txt b/CMakeLists.txt index 0997037..4df4f7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,7 +298,10 @@ add_custom_command(OUTPUT ${VRM_IMPORTED_BLENDS} ${VRM_SOURCE} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CHARACTER_GLBS ${CMAKE_BINARY_DIR}/characters/male/normal-male.glb) +set(CHARACTER_GLBS + ${CMAKE_BINARY_DIR}/characters/male/normal-male.glb + ${CMAKE_BINARY_DIR}/characters/female/normal-female.glb + ) add_custom_command( OUTPUT ${CHARACTER_GLBS} COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES} diff --git a/assets/blender/edited-normal-male.blend b/assets/blender/edited-normal-male.blend index d3d6e57..c45240f 100644 --- a/assets/blender/edited-normal-male.blend +++ b/assets/blender/edited-normal-male.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20ba9ea6583b062d5cd3d844ff07a88d94e7e0b7f6a9d49419b33a153f74790c -size 11000742 +oid sha256:b74f1ec0e390a38c51c8c2414fc7a3c022069f04ffeac6cd38331fe3cfc9840f +size 11163011 diff --git a/assets/blender/edited-vroid-normal-female.blend b/assets/blender/edited-vroid-normal-female.blend new file mode 100644 index 0000000..d5d8f56 --- /dev/null +++ b/assets/blender/edited-vroid-normal-female.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f514e33a12de8bc54ade17ec9c790ea63810c7224d80c1f466f612a4a5737e78 +size 15796919 diff --git a/assets/blender/scripts/export_models.py b/assets/blender/scripts/export_models.py index 5b6f563..fb67458 100644 --- a/assets/blender/scripts/export_models.py +++ b/assets/blender/scripts/export_models.py @@ -9,7 +9,7 @@ from mathutils import Vector, Matrix from math import radians, pi sys.path.insert(0, os.path.dirname(os.path.abspath(__file__))) -from settings import ExportMappingFemale, ExportMappingMale, ExportMappingMaleBabyShape, ExportMappingMaleEdited +from settings import ExportMappingFemale, ExportMappingMale, ExportMappingMaleBabyShape, ExportMappingMaleEdited, ExportMappingFemaleEdited basepath = os.getcwd() def check_bone(bname): @@ -179,7 +179,7 @@ def extra_linear(angle, offset): ret += offt return ret -for mapping in [ExportMappingFemale(), ExportMappingMale(), ExportMappingMaleBabyShape(), ExportMappingMaleEdited()]: +for mapping in [ExportMappingFemale(), ExportMappingMale(), ExportMappingMaleBabyShape(), ExportMappingMaleEdited(), ExportMappingFemaleEdited()]: if not os.path.exists(mapping.blend_path): print("Skipping mapping: " + mapping.blend_path) continue diff --git a/assets/blender/scripts/settings.py b/assets/blender/scripts/settings.py index a4e876a..3745962 100644 --- a/assets/blender/scripts/settings.py +++ b/assets/blender/scripts/settings.py @@ -6,7 +6,7 @@ class VRMDataFemale: editfile = "modelling-vroid-normal-female.blend" armature_name = "female" mixamo_animation_path = basepath + "/assets/blender/mixamo/female/" - mixamo_animations = ["idle", "walking", "running", "jump", "left_turn", "right_turn"] + mixamo_animations = ["idle", "walking", "running", "jump", "left_turn", "right_turn", "swimming"] fbx_scale = 0.89 class VRMDataMale: path = "buch1.vrm" @@ -14,7 +14,7 @@ class VRMDataMale: editfile = "modelling-vroid-normal-male.blend" armature_name = "male" mixamo_animation_path = basepath + "/assets/blender/mixamo/male/" - mixamo_animations = ["idle", "walking", "running", "jump", "left_turn", "right_turn"] + mixamo_animations = ["idle", "walking", "running", "jump", "left_turn", "right_turn", "swimming"] fbx_scale = 1.0 class VRMDataMaleBabyShape: path = "buch1-chibi.vrm" @@ -67,6 +67,21 @@ class ExportMappingMaleEdited: for fobj in self.objs: self.files.append({"name": fobj}) +class ExportMappingFemaleEdited: + blend_path = "assets/blender/" + "edited-normal-female.blend" + gltf_path = "characters/female/normal-female.gltf" + ogre_scene = "characters/female/vroid-normal-female.scene" + inner_path = "Object" +# objs = ["male", "Body", "Hair", "Face", "BackHair", "Tops", "Bottoms", "Shoes", "Accessory"] + objs = ["female", "Body", "Hair", "Face", "BackHair", "Tops", "Bottoms", "Shoes", "Accessory"] + armature_name = "female" + outfile = "tmp-female.blend" + default_action = 'default' + def __init__(self): + self.files = [] + for fobj in self.objs: + self.files.append({"name": fobj}) + class ExportMappingMaleBabyShape: blend_path = "assets/blender/shapes/male/" + "vrm-vroid-normal-male-chibi.blend" gltf_path = "assets/blender/" + "characters/shapes/male/chibi/vroid-normal-male-chibi.gltf"