converted to Jolt physics

2025-11-23 02:00:31 +03:00
parent 3f0484e87c
commit cd82fb0eed
52 changed files with 4302 additions and 1458 deletions
--- a/src/gamedata/CharacterModule.cpp
+++ b/src/gamedata/CharacterModule.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 #include <Ogre.h>
-#include <OgreBullet.h>
 #include "GameData.h"
 #include "WaterModule.h"
 #include "TerrainModule.h"
 #include "Components.h"
+#include "PhysicsModule.h"
 #include "CharacterAnimationModule.h"
 #include "CharacterModule.h"
 #include "goap.h"
@@ -17,8 +17,10 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 	ecs.component<Character>();
 	ecs.component<Player>();
 	ecs.component<CharacterBase>();
-	ecs.component<CharacterVelocity>();
-	ecs.component<CharacterBody>();
+	ecs.component<CharacterGravity>();
+	ecs.component<CharacterLocation>();
+	ecs.component<CharacterBuoyancy>();
+	ecs.component<CharacterConf>();
 	ecs.component<CharacterDisablePhysics>();
 	ecs.component<CharacterUpdatePhysicsState>();
 	ecs.component<CharacterInActuator>();
@@ -125,6 +127,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			else if (current_subm < 0.8f)
 				ch.is_submerged = false;
 		});
+#if 0
 	ecs.system<const EngineData, const CharacterBase, CharacterVelocity>(
 		   "HandleGravityBouyanceWater")
 		.kind(flecs::OnUpdate)
@@ -164,6 +167,8 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			gr.gvelocity *= (1.0 - eng.delta);
 			gr.velocity.y *= (1.0 - eng.delta);
 		});
+#endif
+#if 0
 	ecs.system<const EngineData, const CharacterBase, CharacterVelocity>(
 		   "HandleGravityNoWater")
 		.kind(flecs::OnUpdate)
@@ -183,6 +188,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			gr.gvelocity *= (1.0 - eng.delta);
 			gr.velocity.y *= (1.0 - eng.delta);
 		});
+#endif
 #define TURN_SPEED 500.0f // character turning in degrees per second
 	ecs.system<const Input, const Camera, CharacterBase>("UpdateBody")
 		.kind(flecs::OnUpdate)
@@ -235,6 +241,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				ch.mBodyNode->yaw(Ogre::Degree(yawToGoal));
 			}
 		});
+#if 0
 	ecs.system<const EngineData, CharacterLocation, CharacterBase,
 		   CharacterBody>("UpdateCharacterBase")
 		.kind(flecs::OnUpdate)
@@ -251,6 +258,40 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 					ch.mBodyNode->_getDerivedPosition();
 			}
 		});
+#endif
+	ecs.observer<const EngineData, const CharacterLocation,
+		     const CharacterConf>("SetupCharacterM")
+		.event(flecs::OnSet)
+		.with<Character>()
+		.without<CharacterBase>()
+		.each([](flecs::entity e, const EngineData &eng,
+			 const CharacterLocation &loc,
+			 const CharacterConf &conf) {
+			CharacterBase &ch = e.ensure<CharacterBase>();
+			AnimationControl &anim = e.ensure<AnimationControl>();
+			ch.mBodyEnt = eng.mScnMgr->createEntity(conf.type);
+			ch.mBodyNode = eng.mScnMgr->getRootSceneNode()
+					       ->createChildSceneNode();
+			ch.mBodyNode->setOrientation(loc.orientation);
+			ch.mBodyNode->setPosition(loc.position);
+			ch.mBodyNode->attachObject(ch.mBodyEnt);
+			ch.mSkeleton = ch.mBodyEnt->getSkeleton();
+			OgreAssert(ch.mBodyEnt->getSkeleton()->hasBone("Root"),
+				   "No root bone");
+			OgreAssert(ch.mSkeleton->hasBone("Root"),
+				   "No root bone");
+			ch.mRootBone = ch.mSkeleton->getBone("Root");
+			OgreAssert(ch.mRootBone, "No root bone");
+			// body.mController = nullptr;
+			ch.mBoneMotion = Ogre::Vector3::ZERO;
+			ch.mBonePrevMotion = Ogre::Vector3::ZERO;
+			e.set<CharacterVelocity>(
+				{ { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } });
+			e.add<CharacterGravity>();
+			e.add<CharacterBuoyancy>();
+			anim.configured = false;
+		});
+#if 0
 	ecs.system<const EngineData, const CharacterLocation,
 		   const CharacterConf, Body2Entity>("SetupCharacter")
 		.kind(flecs::OnUpdate)
@@ -276,13 +317,14 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				   "No root bone");
 			ch.mRootBone = ch.mSkeleton->getBone("Root");
 			OgreAssert(ch.mRootBone, "No root bone");
-			body.mController = nullptr;
+			// body.mController = nullptr;
 			ch.mBoneMotion = Ogre::Vector3::ZERO;
 			ch.mBonePrevMotion = Ogre::Vector3::ZERO;
 			e.set<CharacterVelocity>(
 				{ { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } });
 			body.checkGround = false;
 			body.checkGroundResult = false;
+#if 0
 			body.mCollisionShape = nullptr;
 			body.mGhostObject = nullptr;
 			body.mController = nullptr;
@@ -320,12 +362,15 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				body.mGhostObject, ch.mBodyEnt, 1, 0x7FFFFFFF);
 			OgreAssert(body.mGhostObject, "Need GhostObject");
 			OgreAssert(body.mCollisionShape, "No collision shape");
+#endif
 			e.add<CharacterGravity>();
 			e.add<CharacterBuoyancy>();
 			anim.configured = false;
-			OgreAssert(body.mGhostObject->hasContactResponse(),
-				   "need contact response");
+			// OgreAssert(body.mGhostObject->hasContactResponse(),
+			//	   "need contact response");
 		});
+#endif
+#if 0
 	ecs.system<const EngineData, CharacterBase, CharacterBody>(
 		   "UpdateCharacterPhysics")
 		.kind(flecs::OnUpdate)
@@ -334,17 +379,21 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.with<WaterReady>()
 		.each([](const EngineData &eng, CharacterBase &ch,
 			 CharacterBody &body) {
+#if 0
 			if (ch.mBodyNode && !body.mController &&
 			    eng.startupDelay < 0.0f) {
 				body.mController =
 					new Ogre::Bullet::KinematicMotionSimple(
 						body.mGhostObject,
 						ch.mBodyNode);
+				body.mController->enableManualNarrowPhase(true);
 				eng.mWorld->getBtWorld()->addAction(
 					body.mController);
 				OgreAssert(body.mController, "Need controller");
 			}
+#endif
 		});
+#endif
 #define CAM_HEIGHT 1.6f // height of camera above character's center of mass
 	ecs.system<const EngineData, Camera, const CharacterBase>(
 		   "UpdateCamera")
@@ -394,6 +443,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 					Ogre::Node::TS_PARENT);
 			}
 		});
+#if 0
 	class ClosestNotMeRayResultCallback
 		: public btCollisionWorld::ClosestRayResultCallback {
 		btCollisionObject *mMe;
@@ -416,12 +466,14 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				rayResult, normalInWorldSpace);
 		}
 	};
-	ecs.system<const EngineData, CharacterBody>("CheckGround")
+#endif
+	ecs.system<const EngineData, CharacterBase>("CheckGround")
 		.kind(flecs::OnUpdate)
 		.with<Character>()
 		.with<Player>()
 		.without<GroundCheckReady>()
-		.each([](const EngineData &eng, CharacterBody &body) {
+		.each([](const EngineData &eng, CharacterBase &ch) {
+#if 0
 			if (body.mGhostObject) {
 				btVector3 from =
 					body.mGhostObject->getWorldTransform()
@@ -437,7 +489,10 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				if (resultCallback.hasHit())
 					ECS::get().add<GroundCheckReady>();
 			}
+#endif
+			ECS::get().add<GroundCheckReady>();
 		});
+#if 0
 	ecs.system<const WaterBody, const CharacterBase, CharacterBody>(
 		   "CharacterWater1")
 		.kind(flecs::OnUpdate)
@@ -445,11 +500,13 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.without<InWater>()
 		.each([](flecs::entity e, const WaterBody &waterb,
 			 const CharacterBase &ch, CharacterBody &body) {
+#if 0
 			if (waterb.isInWater(body.mGhostObject) &&
 			    ch.mBodyNode->_getDerivedPosition().y < -0.05f) {
 				e.add<InWater>();
 				std::cout << "Big Splash\n";
 			}
+#endif
 #if 0
 			if (waterb.mInWater.find(body.mGhostObject) ==
 			    waterb.mInWater.end())
@@ -457,6 +514,8 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			std::cout << waterb.mInWater.size() << " InWater\n";
 #endif
 		});
+#endif
+#if 0
 	ecs.system<const WaterBody, const CharacterBase, CharacterBody>(
 		   "CharacterWater2")
 		.kind(flecs::OnUpdate)
@@ -465,12 +524,15 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.each([](flecs::entity e, const WaterBody &waterb,
 			 const CharacterBase &ch, CharacterBody &body) {
 			float h = ch.mBodyNode->_getDerivedPosition().y;
+#if 0
 			if (waterb.isInWater(body.mGhostObject) && h > 0.05f)
 				e.remove<InWater>();
 			else if (!waterb.isInWater(body.mGhostObject) &&
 				 h > 0.05f)
 				e.remove<InWater>();
+#endif
 		});
+#endif
 #if 0
 	ecs.system<const EngineData, CharacterBase, CharacterBody>(
 		   "DisplayPlayerPos")
@@ -483,39 +545,14 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				  << "\n";
 		});
 #endif
-	ecs.system<const EngineData, const CharacterBase, ParentSlot>(
-		   "UpdatePhysics2")
-		.kind(flecs::OnUpdate)
-		.with<CharacterDisablePhysics>()
-		.each([](flecs::entity e, const EngineData &eng,
-			 const CharacterBase &ch, ParentSlot &slot) {
-			if (slot.parent_e.has<ObjectSlots>()) {
-				const ObjectSlots &slots =
-					slot.parent_e.get<ObjectSlots>();
-				if (slots.slots.find(slot.slot_name) ==
-				    slots.slots.end())
-					// invalid setting
-					e.remove<ParentSlot>();
-				if (slot.activated)
-					return;
-				Ogre::SceneNode *slot_base =
-					slots.slots.at(slot.slot_name).second;
-				Ogre::Vector3 position =
-					slot_base->_getDerivedPosition();
-				Ogre::Quaternion orientation =
-					slot_base->_getDerivedOrientation();
-				ch.mBodyNode->_setDerivedPosition(position);
-				ch.mBodyNode->_setDerivedOrientation(
-					orientation);
-				slot.activated = true;
-			}
-		});
+#if 0
 	ecs.system<const EngineData, const CharacterBody>("UpdatePhysics")
 		.kind(flecs::OnUpdate)
 		.with<CharacterUpdatePhysicsState>()
 		.write<CharacterUpdatePhysicsState>()
 		.each([](flecs::entity e, const EngineData &eng,
 			 const CharacterBody &body) {
+#if 0
 			if (e.has<CharacterDisablePhysics>()) {
 				eng.mWorld->getBtWorld()->removeAction(
 					body.mController);
@@ -523,8 +560,10 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				eng.mWorld->getBtWorld()->addAction(
 					body.mController);
 			}
+#endif
 			e.remove<CharacterUpdatePhysicsState>();
 		});
+#endif
 }

 void CharacterModule::updateCameraGoal(Camera &camera, Ogre::Real deltaYaw,
@@ -726,4 +765,4 @@ CharacterAIModule::CharacterAIModule(flecs::world &ecs)
 			}
 		});
 }
-}
+}