Support proper actuator animation

src/gamedata/CharacterModule.cpp

@@ -20,6 +20,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 	ecs.component<CharacterBody>();
 	ecs.component<CharacterDisablePhysics>();
 	ecs.component<CharacterUpdatePhysicsState>();
+	ecs.component<CharacterInActuator>();
 	ecs.system<EngineData, CharacterBase>("UpdateTimer")
 		.kind(flecs::OnUpdate)
 		.each([this](EngineData &eng, CharacterBase &ch) {
@@ -107,6 +108,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.with<WaterReady>()
 		.with<InWater>()
 		.without<CharacterDisablePhysics>()
+		.without<CharacterUpdatePhysicsState>()
 		.each([this](flecs::entity e, const EngineData &eng,
 			     const CharacterBase &ch, CharacterVelocity &gr) {
 			Ogre::Vector3 gravity(0, -9.8f, 0);
@@ -162,6 +164,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 		.kind(flecs::OnUpdate)
 		.with<Character>()
 		.with<Player>()
+		.without<CharacterInActuator>()
 		.each([](flecs::entity e, const Input &input,
 			 const Camera &camera, CharacterBase &ch) {
 			ch.mGoalDirection = Ogre::Vector3::ZERO;
@@ -225,14 +228,14 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			}
 		});
 	ecs.system<const EngineData, const CharacterLocation,
-		   const CharacterConf>("SetupCharacter")
+		   const CharacterConf, Body2Entity>("SetupCharacter")
 		.kind(flecs::OnUpdate)
 		.with<Character>()
 		.without<CharacterBase>()
 		.without<CharacterBody>()
 		.each([](flecs::entity e, const EngineData &eng,
 			 const CharacterLocation &loc,
-			 const CharacterConf &conf) {
+			 const CharacterConf &conf, Body2Entity &b2e) {
 			CharacterBase &ch = e.ensure<CharacterBase>();
 			CharacterBody &body = e.ensure<CharacterBody>();
 			AnimationControl &anim = e.ensure<AnimationControl>();
@@ -256,6 +259,7 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 			body.mGhostObject = nullptr;
 			body.mController = nullptr;
 			body.mGhostObject = new btPairCachingGhostObject();
+			b2e.entities[body.mGhostObject] = e;
 			body.mCollisionShape = new btCompoundShape(false);
 			body.mGhostObject->setCollisionShape(
 				body.mCollisionShape);
@@ -446,23 +450,23 @@ CharacterModule::CharacterModule(flecs::world &ecs)
 				  << "\n";
 		});
 #endif
-	ecs.system<const EngineData, const CharacterBase, CharacterSlot>(
+	ecs.system<const EngineData, const CharacterBase, ParentSlot>(
 		   "UpdatePhysics2")
 		.kind(flecs::OnUpdate)
 		.with<CharacterDisablePhysics>()
 		.each([](flecs::entity e, const EngineData &eng,
-			 const CharacterBase &ch, CharacterSlot &slot) {
-			if (slot.parent_e.has<VehicleSlots>()) {
-				const VehicleSlots &slots =
-					slot.parent_e.get<VehicleSlots>();
-				if (slots.seats.find(slot.slot_name) ==
-				    slots.seats.end())
+			 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<CharacterSlot>();
+					e.remove<ParentSlot>();
 				if (slot.activated)
 					return;
 				Ogre::SceneNode *slot_base =
-					slots.seats.at(slot.slot_name).second;
+					slots.slots.at(slot.slot_name).second;
 				Ogre::Vector3 position =
 					slot_base->_getDerivedPosition();
 				Ogre::Quaternion orientation =