fixed crash when deleting navigation agents not in a zone; cleanup

nem0 · Nov 8, 2024 · 71c7d10 · 71c7d10
1 parent a0ce055
commit 71c7d10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 128 deletions.
diff --git a/src/animation/animation_module.cpp b/src/animation/animation_module.cpp
@@ -600,8 +600,8 @@ struct AnimationModuleImpl final : AnimationModule {
 		m_render_module->unlockPose(entity, true);
 	}
 
-	void updateAnimator(Animator& animator, float time_delta)
-	{
+	void updateAnimator(Animator& animator, float time_delta) {
+		PROFILE_FUNCTION();
 		if (!animator.resource || !animator.resource->isReady()) return;
 		if (!animator.ctx) {
 			animator.ctx = animator.resource->createRuntime(animator.default_set);

diff --git a/src/engine/engine.def b/src/engine/engine.def
diff --git a/src/navigation/navigation_module.cpp b/src/navigation/navigation_module.cpp
@@ -367,7 +367,10 @@ struct NavigationModuleImpl final : NavigationModule
 
 	void update(RecastZone& zone, float time_delta) {
 		if (!zone.crowd) return;
-		zone.crowd->update(time_delta, nullptr);
+		{
+			PROFILE_BLOCK("dtCrowd::update");
+			zone.crowd->update(time_delta, nullptr);
+		}
 
 		for (auto& agent : m_agents) {
 			if (agent.agent < 0) continue;
@@ -982,7 +985,7 @@ struct NavigationModuleImpl final : NavigationModule
 		ASSERT(!zone.crowd);
 
 		zone.crowd = dtAllocCrowd();
-		if (!zone.crowd->init(1000, 4.0f, zone.navmesh)) {
+		if (!zone.crowd->init(2000, 4.0f, zone.navmesh)) {
 			dtFreeCrowd(zone.crowd);
 			zone.crowd = nullptr;
 			return false;
@@ -1484,8 +1487,8 @@ struct NavigationModuleImpl final : NavigationModule
 		if (agent.zone.isValid()) {
 			RecastZone& zone = m_zones[(EntityRef)agent.zone];
 			if (zone.crowd && agent.agent >= 0) zone.crowd->removeAgent(agent.agent);
-			m_agents.erase(iter);
 		}
+		m_agents.erase(iter);
 		m_world.onComponentDestroyed(entity, NAVMESH_AGENT_TYPE, this);
 	}