diff --git a/assets/blender/characters/CMakeLists.txt b/assets/blender/characters/CMakeLists.txt index 8f4c04a..f39db9a 100644 --- a/assets/blender/characters/CMakeLists.txt +++ b/assets/blender/characters/CMakeLists.txt @@ -47,8 +47,8 @@ set(VRM_IMPORTED_BLENDS # COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${CHARACTER_GLBS} # 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 "BodyTopRobe;BodyTop;BodyBottom;BodyFeet;Hair;Face;BackHair;Bottoms;Shoes;Accessory") +set(FEMALE_OBJECTS "BodyTopRobe;BodyTop;BodyBottom;BodyFeet;Hair;Face;BackHair;Accessoty") +set(MALE_OBJECTS "BodyTopRobe;BodyTop;BodyBottom;BodyFeet;Hair;Face;BackHair;Accessory") add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/characters/male/normal-male.glb COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES} diff --git a/assets/blender/characters/edited-normal-female.blend b/assets/blender/characters/edited-normal-female.blend index 8417145..5378f9e 100644 --- a/assets/blender/characters/edited-normal-female.blend +++ b/assets/blender/characters/edited-normal-female.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32e08e3a601faef1b5fe336b35c4bffdbad916a58ec9e68f92674e4de8933ae3 -size 17161044 +oid sha256:28a6502ca805e566381b08dd23366b6ffbfd0e8accb7256f4b439e0bdabf75b0 +size 18566317 diff --git a/assets/blender/characters/edited-normal-male.blend b/assets/blender/characters/edited-normal-male.blend index 80d10bb..89fe37d 100644 --- a/assets/blender/characters/edited-normal-male.blend +++ b/assets/blender/characters/edited-normal-male.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7766a4dd6abc6547f19754f2f823c7a2b20c4fcc30a97dc4ed75b9c96fe13f9f -size 17830659 +oid sha256:6604dd42adec3e370561788f0b11d7a8f102a87876581408b0ea4e0f585d3582 +size 14008165 diff --git a/src/gamedata/CharacterManagerModule.cpp b/src/gamedata/CharacterManagerModule.cpp index 9d581fa..0ef0605 100644 --- a/src/gamedata/CharacterManagerModule.cpp +++ b/src/gamedata/CharacterManagerModule.cpp @@ -234,9 +234,9 @@ void CharacterManagerModule::registerTownCharacters(flecs::entity town) { "male_Face.mesh", "male_Hair001.mesh", "male_BodyTop.mesh", "male_BodyBottom.mesh", "male_BodyFeet.mesh" }, - { "normal-female.glb", "normal-female.glb", - "normal-female.glb", "normal-female.glb", - "normal-female.glb" } + { "female_Face.mesh", "female_Hair001.mesh", + "female_BodyTop.mesh", "female_BodyBottom.mesh", + "female_BodyFeet.mesh" } }; int sex = npc["sex"].get(); Ogre::Vector3 npcPosition; diff --git a/src/gamedata/items/town.cpp b/src/gamedata/items/town.cpp index 76d159c..5f27d16 100644 --- a/src/gamedata/items/town.cpp +++ b/src/gamedata/items/town.cpp @@ -2223,9 +2223,10 @@ bool editNPCs(nlohmann::json &npcs) { "male_Face.mesh", "male_Hair001.mesh", "male_BodyTop.mesh", "male_BodyBottom.mesh", "male_BodyFeet.mesh" }, - { "normal-female.glb", "normal-female.glb", - "normal-female.glb", "normal-female.glb", - "normal-female.glb" } + { "female_Face.mesh", "female_Hair001.mesh", + "female_BodyTop.mesh", + "female_BodyBottom.mesh", + "female_BodyFeet.mesh" } }; Ogre::Vector3 npcPosition; Ogre::Quaternion npcOrientation;