slapin/ogre-prototype
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Now both male and female uses modular assets

Browse Source
This commit is contained in:
Sergey Lapin
2026-02-17 00:35:14 +03:00
parent be10abda16
commit 8fddcb4cd9
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/blender/characters/CMakeLists.txt
View File

@@ -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}

BIN
assets/blender/characters/edited-normal-female.blend LFS
View File

Binary file not shown.

BIN
assets/blender/characters/edited-normal-male.blend LFS
View File

Binary file not shown.

6
src/gamedata/CharacterManagerModule.cpp
View File

@@ -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<int>();
Ogre::Vector3 npcPosition;

7
src/gamedata/items/town.cpp
View File

@@ -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;