Using threads more

.gitattributes

@@ -1 +1,7 @@
 *.blend 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
+*.fbx filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,4 +1,9 @@
+*~
 build/*
 build-vscode/*
 characters/*
 resources/buildings/*
+assets/blender/scripts/*.blend
+__pycache__/
+*.blend[1-9]
+./characters/

.vscode/settings.json

@@ -1,7 +1,76 @@
 {
     "cmake.generator": "Unix Makefiles",
     "cmake.configureSettings": {
-        "CMAKE_PREFIX_PATH": "/media/slapin/library/ogre/ogre-sdk"
+        "CMAKE_PREFIX_PATH": "/media/slapin/library/ogre3/ogre-sdk",
+        "CMAKE_VERBOSE_MAKEFILE": "ON"
     },
-    "cmake.buildDirectory": "${workspaceFolder}/build-vscode"
+    "cmake.buildDirectory": "${workspaceFolder}/build-vscode",
+    "files.associations": {
+        "istream": "cpp",
+        "variant": "cpp",
+        "tuple": "cpp",
+        "iostream": "cpp",
+        "string_view": "cpp",
+        "atomic": "cpp",
+        "memory_resource": "cpp",
+        "stop_token": "cpp",
+        "random": "cpp",
+        "future": "cpp",
+        "array": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "unordered_set": "cpp",
+        "vector": "cpp",
+        "initializer_list": "cpp",
+        "span": "cpp",
+        "chrono": "cpp",
+        "format": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "bit": "cpp",
+        "bitset": "cpp",
+        "charconv": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdint": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "optional": "cpp",
+        "ratio": "cpp",
+        "system_error": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "numbers": "cpp",
+        "numeric": "cpp",
+        "ostream": "cpp",
+        "semaphore": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "thread": "cpp",
+        "typeinfo": "cpp"
+    }
 }

.vscode/tasks.json

@@ -13,7 +13,8 @@
 			"label": "CMake: clean rebuild",
 			"command": "build",
 			"targets": [
-				"GuiTest",
+				"Editor",
+				"Game",
 				"0_Bootstrap",
 				"TerrainTest",
 				"Procedural"
@@ -27,7 +28,8 @@
 			"label": "CMake: clean rebuild",
 			"command": "cleanRebuild",
 			"targets": [
-				"GuiTest",
+				"Editor",
+				"Game",
 				"0_Bootstrap",
 				"TerrainTest",
 				"Procedural"
@@ -57,6 +59,18 @@
 			"group": "build",
 			"problemMatcher": [],
 			"detail": "CMake clean rebuild task"
+		},
+		{
+			"type": "cmake",
+			"label": "CMake: build",
+			"command": "build",
+			"targets": [
+				"Editor",
+				"Game"
+			],
+			"group": "build",
+			"problemMatcher": [],
+			"detail": "CMake build task"
 		}
 	]
 }

CMakeLists.txt

@@ -1,21 +1,20 @@
-project(world2)
 cmake_minimum_required(VERSION 3.13.0)
+project(world2)
 
-set(CMAKE_CXX_STANDARD 14)
-set(BLENDER /home/slapin/blender-3.6.20-linux-x64/blender)
+set(CMAKE_CXX_STANDARD 17)
+set(BLENDER "${CMAKE_SOURCE_DIR}/../../blender-bin/bin/blender" CACHE STRING "Blender path")
 set(CREATE_DIRECTORIES
-	${CMAKE_SOURCE_DIR}/assets/blender/shapes/male
-	${CMAKE_SOURCE_DIR}/assets/blender/shapes/female
-	${CMAKE_SOURCE_DIR}/characters/shapes/male/chibi
-	${CMAKE_SOURCE_DIR}/characters/shapes/female/chibi
-	${CMAKE_SOURCE_DIR}/characters/male
-	${CMAKE_SOURCE_DIR}/characters/female)
-set(CREATE_SCENES
-	${CMAKE_SOURCE_DIR}/characters/female/vroid-normal-female.scene
-	${CMAKE_SOURCE_DIR}/characters/male/vroid-normal-male.scene
-	)
-
-option(OGRE_DYNAMIC "Build against dynamic ogre" ON)
+	${CMAKE_BINARY_DIR}/assets/blender/shapes/male
+	${CMAKE_BINARY_DIR}/assets/blender/shapes/female
+	${CMAKE_BINARY_DIR}/assets/blender/scripts
+	${CMAKE_BINARY_DIR}/characters/shapes/male/chibi
+	${CMAKE_BINARY_DIR}/characters/shapes/female/chibi
+	${CMAKE_BINARY_DIR}/characters/male
+	${CMAKE_BINARY_DIR}/characters/female)
+#set(CREATE_SCENES
+#	${CMAKE_SOURCE_DIR}/characters/female/vroid-normal-female.scene
+#	${CMAKE_SOURCE_DIR}/characters/male/vroid-normal-male.scene
+#	)
 
 # workaround horribly broken assimp cmake, fixed with assimp 5.1
 #add_library(assimp INTERFACE IMPORTED)
@@ -24,18 +23,17 @@ option(OGRE_DYNAMIC "Build against dynamic ogre" ON)
 #       # INTERFACE_LINK_DIRECTORIES "${ASSIMP_LIBRARY_DIRS}"
 #       INTERFACE_LINK_DIRECTORIES "${CMAKE_PREFIX_PATH}/lib"
 #)
-file(GLOB TERRAIN_SRC ${CMAKE_SOURCE_DIR}/src/terrain/*.cpp)
 file(GLOB WATER_SRC ${CMAKE_SOURCE_DIR}/water/*.cpp)
 
 # The COMPONENTS part checks that OGRE was built the way we need it
 # The CONFIG flag makes sure we get OGRE instead of OGRE-next
-find_package(OGRE REQUIRED COMPONENTS Bites Bullet Paging Terrain CONFIG)
+find_package(OGRE REQUIRED COMPONENTS Bites Paging Terrain CONFIG)
 find_package(ZLIB)
 find_package(SDL2)
 find_package(assimp REQUIRED CONFIG)
-find_package(Bullet)
 find_package(OgreProcedural REQUIRED CONFIG)
 find_package(pugixml REQUIRED CONFIG)
+find_package(flecs REQUIRED CONFIG)
 
 add_library(fix::assimp INTERFACE IMPORTED)
 set_target_properties(fix::assimp PROPERTIES
@@ -50,7 +48,7 @@ set_target_properties(fix::OgreProcedural PROPERTIES
        INTERFACE_LINK_DIRECTORIES "${CMAKE_PREFIX_PATH}/lib"
 )
 
-if(NOT OGRE_DYNAMIC)
+if(OGRE_STATIC)
 add_library(OgreGLSupportStatic INTERFACE IMPORTED)
 set_target_properties(OgreGLSupportStatic PROPERTIES
        INTERFACE_LINK_LIBRARIES "OgreGLSupportStatic"
@@ -67,28 +65,57 @@ set_target_properties(fix::pugixml PROPERTIES
 
 
 add_subdirectory(src/lua)
+add_subdirectory(src/gamedata)
+add_subdirectory(src/miniaudio)
+add_subdirectory(src/sound)
+add_subdirectory(src/sceneloader)
+add_subdirectory(audio/gui)
+add_subdirectory(lua-scripts)
+add_subdirectory(morph)
+add_subdirectory(src/world)
+add_subdirectory(src/tests)
+add_subdirectory(src/physics)
+add_subdirectory(src/editor)
+add_subdirectory(assets/blender/buildings/parts)
+add_subdirectory(resources)
 
-# add the source files as usual
-add_executable(0_Bootstrap Bootstrap.cpp)
- 
-# this also sets the includes and pulls third party dependencies
-target_link_libraries(0_Bootstrap OgreBites OgreBullet OgrePaging ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY} ${ASSIMP_LIBRARIES})
-target_include_directories(0_Bootstrap PUBLIC OgreBites OgrePaging OgreBullet)
-add_dependencies(0_Bootstrap stage_files)
+add_executable(Game Game.cpp ${WATER_SRC})
+target_include_directories(Game PRIVATE src/gamedata)
+target_link_libraries(Game OgreBites OgrePaging OgreTerrain OgreMeshLodGenerator
+	OgreProcedural::OgreProcedural
+	GameData
+	sound
+	sceneloader physics
+	flecs::flecs_static
+	-Wl,--as-needed
+	)
+if(OGRE_STATIC)
+target_link_options(Game PRIVATE -static-libstdc++ -static-libgcc)
+endif()
+add_dependencies(Game stage_files import_buildings import_water_stuff import_vehicles import_vrm audio_data_gui)
 
-add_executable(Editor Editor.cpp ${TERRAIN_SRC} ${WATER_SRC})
-target_link_libraries(Editor OgreBites OgreBullet OgrePaging OgreTerrain OgreMeshLodGenerator ${OgreProcedural_LIBRARIES} ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY})
-target_include_directories(Editor PUBLIC OgreBites OgrePaging OgreBullet OgreTerrain OgreMeshLodGenerator ${OgreProcedural_INCLUDE_DIRS})
-add_dependencies(Editor stage_files import_buildings import_water_stuff)
-add_executable(Game Game.cpp ${TERRAIN_SRC} ${WATER_SRC})
-target_link_libraries(Game OgreBites OgreBullet OgrePaging OgreTerrain OgreMeshLodGenerator ${OgreProcedural_LIBRARIES} ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY})
-target_include_directories(Game PUBLIC OgreBites OgrePaging OgreBullet OgreTerrain OgreMeshLodGenerator ${OgreProcedural_INCLUDE_DIRS})
-add_dependencies(Game stage_files import_buildings import_water_stuff)
-
-add_executable(Procedural Procedural.cpp ${TERRAIN_SRC})
-target_link_libraries(Procedural OgreBites OgreBullet OgrePaging OgreTerrain OgreProcedural::OgreProcedural ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY})
-target_include_directories(Procedural PUBLIC OgreBites OgrePaging OgreBullet OgreTerrain OgreProcedural::OgreProcedural ${CMAKE_PREFIX_PATH}/include/OgreProcedural)
+add_executable(Procedural Procedural.cpp)
+target_link_libraries(Procedural OgreBites OgrePaging OgreTerrain
+	OgreProcedural::OgreProcedural
+	-Wl,--as-needed
+	)
+if(OGRE_STATIC)
+target_link_options(Procedural PRIVATE -static-libstdc++ -static-libgcc)
+endif()
 add_dependencies(Procedural stage_files import_buildings)
+file(GLOB FONTS_SRC ${CMAKE_SOURCE_DIR}/assets/fonts/*.ttf)
+set(FONT_OUTPUT_FILES)
+foreach(FONT_FILE ${FONTS_SRC})
+	get_filename_component(FILE_NAME ${FONT_FILE} NAME_WE)
+	set(FONT_OUTPUT_FILE ${CMAKE_BINARY_DIR}/resources/fonts/${FILE_NAME}.ttf)
+	add_custom_command(
+		OUTPUT ${FONT_OUTPUT_FILE}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/resources/fonts
+		COMMAND ${CMAKE_COMMAND} -E copy ${FONT_FILE} ${FONT_OUTPUT_FILE}
+		DEPENDS ${FONT_FILE})
+	list(APPEND FONT_OUTPUT_FILES ${FONT_OUTPUT_FILE})
+endforeach()
+add_custom_target(fonts ALL DEPENDS ${FONT_OUTPUT_FILES})
 file(GLOB BUILDINGS_SRC ${CMAKE_SOURCE_DIR}/assets/blender/buildings/*.blend)
 set(BUILDING_OUTPUT_FILES)
 foreach(BUILDING_FILE ${BUILDINGS_SRC})
@@ -107,9 +134,46 @@ foreach(BUILDING_FILE ${BUILDINGS_SRC})
 endforeach()
 
 add_custom_target(import_buildings ALL DEPENDS ${BUILDING_OUTPUT_FILES})
+file(GLOB VEHICLES_SRC ${CMAKE_SOURCE_DIR}/assets/blender/vehicles/*.blend)
+set(VEHICLE_OUTPUT_FILES)
+foreach(VEHICLE_FILE ${VEHICLES_SRC})
+	get_filename_component(FILE_NAME ${VEHICLE_FILE} NAME_WE)
+	set(VEHICLE_OUTPUT_FILE ${CMAKE_BINARY_DIR}/resources/vehicles/${FILE_NAME}.glb)
+	add_custom_command(
+		OUTPUT ${VEHICLE_OUTPUT_FILE}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/resources/vehicles
+		COMMAND ${BLENDER} ${VEHICLE_FILE}
+			-b -Y -P
+			${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_buildings.py
+			-- ${VEHICLE_OUTPUT_FILE}
+		COMMAND touch ${VEHICLE_OUTPUT_FILE}
+		DEPENDS ${VEHICLE_FILE})
+	list(APPEND VEHICLE_OUTPUT_FILES ${VEHICLE_OUTPUT_FILE})
+endforeach()
+add_custom_target(import_vehicles ALL DEPENDS ${VEHICLE_OUTPUT_FILES})
+
+set(CHARACTER_SHAPES_SRC edited-normal-male-base.blend edited-shape-test-male.blend)
+set(CHARACTER_SHAPES_OUTPUT_FILES)
+foreach(CHARACTER_SHAPE_FILE ${CHARACTER_SHAPES_SRC})
+	get_filename_component(FILE_NAME ${CHARACTER_SHAPE_FILE} NAME_WE)
+	set(CHARACTER_SHAPE_OUTPUT_FILE ${CMAKE_BINARY_DIR}/characters/shapes/male/${FILE_NAME}/${FILE_NAME}.scene)
+	add_custom_command(
+		OUTPUT ${CHARACTER_SHAPE_OUTPUT_FILE}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/assets/blender
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/characters/shapes/male/${FILE_NAME}
+		COMMAND ${BLENDER} ${CMAKE_SOURCE_DIR}/assets/blender/${CHARACTER_SHAPE_FILE}
+			-b -Y -P
+			${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_characters_ogre.py
+			-- ${CHARACTER_SHAPE_OUTPUT_FILE}
+			COMMAND touch ${CHARACTER_SHAPE_OUTPUT_FILE}
+			DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/${CHARACTER_SHAPE_FILE})
+		list(APPEND CHARACTER_SHAPES_OUTPUT_FILES ${CHARACTER_SHAPE_OUTPUT_FILE})
+endforeach()
+add_custom_target(import_character_shapes ALL DEPENDS ${CHARACTER_SHAPES_OUTPUT_FILES})
 
 set(WATER_STUFF)
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/water/sea.glb
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/water
 	COMMAND ${BLENDER} ${CMAKE_SOURCE_DIR}/assets/blender/sea.blend
 		-b -Y -P
 		${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_buildings.py
@@ -119,62 +183,29 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/water/sea.glb
 list(APPEND WATER_STUFF ${CMAKE_BINARY_DIR}/water/sea.glb)
 add_custom_target(import_water_stuff ALL DEPENDS ${WATER_STUFF})
 
-add_executable(TerrainTest terrain.cpp ${TERRAIN_SRC})
-target_link_libraries(TerrainTest OgreBites OgreBullet OgrePaging OgreTerrain lua ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY})
-target_include_directories(TerrainTest PUBLIC OgreBites OgrePaging OgreTerrain OgreBullet PRIVATE . src/terrain src/lua src/lua/lua-5.4.8/src)
-if(NOT OGRE_DYNAMIC)
+add_executable(TerrainTest terrain.cpp)
+target_link_libraries(TerrainTest OgreBites OgrePaging OgreTerrain lua
+	-Wl,--as-needed
+	)
+target_include_directories(TerrainTest PRIVATE . src/terrain src/lua src/lua/lua-5.4.8/src)
+if(OGRE_STATIC)
 	target_link_libraries(TerrainTest fix::assimp  pugixml)
+	target_link_options(TerrainTest PRIVATE -static-libstdc++ -static-libgcc)
 	target_link_libraries(Procedural fix::assimp pugixml)
-	target_link_libraries(0_Bootstrap fix::assimp pugixml)
-	target_link_libraries(Editor fix::assimp pugixml)
 endif()
 
-
-file(GLOB LUA_SCRIPTS_SRC ${CMAKE_SOURCE_DIR}/lua-scripts/*.lua)
-set(LUA_SCRIPTS_OUTPUT)
-foreach(LUA_SCRIPT_FILE ${LUA_SCRIPTS_SRC})
-	get_filename_component(FILE_NAME ${LUA_SCRIPT_FILE} NAME_WE)
-	set(LUA_SCRIPT_OUTPUT_FILE ${CMAKE_BINARY_DIR}/lua-scripts/${FILE_NAME}.lua)
-	add_custom_command(OUTPUT ${LUA_SCRIPT_OUTPUT_FILE}
-		COMMAND ${CMAKE_COMMAND} -E copy  ${LUA_SCRIPT_FILE} ${LUA_SCRIPT_OUTPUT_FILE}
-		DEPENDS ${LUA_SCRIPT_FILE})
-	list(APPEND LUA_SCRIPTS_OUTPUT ${LUA_SCRIPT_OUTPUT_FILE})
-endforeach()
-add_custom_target(stage_lua_scripts ALL DEPENDS ${LUA_SCRIPTS_OUTPUT})
 add_dependencies(TerrainTest stage_lua_scripts stage_files)
 
+add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/stories
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_BINARY_DIR}/lua-scripts/stories ${CMAKE_BINARY_DIR}/stories
+	DEPENDS ${CMAKE_BINARY_DIR}/lua-scripts/stories
+)
+add_custom_target(stage_stories ALL DEPENDS stage_lua_scripts ${CMAKE_BINARY_DIR}/stories)
+
 add_custom_command(
 	OUTPUT ${CMAKE_BINARY_DIR}/resources.cfg
-	COMMAND cp ${CMAKE_SOURCE_DIR}/resources.cfg ${CMAKE_BINARY_DIR}/resources.cfg
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources/main
-		${CMAKE_BINARY_DIR}/resources/main
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources/shaderlib
-		${CMAKE_BINARY_DIR}/resources/shaderlib
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources/terrain
-		${CMAKE_BINARY_DIR}/resources/terrain
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/characters
-		${CMAKE_BINARY_DIR}/characters
-#	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/lua-scripts
-#		${CMAKE_BINARY_DIR}/lua-scripts
-#	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/skybox
-#		${CMAKE_BINARY_DIR}/skybox
-#	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/resources/debug
-#		${CMAKE_BINARY_DIR}/resources/debug
+        COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/resources.cfg ${CMAKE_BINARY_DIR}/resources.cfg
 DEPENDS ${CMAKE_SOURCE_DIR}/resources.cfg)
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/resources/terrain/world_map.png
-					COMMAND unzip -o ${CMAKE_SOURCE_DIR}/world_map.kra mergedimage.png -d ${CMAKE_BINARY_DIR}/world_map
-					COMMAND ${CMAKE_COMMAND} -E copy
-						${CMAKE_BINARY_DIR}/world_map/mergedimage.png
-						${CMAKE_BINARY_DIR}/resources/terrain/world_map.png
-					COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/world_map
-					DEPENDS ${CMAKE_SOURCE_DIR}/world_map.kra)
-add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/resources/terrain/brushes.png
-					COMMAND unzip -o ${CMAKE_SOURCE_DIR}/brushes.kra mergedimage.png -d ${CMAKE_BINARY_DIR}/brushes
-					COMMAND ${CMAKE_COMMAND} -E copy
-						${CMAKE_BINARY_DIR}/brushes/mergedimage.png
-						${CMAKE_BINARY_DIR}/resources/terrain/brushes.png
-					COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/brushes
-					DEPENDS ${CMAKE_SOURCE_DIR}/brushes.kra)
 
 set(SKYBOX_SRC
 	early_morning_bk.jpg
@@ -224,30 +255,93 @@ foreach(MATERIAL_FILE ${MATERIAL_FILES})
 		list(APPEND MATERIALS_OUTPUT ${OUTPUT_FILE})
 endforeach()
 
+file(GLOB VRM_FILES RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/assets/vroid/*.vrm)
+file(GLOB MIXAMO_FILES RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/assets/blender/mixamo/**/*.fbx)
+set(VRM_SOURCE)
+foreach(VRM_FILE ${VRM_FILES} ${MIXAMO_FILES})
+	set(OUTPUT_FILE "${CMAKE_BINARY_DIR}/${VRM_FILE}")
+	set(INPUT_FILE "${CMAKE_SOURCE_DIR}/${VRM_FILE}")
+	add_custom_command(OUTPUT "${OUTPUT_FILE}"
+		COMMAND ${CMAKE_COMMAND} -E copy  "${INPUT_FILE}" "${OUTPUT_FILE}"
+		DEPENDS "${INPUT_FILE}" VERBATIM)
+	list(APPEND VRM_SOURCE "${OUTPUT_FILE}")
+endforeach()
+
+set(VRM_IMPORTED_BLENDS
+	${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-female.blend
+	${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-male.blend
+	${CMAKE_BINARY_DIR}/assets/blender/shapes/male/vrm-vroid-normal-male-chibi.blend
+)
+
+add_custom_command(OUTPUT ${VRM_IMPORTED_BLENDS}
+	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}
+	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm.py
+	${VRM_SOURCE}
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+
+set(EDITED_BLENDS_LIST
+	male
+	female
+)
+set(EDITED_BLEND_TARGETS)
+set(CHARACTER_GLBS)
+foreach(EDITED_BLEND ${EDITED_BLENDS_LIST})
 add_custom_command(
-	OUTPUT  ${CMAKE_SOURCE_DIR}/characters/female/vroid-normal-female.scene
-	        ${CMAKE_SOURCE_DIR}/characters/male/vroid-normal-male.scene
-		${CMAKE_SOURCE_DIR}/assets/blender/vrm-vroid-normal-female.blend
-		${CMAKE_SOURCE_DIR}/assets/blender/vrm-vroid-normal-male.blend
-		${CMAKE_SOURCE_DIR}/assets/blender/shapes/male/vrm-vroid-normal-male-chibi.blend
-	COMMAND mkdir -p ${CREATE_DIRECTORIES}
-        COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm.py
+	OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend
+	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend
+		${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-${EDITED_BLEND}.blend
+	COMMAND ${CMAKE_COMMAND}
+		-E copy ${CMAKE_SOURCE_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend
+		${CMAKE_BINARY_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend
+	COMMAND ${BLENDER} -b -Y
+		${CMAKE_BINARY_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend
+		-P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/copy_animations.py --
+		${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-${EDITED_BLEND}.blend ${EDITED_BLEND}
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+list(APPEND EDITED_BLEND_TARGETS ${CMAKE_BINARY_DIR}/assets/blender/edited-normal-${EDITED_BLEND}.blend)
+list(APPEND CHARACTER_GLBS ${CMAKE_BINARY_DIR}/characters/${EDITED_BLEND}/normal-${EDITED_BLEND}.glb)
+endforeach()
+
+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(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}
+		COMMAND ${CMAKE_COMMAND} -E copy
+			${CMAKE_SOURCE_DIR}/assets/blender/${COPY_BLEND_FILE}
+			${CMAKE_BINARY_DIR}/assets/blender/${COPY_BLEND_FILE}
+		)
+	list(APPEND EDITED_BLEND_TARGETS ${CMAKE_BINARY_DIR}/assets/blender/${COPY_BLEND_FILE})
+endforeach()
+
+add_custom_target(edited-blends ALL DEPENDS ${EDITED_BLEND_TARGETS})
+
+add_custom_command(
+	OUTPUT ${CHARACTER_GLBS}
+	COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES}
 	COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py
-#	COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_ogre_scene.py
-	COMMAND echo rm -Rf ${CMAKE_SOURCE_DIR}/characters/male/*.material ${CMAKE_SOURCE_DIR}/characters/female/*.material
-	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm.py
-	        ${CMAKE_SOURCE_DIR}/assets/vroid/buch1.vrm
-		${CMAKE_SOURCE_DIR}/assets/vroid/buch1-chibi.vrm
-		${CMAKE_SOURCE_DIR}/assets/vroid/jane2-dress.vrm
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+	COMMAND ${CMAKE_COMMAND} -E touch ${CHARACTER_GLBS}
+	DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_models.py ${VRM_IMPORTED_BLENDS} ${EDITED_BLEND_TARGETS}
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 add_custom_target(stage_files ALL DEPENDS ${CMAKE_BINARY_DIR}/resources.cfg ${MATERIALS_OUTPUT}
 	${CMAKE_BINARY_DIR}/resources/terrain/world_map.png
-	${CMAKE_BINARY_DIR}/resources/terrain/brushes.png)
+	${CMAKE_BINARY_DIR}/resources/terrain/brushes.png
+        edited-blends stage_resources)
 
-add_custom_target(remove_scenes COMMAND rm -f ${CREATE_SCENES})
+add_custom_target(remove_scenes COMMAND rm -f ${VRM_SOURCE} ${VRM_IMPORTED_BLENDS} ${CHARACTER_GLBS})
 
-add_custom_target(import_vrm DEPENDS ${CREATE_SCENES})
+add_custom_target(import_vrm DEPENDS ${CHARACTER_GLBS})
+target_compile_definitions(Game PRIVATE FLECS_CPP_NO_AUTO_REGISTRATION)
 
+install(TARGETS Game DESTINATION bin)
 install(TARGETS Editor DESTINATION bin)
 

Editor.cpp

@@ -9,8 +9,8 @@
 #include <OgreTrays.h>
 #include <OgreTimer.h>
 #include <OgreMeshLodGenerator.h>
+#include <OgreTerrain.h>
 
-#include "src/terrain/terrain.h"
 #include "water/water.h"
 class App;
 class SkyRenderer : public Ogre::SceneManager::Listener {
@@ -244,16 +244,12 @@ public:
 	void initGui();
 };
 class App : public OgreBites::ApplicationContext {
-	std::unique_ptr<Ogre::Bullet::DynamicsWorld> mDynWorld;
-	std::unique_ptr<Ogre::Bullet::DebugDrawer> mDbgDraw;
 	Ogre::SceneNode *mCameraNode, *mCameraPivot, *mCameraGoal;
 	Ogre::Camera *mCamera;
 	Ogre::Real mPivotPitch;
 	Ogre::SceneManager *mScnMgr;
-	OgreBites::InputListenerChain mInput;
 	Ogre::Viewport *mViewport;
 	EditUI m_edit_ui;
-	TerrainSetup m_terrain;
 	Ogre::Light *mSun;
 	SkyBoxRenderer *sky;
 	Water m_water;
@@ -377,9 +373,6 @@ public:
 		: OgreBites::ApplicationContext("ChoroEditor")
 		, mKbd(this)
 		, m_edit_ui(this)
-		, mDynWorld(new Ogre::Bullet::DynamicsWorld(
-			  Ogre::Vector3(0, -9.8, 0)))
-		, m_terrain(mDynWorld->getBtWorld())
 	{
 	}
 	virtual ~App()
@@ -395,8 +388,6 @@ public:
 		mScnMgr->addRenderQueueListener(pOverlaySystem);
 		//		mTrayMgr = new OgreBites::TrayManager("AppTrays",
 		//						      getRenderWindow());
-		mDbgDraw.reset(new Ogre::Bullet::DebugDrawer(
-			mScnMgr->getRootSceneNode(), mDynWorld->getBtWorld()));
 	}
 	void locateResources() override
 	{
@@ -457,20 +448,22 @@ public:
 		std::cout << "Init camera" << "\n";
 		initCamera();
 		std::cout << "Set up water" << "\n";
-		m_water.createWater(getRenderWindow(), mCamera);
+#if 0
+		m_water.createWater(getRenderWindow(), mCamera,
+				    mDynWorld.get());
+#endif
 		std::cout << "Set up cursor" << "\n";
-		Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+		Ogre::ResourceGroupManager::getSingleton()
+			.initialiseAllResourceGroups();
 		// OgreBites::ApplicationContext::loadResources();
 		setupCursor();
 		std::cout << "Create content" << "\n";
 		createContent();
 		std::cout << "Setup terrain" << "\n";
-		setupTerrain();
 		m_water.init();
 	}
 	void setupCursor()
 	{
-
 		//		mKeyDirection = Ogre::Vector3::ZERO;
 		//		mVerticalVelocity = 0;
 		Ogre::ManualObject *mobj =
@@ -513,6 +506,7 @@ public:
 	}
 	void updateMotion(float delta)
 	{
+#if 0
 		if (delta == 0.0f)
 			return;
 		Ogre::Vector3 move(mCameraNode->getOrientation().zAxis() *
@@ -535,6 +529,7 @@ public:
 		// mKbd.motion = Ogre::Vector3(0, 0, 0);
 		// if (move.squaredLength() > 0)
 		// 	std::cout << move << "\n";
+#endif
 	}
 	void updateCamera(Ogre::Real delta)
 	{
@@ -581,10 +576,12 @@ public:
 			mCameraGoal->translate(0, 0, distChange,
 					       Ogre::Node::TS_LOCAL);
 		Ogre::Vector3 mh = mCameraGoal->_getDerivedPosition();
+#if 0
 		float h = m_terrain.get_height(mh);
 		if (h + 10 > mh.y)
 			mCameraGoal->translate(0, 10.0f * deltaZoom, distChange,
 					       Ogre::Node::TS_LOCAL);
+#endif
 	}
 	Ogre::SceneNode *mSunGoal;
 	Ogre::SceneNode *mSunNode;
@@ -658,9 +655,6 @@ public:
 		m_edit_ui.init_glb_list();
 		m_edit_ui.initGui();
 		createSun();
-		mInput = OgreBites::InputListenerChain(
-			{ getImGuiInputListener(), &mKbd });
-		addInputListener(&mInput);
 		getRoot()->addFrameListener(&mKbd);
 		// mTrayMgr->showCursor();
 
@@ -716,11 +710,6 @@ public:
 	{
 		return mCamera;
 	}
-	void setupTerrain()
-	{
-		m_terrain.setupTerrain(mCamera, mSun, mDynWorld.get(),
-				       mDbgDraw.get());
-	}
 };
 
 void EditUI::buildings_editor()

Procedural.cpp

@@ -7,10 +7,6 @@
 
 #include "Ogre.h"
 #include "OgreApplicationContext.h"
-#include "Bullet/OgreBullet.h"
-#include "BulletCollision/CollisionDispatch/btGhostObject.h"
-#include "btKinematicCharacterController.h"
-#include "LinearMath/btTransform.h"
 #include "OgrePageManager.h"
 #include "Procedural.h"
 
@@ -23,11 +19,8 @@ using Real = Ogre::Real;
 using Math = Ogre::Math;
 
 class WorldData {
-	std::unique_ptr<Ogre::Bullet::DynamicsWorld> mDynWorld;
-	std::unique_ptr<Ogre::Bullet::DebugDrawer> mDbgDraw;
 	std::unique_ptr<Ogre::Root> mRoot;
 	std::unique_ptr<Ogre::SceneManager> mScnMgr;
-	std::unique_ptr<btDynamicsWorld> mbtWorld;
 	std::unique_ptr<Ogre::PageManager> mPageManager;
 	Ogre::PagedWorld *mPagedWorld;
 
@@ -63,13 +56,8 @@ private:
 	DummyPageProvider mDummyPageProvider;
 
 	WorldData(Ogre::Root *root, Ogre::SceneManager *scnMgr)
-		: mDynWorld(new Ogre::Bullet::DynamicsWorld(
-			  Ogre::Vector3(0, -9.8, 0)))
-		, mDbgDraw(new Ogre::Bullet::DebugDrawer(
-			  scnMgr->getRootSceneNode(), mDynWorld->getBtWorld()))
-		, mRoot(root)
+		: mRoot(root)
 		, mScnMgr(scnMgr)
-		, mbtWorld(mDynWorld->getBtWorld())
 		, mPageManager(nullptr)
 		, mPagedWorld(nullptr)
 	{
@@ -101,94 +89,8 @@ public:
 	void createTrimesh(Ogre::Entity *entity)
 	{
 	}
-	btPairCachingGhostObject *addGhostObject(Ogre::Entity *ent,
-						 btCollisionShape *shape,
-						 int group = 1,
-						 int mask = 0xFFFF)
-	{
-		btDynamicsWorld *world = mDynWorld->getBtWorld();
-		Ogre::SceneNode *node = ent->getParentSceneNode();
-		btPairCachingGhostObject *ghost =
-			new btPairCachingGhostObject();
-		ghost->setCollisionShape(shape);
-		ghost->setCollisionFlags(
-			ghost->getCollisionFlags() |
-			btCollisionObject::CF_NO_CONTACT_RESPONSE |
-			btCollisionObject::CF_CHARACTER_OBJECT);
-		getWorld()->attachCollisionObject(ghost, ent, group, mask);
-#if 0
-		getBtWorld()
-			->getBroadphase()->getOverlappingPairCache()
-				->setInternalGhostPairCallback(new btGhostPairCallback());
-    		ghost->setUserPointer(new EntityCollisionListener{ent, nullptr});
-#endif
-		return ghost;
-	}
-	btRigidBody *addRigidBody(float mass, Ogre::Entity *ent,
-				  Ogre::Bullet::ColliderType ct, int group = 1,
-				  int mask = 0xFFFF)
-	{
-		btDynamicsWorld *world = mDynWorld->getBtWorld();
-		Ogre::SceneNode *node = ent->getParentSceneNode();
-		Ogre::Bullet::RigidBodyState *state =
-			new Ogre::Bullet::RigidBodyState(node);
-		btCollisionShape *cs;
-		btCollisionShape *shape;
-		btVector3 inertia(0, 0, 0);
-		switch (ct) {
-		case Ogre::Bullet::CT_TRIMESH: {
-			cs = Ogre::Bullet::createTrimeshCollider(ent);
-			if (mass != 0)
-				cs->calculateLocalInertia(mass, inertia);
-		} break;
-		case Ogre::Bullet::CT_CAPSULE: {
-			cs = new btCompoundShape();
-			btScalar height = 1.0f;
-			btScalar radius = 0.3f;
-			shape = new btCapsuleShape(radius,
-						   2 * height - 2 * radius);
-			btTransform transform;
-			transform.setIdentity();
-			transform.setOrigin(btVector3(0, 1, 0));
-			static_cast<btCompoundShape *>(cs)->addChildShape(
-				transform, shape);
-			btScalar masses[1] = { mass };
-			btTransform principal;
-			static_cast<btCompoundShape *>(cs)
-				->calculatePrincipalAxisTransform(
-					masses, principal, inertia);
-		} break;
-		default:
-			assert(false);
-			break;
-		}
-		btRigidBody *body = new btRigidBody(mass, state, cs, inertia);
-		getWorld()->attachRigidBody(body, ent, nullptr, group, mask);
-#if 0
-    		body->setUserPointer(new EntityCollisionListener{ent, nullptr});
-//		btRigidBody *body = mDynWorld->addRigidBody(0, ent, Ogre::Bullet::CT_TRIMESH);
-#endif
-		return body;
-	}
-	btRigidBody *addKinematicRigidBody(float mass, Ogre::Entity *ent,
-					   Ogre::Bullet::ColliderType ct,
-					   int group = 1, int mask = 0xFFFF)
-	{
-		return mDynWorld->addKinematicRigidBody(ent, ct, group, mask);
-	}
-	btDynamicsWorld *getBtWorld()
-	{
-		return mDynWorld->getBtWorld();
-	}
-	Ogre::Bullet::DynamicsWorld *getWorld()
-	{
-		return mDynWorld.get();
-	}
 	void update(float delta)
 	{
-		WorldData::get_singleton()->getBtWorld()->stepSimulation(delta,
-									 10);
-		mDbgDraw->update();
 	}
 	void initPagedWorld(Ogre::Camera *camera)
 	{
@@ -202,8 +104,6 @@ public:
 WorldData *WorldData::singleton = nullptr;
 
 class MainWorld : public Ogre::FrameListener {
-	btRigidBody *mFloorBody;
-
 public:
 	void setup()
 	{
@@ -221,13 +121,6 @@ public:
 			WorldData::get_singleton()->getSceneManager();
 		Ogre::Entity *floor = scnMgr->createEntity("Floor", "floor");
 		scnMgr->getRootSceneNode()->attachObject(floor);
-		mFloorBody = WorldData::get_singleton()->addRigidBody(
-			0, floor, Ogre::Bullet::CT_TRIMESH);
-	}
-	btRigidBody *addCharacter(Ogre::Entity *ent, float mass)
-	{
-		return WorldData::get_singleton()->addKinematicRigidBody(
-			mass, ent, Ogre::Bullet::CT_COMPOUND);
 	}
 	bool frameStarted(const Ogre::FrameEvent &evt) override;
 };
@@ -267,9 +160,6 @@ class CharacterController : public OgreBites::InputListener,
 	Ogre::Vector3 rootMotion;
 	Ogre::Quaternion rootRotation;
 	//    btRigidBody *mRigidBody;
-	btCompoundShape *mCollisionShape;
-	btPairCachingGhostObject *mGhostObject;
-	btKinematicCharacterController *mController;
 
 public:
 	CharacterController(Ogre::SceneNode *camNode, Ogre::Camera *cam,
@@ -318,35 +208,6 @@ private:
 		    recoverResult *recover_result,
 		    const std::set<btCollisionObject *> &exclude);
 #endif
-	inline btQuaternion convert(const Ogre::Quaternion &q)
-	{
-		return btQuaternion(q.x, q.y, q.z, q.w);
-	}
-	inline btVector3 convert(const Ogre::Vector3 &v)
-	{
-		return btVector3(v.x, v.y, v.z);
-	}
-	inline btTransform convert(const Ogre::Quaternion &q,
-				   const Ogre::Vector3 &v)
-	{
-		btQuaternion mq = convert(q);
-		btVector3 mv = convert(v);
-		return btTransform(mq, mv);
-	}
-	inline Ogre::Quaternion convert(const btQuaternion &q)
-	{
-		return Ogre::Quaternion(q.w(), q.x(), q.y(), q.z());
-	}
-	inline Ogre::Vector3 convert(const btVector3 &v)
-	{
-		return Ogre::Vector3(v.x(), v.y(), v.z());
-	}
-	inline void convert(const btTransform &from, Ogre::Quaternion &q,
-			    Ogre::Vector3 &v)
-	{
-		q = convert(from.getRotation());
-		v = convert(from.getOrigin());
-	}
 };
 CharacterController::CharacterController(Ogre::SceneNode *camNode,
 					 Ogre::Camera *cam,
@@ -360,9 +221,6 @@ CharacterController::CharacterController(Ogre::SceneNode *camNode,
 	, mAnimID(ANIM_NONE)
 	, mRunning(false)
 	, world(world)
-	, mCollisionShape(nullptr)
-	, mGhostObject(nullptr)
-	, mController(nullptr)
 {
 	setupBody();
 	setupCamera();
@@ -377,72 +235,6 @@ void CharacterController::setupBody()
 	mBodyNode = mScnMgr->getRootSceneNode()->createChildSceneNode();
 	mBodyNode->attachObject(mBodyEnt);
 	mSkeleton = mBodyEnt->getSkeleton();
-	// mRigidBody = world->addCharacter(mBodyEnt, 0);
-	// mCollisionShape = static_cast<btCompoundShape *>(mRigidBody->getCollisionShape());
-	mGhostObject = new btPairCachingGhostObject();
-	mCollisionShape = new btCompoundShape;
-	mGhostObject->setCollisionShape(mCollisionShape);
-
-	{
-		btVector3 inertia(0, 0, 0);
-		//        mCollisionShape = new btCompoundShape();
-		btScalar height = 1.0f;
-		btScalar radius = 0.3f;
-		btCapsuleShape *shape =
-			new btCapsuleShape(radius, 2 * height - 2 * radius);
-		btTransform transform;
-		transform.setIdentity();
-		transform.setOrigin(btVector3(0, 1, 0));
-		static_cast<btCompoundShape *>(mCollisionShape)
-			->addChildShape(transform, shape);
-		btScalar masses[1] = { 0 };
-		btTransform principal;
-		static_cast<btCompoundShape *>(mCollisionShape)
-			->calculatePrincipalAxisTransform(masses, principal,
-							  inertia);
-	}
-	mGhostObject->setCollisionFlags(
-		btCollisionObject::CF_KINEMATIC_OBJECT |
-		btCollisionObject::CF_NO_CONTACT_RESPONSE);
-	mGhostObject->setActivationState(DISABLE_DEACTIVATION);
-	Ogre::Bullet::KinematicMotionSimple *controller =
-		new Ogre::Bullet::KinematicMotionSimple(mGhostObject,
-							mBodyNode);
-	WorldData::get_singleton()->getWorld()->attachCollisionObject(
-		mGhostObject, mBodyEnt, btBroadphaseProxy::AllFilter,
-		btBroadphaseProxy::AllFilter);
-	WorldData::get_singleton()->getBtWorld()->addAction(controller);
-
-	assert(mCollisionShape);
-#if 0
-    if (mRigidBody->getMass() == 0) {
-#if 0
-        mRigidBody->setCollisionFlags(mRigidBody->getCollisionFlags()
-		    | btCollisionObject::CF_KINEMATIC_OBJECT
-		    | btCollisionObject::CF_NO_CONTACT_RESPONSE
-		    );
-#endif
-#if 0
-	mGhostObject->setWorldTransform(mRigidBody->getWorldTransform());
-	WorldData::get_singleton()->getBtWorld()
-		->getBroadphase()->getOverlappingPairCache()
-			->setInternalGhostPairCallback(new btGhostPairCallback());
-#endif
-    }
-#endif
-#if 0
-    mRigidBody->setActivationState(DISABLE_DEACTIVATION);
-#endif
-#if 0
-    {
-        Ogre::Entity *e2 = mScnMgr->createEntity("normal-male.glb");
-	Ogre::SceneNode *e2node = mScnMgr->getRootSceneNode()->createChildSceneNode();
-    	e2node->attachObject(e2);
-	mGhostObject = WorldData::get_singleton()->addGhostObject(e2, mCollisionShape);
-	mController = new btKinematicCharacterController(mGhostObject, mCollisionShape, 0.5f);
-	WorldData::get_singleton()->getBtWorld()->addAction(mController);
-    }
-#endif
 	assert(mSkeleton->hasBone("Root"));
 	mRootBone = mSkeleton->getBone("Root");
 	assert(mRootBone);
@@ -743,8 +535,6 @@ void CharacterController::updateRootMotion(Real delta)
 	Ogre::Vector3 velocity = rot * boneMotion / delta;
 	velocity += gravity * delta;
 	Ogre::Vector3 rotMotion = velocity * delta;
-	btTransform from(convert(mBodyNode->getOrientation()),
-			 convert(mBodyNode->getPosition()));
 	mBodyNode->setPosition(mBodyNode->getPosition() + rotMotion);
 	//	WorldData::get_singleton()->getWorld()->testBodyMotion(mRigidBody, from, Ogre::Bullet::convert(rotMotion), true,
 	//            nullptr, false, std::set<btCollisionObject *>());

assets/blender/buildings/parts/CMakeLists.txt

@@ -0,0 +1,31 @@
+project(building-parts)
+set(PARTS_FILES pier.blend)
+set(FURNITURE_FILES furniture.blend furniture-sofa.blend)
+set(PARTS_OUTPUT_DIRS)
+foreach(PARTS_FILE ${PARTS_FILES})
+	get_filename_component(FILE_NAME ${PARTS_FILE} NAME_WE)
+	set(PARTS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/resources/buildings/parts/${FILE_NAME})
+	add_custom_command(
+		OUTPUT ${PARTS_OUTPUT_DIR}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${PARTS_OUTPUT_DIR}
+		COMMAND ${BLENDER} ${CMAKE_CURRENT_SOURCE_DIR}/${PARTS_FILE}
+			-b -Y -P
+			${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_building_parts.py
+			-- ${PARTS_OUTPUT_DIR}
+		DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PARTS_FILE} ${CMAKE_SOURCE_DIR}/assets/blender/scripts/export_building_parts.py)
+	list(APPEND PARTS_OUTPUT_DIRS ${PARTS_OUTPUT_DIR})
+endforeach()
+foreach(FURNITURE_FILE ${FURNITURE_FILES})
+	get_filename_component(FILE_NAME ${FURNITURE_FILE} NAME_WE)
+	set(PARTS_OUTPUT_DIR ${CMAKE_BINARY_DIR}/resources/buildings/parts/${FILE_NAME})
+	add_custom_command(
+		OUTPUT ${PARTS_OUTPUT_DIR}
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${PARTS_OUTPUT_DIR}
+		COMMAND ${BLENDER} ${CMAKE_CURRENT_SOURCE_DIR}/${FURNITURE_FILE}
+			-b -Y -P
+			${CMAKE_CURRENT_SOURCE_DIR}/export_furniture_parts.py
+			-- ${PARTS_OUTPUT_DIR}
+			DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${PARTS_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/export_furniture_parts.py)
+	list(APPEND PARTS_OUTPUT_DIRS ${PARTS_OUTPUT_DIR})
+endforeach()
+add_custom_target(import_building_parts ALL DEPENDS ${PARTS_OUTPUT_DIRS})

assets/blender/buildings/parts/export_furniture_parts.py

@@ -0,0 +1,182 @@
+import bpy
+import os, sys, time
+import json
+from mathutils import Matrix, Quaternion
+argv = sys.argv
+argv = argv[argv.index("--") + 1:]
+
+incpath = os.path.dirname(__file__)
+
+sys.path.insert(0, incpath)
+outdir = argv[0]
+
+basis_change = Matrix((
+    (1, 0, 0, 0),
+    (0, 0, 1, 0),
+    (0, -1, 0, 0),
+    (0, 0, 0, 1)
+))
+
+def export_root_objects_to_gltf(output_dir):
+    # Ensure the output directory exists
+    if not os.path.exists(output_dir):
+        os.makedirs(output_dir)
+
+    # Deselect all objects
+    bpy.ops.object.select_all(action='DESELECT')
+
+    # Iterate through all objects in the scene
+    for obj in bpy.context.scene.objects:
+        # Check if the object has no parent and has children
+        # The original request specifies "objects having no parent with children".
+        # This condition captures those that are explicitly root objects of a hierarchy.
+        if obj.parent is None:
+            # Select the root object and all its children
+
+            print(obj.name)
+            if not obj.name.startswith("furniture-"):
+                continue
+            desc = {}
+            desc["name"] = obj.name.replace("furniture-","")
+            desc["mesh"] = obj.name + ".glb"
+            if "furniture_tags" in obj:
+                mtags = obj["furniture_tags"]
+                if "," in mtags:
+                    atags = [m.strip() for m in mtags.split(",")]
+                    desc["tags"] = atags
+                else:
+                    desc["tags"] = [mtags]
+            else:
+                desc["tags"] = []
+            desc["sensors"] = []
+            desc["actions"] = []
+            desc["positions"] = []
+            for child in obj.children:
+                if child.name.startswith("action-"):
+                    if not "action" in child:
+                        continue
+                    if not "height" in child:
+                        continue
+                    if not "radius" in child:
+                        continue
+                    local_matrix = child.matrix_local
+                    ogre_local_matrix = basis_change @ local_matrix @ basis_change.inverted()
+                    local_pos_d = ogre_local_matrix.to_translation()
+                    local_rot_d = ogre_local_matrix.to_quaternion()
+                    local_pos = [round(x, 4) for x in local_pos_d]
+                    local_rot = [round(x, 4) for x in local_rot_d]
+                    action = {}
+                    action["position_x"] = local_pos[0]
+                    action["position_y"] = local_pos[1]
+                    action["position_z"] = local_pos[2]
+                    action["rotation_w"] = local_rot[0]
+                    action["rotation_x"] = local_rot[1]
+                    action["rotation_y"] = local_rot[2]
+                    action["rotation_z"] = local_rot[3]
+                    action["height"] = child["height"]
+                    action["radius"] = child["radius"]
+                    action["action"] = child["action"]
+                    if "action_text" in child:
+                        action["action_text"] = child["action_text"]
+                    else:
+                        action["action_text"] = child["action"].capitalize()
+                    if "name" in child:
+                        action["name"] = child["name"]
+                    else:
+                        action["name"] = desc["name"] + "_" + str(len(desc["actions"]))
+                    action["furniture"] = {}
+                    action["furniture"]["name"] = desc["name"]
+                    action["furniture"]["tags"] = desc["tags"]
+                    action["positions"] = []
+                    for schild in child.children:
+                        if schild.name.startswith("position-"):
+                            local_matrix = schild.matrix_local
+                            ogre_local_matrix = basis_change @ local_matrix @ basis_change.inverted()
+                            local_pos_d = ogre_local_matrix.to_translation()
+                            local_rot_d = ogre_local_matrix.to_quaternion()
+                            local_pos = [round(x, 4) for x in local_pos_d]
+                            local_rot = [round(x, 4) for x in local_rot_d]
+                            position = {}
+                            if "name" in schild:
+                                position["name"] = schild["name"]
+                            if "type" in schild:
+                                position["type"] = schild["type"]
+                            position["position_x"] = local_pos[0]
+                            position["position_y"] = local_pos[2]
+                            position["position_z"] = local_pos[1]
+                            position["rotation_w"] = local_rot[0]
+                            position["rotation_x"] = local_rot[1]
+                            position["rotation_y"] = local_rot[2]
+                            position["rotation_z"] = local_rot[3]
+                            action["positions"].append(position)
+                    desc["actions"].append(action)
+                if child.name.startswith("position-"):
+                    local_matrix = child.matrix_local
+                    ogre_local_matrix = basis_change @ local_matrix @ basis_change.inverted()
+                    local_pos_d = ogre_local_matrix.to_translation()
+                    local_rot_d = ogre_local_matrix.to_quaternion()
+                    local_pos = [round(x, 4) for x in local_pos_d]
+                    local_rot = [round(x, 4) for x in local_rot_d]
+                    position = {}
+                    if "name" in child:
+                        position["name"] = child["name"]
+                    if "type" in child:
+                        position["type"] = child["type"]
+                    position["position_x"] = local_pos[0]
+                    position["position_y"] = local_pos[2]
+                    position["position_z"] = local_pos[1]
+                    position["rotation_w"] = local_rot[0]
+                    position["rotation_x"] = local_rot[1]
+                    position["rotation_y"] = local_rot[2]
+                    position["rotation_z"] = local_rot[3]
+                    desc["positions"].append(position)
+
+            obj.select_set(True)
+            for child in obj.children_recursive:
+                child.select_set(True)
+
+            obj.location = (0.0, 0.0, 0.0)
+            
+            # Set the root object as the active object for the export operator
+            bpy.context.view_layer.objects.active = obj
+
+            # Define the output file path
+            file_path = os.path.join(output_dir, f"{obj.name}.glb")
+            
+            # Export the selected objects to a glTF file
+            bpy.ops.export_scene.gltf(filepath=file_path,
+                    use_selection=True,
+                    check_existing=False,
+                    export_format='GLB',
+                    export_texture_dir='textures', export_texcoords=True,
+                    export_normals=True,
+                    export_tangents=True,
+                    export_materials='EXPORT',
+                    export_colors=True,
+                    use_mesh_edges=False,
+                    use_mesh_vertices=False,
+                    export_cameras=False,
+                    use_visible=False,
+                    use_renderable=False,
+                    export_yup=True,
+                    export_apply=True,
+                    export_animations=True,
+                    export_force_sampling=True,
+                    export_def_bones=False,
+                    export_current_frame=False,
+                    export_morph=True,
+                    export_morph_animation=False,
+                    export_morph_normal=True,
+                    export_morph_tangent=True,
+                    export_lights=False,
+                    export_skins=True)
+
+            # Deselect all objects for the next iteration
+            bpy.ops.object.select_all(action='DESELECT')
+            
+            print(f"Exported {obj.name} and its children to {file_path}")
+            with open(file_path + ".json", "w") as json_data:
+                json.dump(desc, json_data)
+
+export_root_objects_to_gltf(outdir)
+