Intagrated Tracy, debugged animations

src/gamedata/CharacterAnimationModule.cpp

@@ -8,6 +8,8 @@
 #include "TerrainModule.h"
 #include "WaterModule.h"
 #include "world-build.h"
+#include "AnimationSystem.h"
+#include <tracy/Tracy.hpp>
 namespace ECS
 {
 CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
@@ -21,7 +23,8 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 	ecs.system<const CharacterBase, AnimationControl>("HandleAnimations")
 		.kind(flecs::OnUpdate)
 		.each([this](flecs::entity e, const CharacterBase &ch,
-			     AnimationControl &anim) {
+                 AnimationControl &anim) {
+            ZoneScopedN("HandleAnimations");
             if (!anim.configured) {
 				int i, j;
 				e.set<EventData>({});
@@ -32,19 +35,22 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
                 const Ogre::AnimationStateMap &animMap =
                     animStateSet->getAnimationStates();
                 anim.mAnimationSystem =
-                    new AnimationSystem(false);
+                    new AnimationSystem::AnimationSystem(
+                        false);
                 ch.mBodyEnt->getSkeleton()
                     ->getBone("Root")
                     ->removeAllChildren();
                 for (auto it = animMap.begin();
                      it != animMap.end(); it++) {
-					Animation *animation = new Animation(
-                        ch.mBodyEnt->getSkeleton(),
-                        it->second,
-                        ch.mBodyEnt->getSkeleton()
-                            ->getAnimation(
-                                it->first),
-						e);
+                    AnimationSystem::Animation *animation =
+                        new AnimationSystem::Animation(
+                            ch.mBodyEnt
+                                ->getSkeleton(),
+                            it->second,
+                            ch.mBodyEnt
+                                ->getSkeleton()
+                                ->getAnimation(
+                                    it->first));
 #ifdef VDEBUG
 					std::cout
 						<< "animation: " << animNames[i]
@@ -93,18 +99,18 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 								->end()
 								->state("swimming-edge-climb")
 									->animation("swimming-edge-climb")
-									->trigger(e, "end_of_climb", 0.99f, "animation:swimming-edge-climb:end")
+                                    ->trigger_entity(e, "end_of_climb", 0.99f, "animation:swimming-edge-climb:end")
 								->end()
 								->state("hanging-climb")
 									->animation("hanging-climb")
-									->trigger(e, "end_of_climb2", 0.99f, "animation:hanging-climb:end")
+                                    ->trigger_entity(e, "end_of_climb2", 0.99f, "animation:hanging-climb:end")
 								->end()
 								->state("idle")
 									->animation("idle-act")
 								->end()
 								->state("pass-character")
 									->animation("pass-character")
-									->trigger(e, "pass-character", 0.99f, "animation:pass-character:end")
+                                    ->trigger_entity(e, "pass-character", 0.99f, "animation:pass-character:end")
 								->end()
 								->state("character-talk")
 									->animation("character-talk")
@@ -127,10 +133,13 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 				/* clang-format on */
 
 				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>("main")
+                    ->get<AnimationSystem::
+                              AnimationNodeStateMachine>(
+                        "main")
 					->setAnimation("locomotion", true);
 				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
+                    ->get<AnimationSystem::
+                              AnimationNodeStateMachine>(
 						"locomotion-state")
 					->setAnimation("idle", true);
 				anim.configured = true;
@@ -152,69 +161,21 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 			// ch.mBoneMotion = Ogre::Vector3::ZERO;
 			if (!anim.mAnimationSystem)
 				return;
-#if 0
-            ch.mBodyEnt->getSkeleton()->getBone("Root")->reset();
-            ch.mBodyEnt->getSkeleton()->getBone("Root")->setPosition(
-                Ogre::Vector3::ZERO);
-#endif
+            ZoneScopedN("HandleAnimations1");
             bool result = anim.mAnimationSystem->addTime(delta);
             Ogre::Vector3 rootMotion =
                 anim.mAnimationSystem->getRootMotionDelta();
             ch.mBonePrevMotion = ch.mBoneMotion;
             ch.mBoneMotion = rootMotion;
-            ch.mBodyEnt->_updateAnimation();
+#if 0
+            {
+                ZoneScopedN("Ogre::Entity::_updateAnimation");
+                ch.mBodyEnt->_updateAnimation();
+            }
             ch.mBodyEnt->getSkeleton()->getBone("Root")->setPosition(
                 Ogre::Vector3::ZERO);
-#if 0
-            Ogre::Vector3 deltaMotion;
-            ch.mBodyEnt->_updateAnimation();
-            std::cout << "motion: " << ch.mBoneMotion << " "
-                  << rootMotion << " " << ch.mBonePrevMotion
-                  << std::endl;
-            rootMotion = ch.mBodyEnt->getSkeleton()
-                         ->getBone("Root")
-                         ->getPosition();
-            if (rootMotion.squaredLength() <
-                ch.mBoneMotion.squaredLength())
-                deltaMotion = rootMotion;
-            else
-                deltaMotion = rootMotion - ch.mBoneMotion;
-            ch.mBonePrevMotion = ch.mBoneMotion;
-            ch.mBoneMotion = deltaMotion;
 #endif
         // The value we get is interpolated value. When result is true it is new step
-#if 0
-			Ogre::Vector3 offset = ch.mRootBone->getPosition();
-			ch.mBoneMotion = static_cast<RootMotionListener *>(
-						 anim.mListener)
-						 ->getDeltaMotion();
-			ch.mRootBone->setPosition(Ogre::Vector3::ZERO);
-			Ogre::Vector3 d = offset - ch.mBonePrevMotion;
-			ch.mBonePrevMotion = offset;
-
-			std::cout << "length: " << d.length() << std::endl;
-			if (d.squaredLength() > 0.02f * 0.02f)
-				d = offset;
-			if (d.squaredLength() > 0.02f * 0.02f)
-				d = Ogre::Vector3::ZERO;
-			std::cout << "length2: " << d.length() << std::endl;
-			OgreAssert(d.length() < 0.5f, "bad offset");
-			ch.mBoneMotion = d;
-#endif
-#if 0
-			if (result) {
-				if (d.squaredLength() > 0.0f)
-					ch.mBoneMotion =
-						ch.mRootBone->getPosition() -
-						ch.mBoneMotion;
-				else
-					ch.mBoneMotion =
-						ch.mRootBone->getPosition();
-			} else {
-				ch.mBoneMotion = ch.mRootBone->getPosition() -
-						 ch.mBoneMotion;
-			}
-#endif
 
 #undef VDEBUG
 #ifdef VDEBUG
@@ -224,10 +185,6 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 				  << " result: " << result << std::endl;
 #endif
 #undef VDEBUG
-#if 0
-			// ch.mRootBone->setPosition(Ogre::Vector3::ZERO);
-			ch.mBonePrevMotion = offset;
-#endif
 		});
 	ecs.system<const EngineData, CharacterBase, CharacterVelocity>(
 		   "HandleRootMotionVelocity")
@@ -240,7 +197,8 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 				return;
 			if (!ch.mBodyNode)
 				return;
-			Ogre::Quaternion rot = ch.mBodyNode->getOrientation();
+            ZoneScopedN("HandleRootMotionVelocity");
+            Ogre::Quaternion rot = ch.mBodyNode->getOrientation();
 			Ogre::Vector3 pos = ch.mBodyNode->getPosition();
 			Ogre::Vector3 boneMotion = ch.mBoneMotion;
 			v.velocity = Ogre::Vector3::ZERO;
@@ -273,33 +231,9 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 #if 0
 			v.velocity.y = 0.0f;
 #endif
+            OgreAssert(v.velocity.squaredLength() < 1000.0f,
+                   "Bad velocity setting");
 		});
-#if 0
-	ecs.system<const EngineData, const AnimationControl,
-		   const CharacterBase, CharacterVelocity>("HandleSwimming")
-		.kind(flecs::OnUpdate)
-		.with<TerrainReady>()
-		.with<WaterReady>()
-		.with<InWater>()
-		.with<CharacterBuoyancy>()
-		.without<CharacterDisablePhysics>()
-		.without<CharacterInActuator>()
-		.each([this](flecs::entity e, const EngineData &eng,
-			     const AnimationControl &anim,
-			     const CharacterBase &ch, CharacterVelocity &gr) {
-			if (anim.mAnimationSystem
-				    ->get<AnimationNodeStateMachine>(
-					    "locomotion-state")
-				    ->getCurrentState() == "swimming") {
-				float h = Ogre::Math::Clamp(
-					0.0f - ch.mBodyNode->getPosition().y,
-					0.0f, 2000.0f);
-				if (h > 0.05 && h < 2.0f)
-					gr.gvelocity.y += 0.1f * (h + 1.0f) *
-							  h * eng.delta;
-			}
-		});
-#endif
 	ecs.system<const EngineData, CharacterBase, AnimationControl,
 		   CharacterVelocity>("HandleRootMotion")
 		.kind(flecs::OnUpdate)
@@ -328,19 +262,28 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 				return;
             if (!anim.mAnimationSystem)
                 return;
-			AnimationNodeStateMachine *state_machine =
-				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
-						"locomotion-state");
+            ZoneScopedNC("HandleNPCAnimations", 0xFF2020);
+            AnimationSystem::AnimationNodeStateMachine
+                *state_machine = anim.mAnimationSystem->get<
+                    AnimationSystem::
+                        AnimationNodeStateMachine>(
+                    "locomotion-state");
 			Ogre::String current_state =
 				state_machine->getCurrentState();
 			Ogre::String next_state = "idle";
 			if (current_state != "treading_water" &&
-			    ch.is_submerged)
+                e.has<InWater>())
 				next_state = "treading_water";
-			if (current_state != "idle" && !ch.is_submerged)
+            if (current_state != "idle" && !e.has<InWater>())
 				next_state = "idle";
 			state_machine->setAnimation(next_state);
+            {
+                ZoneScoped;
+                ZoneTextF("animation: next_state: %s %d %d",
+                      next_state.c_str(),
+                      (int)ch.is_submerged,
+                      (int)e.has<InWater>());
+            }
 		});
 	ecs.system<const CharacterBase, const CharacterInActuator,
 		   AnimationControl>("HandlePlayerAnimationsActuator")
@@ -349,15 +292,18 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 		.each([](flecs::entity e, const CharacterBase &ch,
 			 const CharacterInActuator &inact,
 			 AnimationControl &anim) {
-			if (!anim.configured)
+            ZoneScopedN("HandlePlayerAnimationsActuator");
+            if (!anim.configured)
 				return;
-			AnimationNodeStateMachine *main_sm =
+            AnimationSystem::AnimationNodeStateMachine *main_sm =
 				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
+                    ->get<AnimationSystem::
+                              AnimationNodeStateMachine>(
 						"main");
-			AnimationNodeStateMachine *actuator_sm =
+            AnimationSystem::AnimationNodeStateMachine *actuator_sm =
 				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
+                    ->get<AnimationSystem::
+                              AnimationNodeStateMachine>(
 						"actuator-state");
 			Ogre::String current_state = main_sm->getCurrentState();
 			if (current_state != "actuator")
@@ -372,13 +318,15 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
         .without<CharacterControlDisable>()
         .each([](flecs::entity e, const CharacterBase &ch,
 			 AnimationControl &anim) {
-			if (!anim.configured)
+            ZoneScopedN("HandlePlayerAnimationsNoActuator");
+            if (!anim.configured)
 				return;
 			if (!anim.mAnimationSystem)
 				return;
-			AnimationNodeStateMachine *main_sm =
+            AnimationSystem::AnimationNodeStateMachine *main_sm =
 				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
+                    ->get<AnimationSystem::
+                              AnimationNodeStateMachine>(
 						"main");
 			Ogre::String current_state = main_sm->getCurrentState();
 			if (current_state != "locomotion")
@@ -395,10 +343,12 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 			 const CharacterBase &ch, AnimationControl &anim) {
 			if (!anim.configured)
 				return;
-			AnimationNodeStateMachine *state_machine =
-				anim.mAnimationSystem
-					->get<AnimationNodeStateMachine>(
-						"locomotion-state");
+            ZoneScopedN("HandlePlayerAnimations");
+            AnimationSystem::AnimationNodeStateMachine
+                *state_machine = anim.mAnimationSystem->get<
+                    AnimationSystem::
+                        AnimationNodeStateMachine>(
+                    "locomotion-state");
 			Ogre::String current_state =
 				state_machine->getCurrentState();
 			bool controls_idle = input.motion.zeroLength();
@@ -474,6 +424,7 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 		.each([](flecs::entity e, const Input &input,
 			 const CharacterBase &ch, AnimationControl &anim,
 			 CharacterInActuator &act) {
+            ZoneScopedN("HandlePlayerAnimations2");
 			bool controls_idle = input.motion.zeroLength();
 			if (!controls_idle) {
 				std::cout << "motion.z: "
@@ -547,7 +498,8 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 		.kind(flecs::OnUpdate)
 		.with<Character>()
 		.each([](flecs::entity e, EventData &evt) {
-			for (auto ev : evt.events) {
+            ZoneScopedN("HandleEvents");
+            for (auto ev : evt.events) {
 				std::cout << "character event: " << ev.event
 					  << std::endl;
 				/* parse character events */
@@ -600,10 +552,11 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 				    true) {
 				const AnimationControl &control =
 					param_e->get().get<AnimationControl>();
-				AnimationNodeStateMachine *sm =
-					control.mAnimationSystem
-						->get<AnimationNodeStateMachine>(
-							param_node->get());
+                AnimationSystem::AnimationNodeStateMachine *sm =
+                    control.mAnimationSystem->get<
+                        AnimationSystem::
+                            AnimationNodeStateMachine>(
+                        param_node->get());
 				bool reset = false;
 				if (args.size() == 4) {
 					GameWorld::ValueParameter<bool>
@@ -622,6 +575,7 @@ CharacterAnimationModule::CharacterAnimationModule(flecs::world &ecs)
 		}
 	};
 	ECS::get_mut<GameWorld>().add_command<AnimationSetCommand>(
-		"set_animation_state");
+        "set_animation_state");
 }
+
 }