less aggressive fix that also improves worst-case performance by delaying see rays by one frame instead

Author: Causeless

Source/Managers/MovableMan.cpp

@@ -12,7 +12,6 @@
 #include "Controller.h"
 #include "AtomGroup.h"
 #include "Actor.h"
-#include "HeldDevice.h"
 #include "ADoor.h"
 #include "Atom.h"
 #include "Scene.h"
@@ -1314,6 +1313,9 @@ void MovableMan::Update() {
 		g_SceneMan.GetScene()->BlockUntilAllPathingRequestsComplete();
 	}
 
+	// Finish our Seeing rays from last frame
+	m_ActorsSeeFuture.wait();
+
 	// Prior to controller/AI update, execute lua callbacks
 	g_LuaMan.ExecuteLuaScriptCallbacks();
 
@@ -1395,18 +1397,6 @@ void MovableMan::Update() {
 	g_PerformanceMan.StopPerformanceMeasurement(PerformanceMan::ScriptsUpdate);
 
 	{
-		auto actorsSeeFuture = g_ThreadMan.GetPriorityThreadPool().parallelize_loop(m_Actors.size(),
-		                                                                            [&](int start, int end) {
-			                                                                            ZoneScopedN("Actors See");
-			                                                                            for (int i = start; i < end; ++i) {
-																							m_Actors[i]->CastSeeRays();
-			                                                                            }
-		                                                                            });
-
-		// TODO- right now RemoveActor just removes to actor directly (instead of setting it disabled and delaying the actual remoal), meaning that actorsSeeFuture must be finished immediately
-		// This isn't ideal, as we'd prefer to be able to run the actor/items/particle update in parallel
-		actorsSeeFuture.wait();
-
 		{
 			ZoneScopedN("Actors Update");
 
@@ -1478,9 +1468,6 @@ void MovableMan::Update() {
 				particle->PostUpdate();
 			}
 		}
-		
-		// See above TODO - this is only commented out because of how RemoveActor currently works
-		//actorsSeeFuture.wait();
 	} // namespace RTE
 
 	//////////////////////////////////////////////////////////////////////
@@ -1680,6 +1667,15 @@ void MovableMan::Update() {
 		}
 	}
 
+	// Run seeing rays for all actors
+	m_ActorsSeeFuture = g_ThreadMan.GetPriorityThreadPool().parallelize_loop(m_Actors.size(),
+	                                                                         [&](int start, int end) {
+		                                                                         ZoneScopedN("Actors See");
+		                                                                         for (int i = start; i < end; ++i) {
+			                                                                         m_Actors[i]->CastSeeRays();
+		                                                                         }
+	                                                                         });
+
 	// We've finished stuff that can interact with lua script, so it's the ideal time to start a gc run
 	g_LuaMan.StartAsyncGarbageCollection();
 

Source/Managers/MovableMan.h

@@ -9,6 +9,8 @@
 #include "Singleton.h"
 #include "Activity.h"
 
+#include "BS_thread_pool.hpp"
+
 #include <mutex>
 #include <map>
 #include <future>
@@ -596,6 +598,9 @@ namespace RTE {
 		// Async to draw MOIDs while rendering
 		std::future<void> m_DrawMOIDsTask;
 
+		// Async to have actors see in parallel
+		BS::multi_future<void> m_ActorsSeeFuture;
+
 		// Roster of each team's actors, sorted by their X positions in the scene. Actors not owned here
 		std::list<Actor*> m_ActorRoster[Activity::MaxTeamCount];
 		// Whether to draw HUD lines between the actors of a specific team