Merge branch 'development' into browncoat-mission

Author: Causeless

Data/Browncoats.rte/Activities/RefineryAssaultFunctions.lua

@@ -27,7 +27,8 @@ function RefineryAssault:HandleMessage(message, object)
 		self.saveTable.introCinematicDone = true;
 
 		if self:GetFogOfWarEnabled() then
-			SceneMan:MakeAllUnseen(Vector(1, 1), self.humanTeam);
+			local fogResolution = 4;
+			SceneMan:MakeAllUnseen(Vector(fogResolution, fogResolution), self.humanTeam);
 		end
 
 		-- Shorthand to make debug skipping this actually matter

Source/Entities/ACrab.cpp

@@ -689,8 +689,9 @@ bool ACrab::IsWithinRange(Vector& point) const {
 }
 
 bool ACrab::Look(float FOVSpread, float range) {
-	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false)
+	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false) {
 		return false;
+	}
 
 	// Set the length of the look vector
 	float aimDistance = m_AimDistance + range;

Source/Entities/AHuman.cpp

@@ -1233,8 +1233,9 @@ bool AHuman::IsWithinRange(Vector& point) const {
 }
 
 bool AHuman::Look(float FOVSpread, float range) {
-	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false)
+	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false) {
 		return false;
+	}
 
 	// Set the length of the look vector
 	float aimDistance = m_AimDistance + range;

Source/Entities/Actor.cpp

@@ -570,8 +570,9 @@ Controller::InputMode Actor::SwapControllerModes(Controller::InputMode newMode,
 }
 
 bool Actor::Look(float FOVSpread, float range) {
-	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false)
+	if (!g_SceneMan.AnythingUnseen(m_Team) || m_CanRevealUnseen == false) {
 		return false;
+	}
 
 	// Use the 'eyes' on the 'head', if applicable
 	Vector aimPos = GetEyePos();
@@ -1089,13 +1090,10 @@ void Actor::Update() {
 	// Update the viewpoint to be at least what the position is
 	m_ViewPoint = m_Pos;
 
-	// "See" the location and surroundings of this actor on the unseen map
-	if (m_Status != Actor::INACTIVE)
-		Look(45 * m_Perceptiveness, g_FrameMan.GetPlayerScreenWidth() * 0.51 * m_Perceptiveness);
-
 	// Check if the MO we're following still exists, and if not, then clear the destination
-	if (m_pMOMoveTarget && !g_MovableMan.ValidMO(m_pMOMoveTarget))
-		m_pMOMoveTarget = 0;
+	if (m_pMOMoveTarget && !g_MovableMan.ValidMO(m_pMOMoveTarget)) {
+		m_pMOMoveTarget = nullptr;
+	}
 
 	///////////////////////////////////////////////////////////////////////////////
 	// Check for manual player-made progress made toward the set AI goal
@@ -1268,6 +1266,16 @@ void Actor::Update() {
 	}
 }
 
+void RTE::Actor::CastSeeRays() {
+	// "See" the location and surroundings of this actor on the unseen map
+	if (m_Status != Actor::INACTIVE) {
+		const int lookIterations = 6; // How many see rays to cast per frame
+		for (int i = 0; i < lookIterations; ++i) {
+			Look(45 * m_Perceptiveness, g_FrameMan.GetPlayerScreenWidth() * 0.51 * m_Perceptiveness);
+		}
+	}
+}
+
 void Actor::FullUpdate() {
 	PreControllerUpdate();
 	m_Controller.Update();

Source/Entities/Actor.h

@@ -664,6 +664,9 @@ namespace RTE {
 		/// Updates this MovableObject. Supposed to be done every frame.
 		void Update() override;
 
+		/// Cast see rays for this actor.
+		void CastSeeRays();
+
 		/// Updates the full state of this object in one call. (PreControllerUpdate(), Controller::Update(), and Update())
 		virtual void FullUpdate() override;
 

Source/Managers/MovableMan.cpp

@@ -1367,6 +1367,14 @@ 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();
+																						}
+																					});
+
 		{
 			ZoneScopedN("Actors Update");
 
@@ -1438,6 +1446,8 @@ void MovableMan::Update() {
 				particle->PostUpdate();
 			}
 		}
+
+		actorsSeeFuture.wait();
 	} // namespace RTE
 
 	//////////////////////////////////////////////////////////////////////