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

converted to Jolt physics

Browse Source
This commit is contained in:
Sergey Lapin
2025-11-23 02:00:31 +03:00
parent 3f0484e87c
commit cd82fb0eed
52 changed files with 4302 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/world/CMakeLists.txt
View File

@@ -1,18 +1,20 @@
project(world)
find_package(Bullet)
find_package(OGRE REQUIRED COMPONENTS Bites Bullet Paging Terrain Overlay CONFIG)
add_library(action action.cpp)
target_link_libraries(action PUBLIC GameData OgreBullet)
add_library(action STATIC action.cpp)
target_link_libraries(action PRIVATE GameData)
target_include_directories(action PUBLIC .)
add_library(world-build world-build.cpp)
target_link_libraries(world-build PUBLIC GameData OgreBullet)
add_library(world-build STATIC world-build.cpp)
target_link_libraries(world-build PRIVATE GameData)
target_include_directories(world-build PUBLIC .)
add_executable(test test.cpp)
target_link_libraries(test PRIVATE OgreMain OgreBullet action world-build lua)
target_link_libraries(test PRIVATE action world-build lua GameData OgreMain)
add_executable(test2 test2.cpp)
target_link_libraries(test2 PRIVATE OgreMain OgreBullet action world-build lua)
target_link_libraries(test2 PRIVATE action world-build lua GameData OgreMain)
add_executable(mark_harbors mark_harbors.cpp)
target_link_libraries(mark_harbors PRIVATE OgreMain OgreBullet lua)
target_link_libraries(mark_harbors PRIVATE lua OgreMain OgreRTShaderSystem)
add_custom_target(world ALL DEPENDS test test2)

2
src/world/test.cpp
View File

@@ -150,7 +150,7 @@ int main()
ecs.component<Female>();
ecs.component<Position>();
ecs.component<Target>();
ecs.set<ECS::EngineData>({ nullptr, nullptr, 0.0f, 5.0f, 0, 0, false });
ecs.set<ECS::EngineData>({ nullptr, 0.0f, 5.0f, 0, 0, false });
flecs::entity e1 = ecs.entity("e1");
e1.set<Blackboard>({ e1, 100, 100, 100, 0 });

2
src/world/test2.cpp
View File

@@ -443,7 +443,7 @@ int main()
ecs.import <ECS::CharacterAIModule>();
ecs.import <ECS::CharacterAIExtraModule>();
ecs.import <ECS::GameWorldModule>();
ecs.set<ECS::EngineData>({ nullptr, nullptr, 0.0f, 5.0f, 0, 0, false });
ecs.set<ECS::EngineData>({ nullptr, 0.0f, 5.0f, 0, 0, false });
CopulationGoal goal_copulation;
SustainabilityGoal goal_sustainability;
ECS::Planner &planner = ecs.ensure<ECS::Planner>();