Merge branch 'thread-pooling' of https://github.com/cortex-command-co…

…mmunity/Cortex-Command-Community-Project-Source into thread-pooling

Activities/GibEditor.cpp

@@ -511,7 +511,7 @@ void GibEditor::Update()
                     std::list<MovableObject *> *pEditedGibList = m_pEditorGUI->GetPlacedGibs();
                     MovableObject *pGibCopy = 0;
 
-                    for (std::list<Gib>::iterator gItr = pLoadedGibList->begin(); gItr != pLoadedGibList->end(); ++gItr)
+                    for (auto gItr = pLoadedGibList->begin(); gItr != pLoadedGibList->end(); ++gItr)
                     {
                         pGibCopy = dynamic_cast<MovableObject *>((*gItr).GetParticlePreset()->Clone());
                         if (pGibCopy)

Entities/ACDropShip.cpp

@@ -18,6 +18,8 @@
 #include "AEmitter.h"
 #include "PresetMan.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 ConcreteClassInfo(ACDropShip, ACraft, 10);
@@ -272,6 +274,8 @@ MOID ACDropShip::DetectObstacle(float distance)
 
 void ACDropShip::PreControllerUpdate()
 {
+    ZoneScoped;
+
 	ACraft::PreControllerUpdate();
 
     // TODO: Improve and make optional thrusters more robust!

Entities/ACrab.cpp

@@ -31,6 +31,8 @@
 #include "GUI.h"
 #include "AllegroBitmap.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 ConcreteClassInfo(ACrab, Actor, 20);
@@ -997,6 +999,8 @@ void ACrab::OnNewMovePath()
 
 void ACrab::PreControllerUpdate()
 {
+    ZoneScoped;
+
     Actor::PreControllerUpdate();
 
     float deltaTime = g_TimerMan.GetDeltaTimeSecs();
@@ -1383,6 +1387,8 @@ void ACrab::PreControllerUpdate()
 
 void ACrab::Update() 
 {
+    ZoneScoped;
+
     Actor::Update();
 
     ////////////////////////////////////

Entities/ADoor.cpp

@@ -6,6 +6,8 @@
 #include "PresetMan.h"
 #include "SettingsMan.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 	ConcreteClassInfo(ADoor, Actor, 20);
@@ -379,6 +381,8 @@ namespace RTE {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void ADoor::Update() {
+		ZoneScoped;
+
 		if (m_Door) {
 			if (m_DoorState != STOPPED && m_Status != Actor::Status::INACTIVE && m_SensorTimer.IsPastSimMS(m_SensorInterval)) { 
 				UpdateSensors(); 

Entities/AEmitter.cpp

@@ -591,6 +591,17 @@ void AEmitter::Update()
 			m_WasEmitting = false;
 		}
 	}
+
+    // Set the screen flash effect to draw at the final post processing stage
+    if (m_EmitEnabled && (!m_FlashOnlyOnBurst || m_BurstTriggered) && m_pFlash && m_pFlash->GetScreenEffect()) {
+        // Fudge the glow pos forward a bit so it aligns nicely with the flash
+        Vector emitPos(m_pFlash->GetScreenEffect()->w * 0.3F * m_FlashScale, 0);
+        emitPos.RadRotate(m_HFlipped ? c_PI + m_Rotation.GetRadAngle() - m_EmitAngle.GetRadAngle() : m_Rotation.GetRadAngle() + m_EmitAngle.GetRadAngle());
+        emitPos = m_Pos + RotateOffset(m_EmissionOffset) + emitPos;
+        if (m_EffectAlwaysShows || !g_SceneMan.ObscuredPoint(emitPos)) {
+            g_PostProcessMan.RegisterPostEffect(emitPos, m_pFlash->GetScreenEffect(), m_pFlash->GetScreenEffectHash(), RandomNum(m_pFlash->GetEffectStopStrength(), m_pFlash->GetEffectStartStrength()) * std::clamp(m_FlashScale, 0.0F, 1.0F), m_pFlash->GetEffectRotAngle());
+        }
+    }
 }
 
 
@@ -616,17 +627,6 @@ void AEmitter::Draw(BITMAP *pTargetBitmap,
     if (m_pFlash && m_pFlash->IsDrawnAfterParent() &&
         !onlyPhysical && mode == g_DrawColor && m_EmitEnabled && (!m_FlashOnlyOnBurst || m_BurstTriggered))
         m_pFlash->Draw(pTargetBitmap, targetPos, mode, onlyPhysical);
-
-	// Set the screen flash effect to draw at the final post processing stage
-	if (m_EmitEnabled && (!m_FlashOnlyOnBurst || m_BurstTriggered) && m_pFlash && m_pFlash->GetScreenEffect() && mode == g_DrawColor && !onlyPhysical) {
-		// Fudge the glow pos forward a bit so it aligns nicely with the flash
-		Vector emitPos(m_pFlash->GetScreenEffect()->w * 0.3F * m_FlashScale, 0);
-		emitPos.RadRotate(m_HFlipped ? c_PI + m_Rotation.GetRadAngle() - m_EmitAngle.GetRadAngle() : m_Rotation.GetRadAngle() + m_EmitAngle.GetRadAngle());
-		emitPos = m_Pos + RotateOffset(m_EmissionOffset) + emitPos;
-		if (!g_SceneMan.ObscuredPoint(emitPos)) {
-			g_PostProcessMan.RegisterPostEffect(emitPos, m_pFlash->GetScreenEffect(), m_pFlash->GetScreenEffectHash(), RandomNum(m_pFlash->GetEffectStopStrength(), m_pFlash->GetEffectStartStrength()) * std::clamp(m_FlashScale, 0.0F, 1.0F), m_pFlash->GetEffectRotAngle());
-		}
-	}
 }
 
 } // namespace RTE

Entities/AHuman.cpp

@@ -30,6 +30,8 @@
 #include "GUI.h"
 #include "AllegroBitmap.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 ConcreteClassInfo(AHuman, Actor, 20);
@@ -1710,6 +1712,8 @@ void AHuman::UpdateWalkAngle(AHuman::Layer whichLayer) {
 
 void AHuman::PreControllerUpdate()
 {
+	ZoneScoped;
+
     Actor::PreControllerUpdate();
 
 	float deltaTime = g_TimerMan.GetDeltaTimeSecs();
@@ -2142,7 +2146,7 @@ void AHuman::PreControllerUpdate()
 		reach += m_pFGArm ? m_pFGArm->GetMaxLength() : m_pBGArm->GetMaxLength();
 		reachPoint = m_pFGArm ? m_pFGArm->GetJointPos() : m_pBGArm->GetJointPos();
 
-		MOID itemMOID = g_SceneMan.CastMORay(reachPoint, Vector(reach * RandomNum(0.5F, 1.0F) * GetFlipFactor(), 0).RadRotate(m_pItemInReach ? adjustedAimAngle : RandomNum(-(c_HalfPI + c_EighthPI), m_AimAngle * 0.75F + c_EighthPI) * GetFlipFactor()), m_MOID, Activity::NoTeam, g_MaterialGrass, true, 3);
+		MOID itemMOID = g_SceneMan.CastMORay(reachPoint, Vector(reach * RandomNum(0.5F, 1.0F) * GetFlipFactor(), 0).RadRotate(m_pItemInReach ? adjustedAimAngle : RandomNum(-(c_HalfPI + c_EighthPI), m_AimAngle * 0.75F + c_EighthPI) * GetFlipFactor()), m_MOID, m_Team, g_MaterialGrass, true, 3);
 
 		if (MovableObject *foundMO = g_MovableMan.GetMOFromID(itemMOID)) {
 			if (HeldDevice *foundDevice = dynamic_cast<HeldDevice *>(foundMO->GetRootParent())) {
@@ -2499,6 +2503,8 @@ void AHuman::PreControllerUpdate()
 
 void AHuman::Update()
 {
+	ZoneScoped;
+
     float rot = m_Rotation.GetRadAngle(); // eugh, for backwards compat to be the same behaviour as with multithreaded AI
 
     Actor::Update();

Entities/Actor.cpp

@@ -37,6 +37,8 @@
 #include "GUI.h"
 #include "AllegroBitmap.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 ConcreteClassInfo(Actor, MOSRotating, 20);
@@ -1309,6 +1311,8 @@ void Actor::PreControllerUpdate() {
 
 void Actor::Update()
 {
+    ZoneScoped;
+
     /////////////////////////////////
     // Hit Body update and handling
     MOSRotating::Update();

Entities/HDFirearm.cpp

@@ -1115,6 +1115,14 @@ void HDFirearm::Update()
     }
 
     m_FiredLastFrame = m_FireFrame;
+
+    // Set the screen flash effect to draw at the final post processing stage
+    if (m_FireFrame && m_pFlash && m_pFlash->GetScreenEffect()) {
+        Vector muzzlePos = m_Pos + RotateOffset(m_MuzzleOff + Vector(m_pFlash->GetSpriteWidth() * 0.3F, 0));
+        if (m_EffectAlwaysShows || !g_SceneMan.ObscuredPoint(muzzlePos)) {
+            g_PostProcessMan.RegisterPostEffect(muzzlePos, m_pFlash->GetScreenEffect(), m_pFlash->GetScreenEffectHash(), RandomNum(m_pFlash->GetEffectStopStrength(), m_pFlash->GetEffectStartStrength()), m_pFlash->GetEffectRotAngle());
+        }
+    }
 }
 
 
@@ -1144,14 +1152,6 @@ void HDFirearm::Draw(BITMAP *pTargetBitmap, const Vector &targetPos, DrawMode mo
     if (m_pFlash && m_FireFrame && m_pFlash->IsDrawnAfterParent() && mode == g_DrawColor && !onlyPhysical) {
         m_pFlash->Draw(pTargetBitmap, targetPos, mode, onlyPhysical);
     }
-
-    // Set the screen flash effect to draw at the final post processing stage
-    if (m_FireFrame && m_pFlash && m_pFlash->GetScreenEffect() && mode == g_DrawColor && !onlyPhysical) {
-		Vector muzzlePos = m_Pos + RotateOffset(m_MuzzleOff + Vector(m_pFlash->GetSpriteWidth() * 0.3F, 0));
-		if (!g_SceneMan.ObscuredPoint(muzzlePos)) {
-			g_PostProcessMan.RegisterPostEffect(muzzlePos, m_pFlash->GetScreenEffect(), m_pFlash->GetScreenEffectHash(), RandomNum(m_pFlash->GetEffectStopStrength(), m_pFlash->GetEffectStartStrength()), m_pFlash->GetEffectRotAngle());
-		}
-    }
 }
 
 

Entities/MOPixel.cpp

@@ -221,6 +221,10 @@ namespace RTE {
 				}
 			}
 		}
+
+		if (m_pScreenEffect) {
+			SetPostScreenEffectToDraw();
+		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -261,10 +265,6 @@ namespace RTE {
 		}
 
 		g_SceneMan.RegisterDrawing(targetBitmap, mode == g_DrawNoMOID ? g_NoMOID : m_MOID, pixelPos, 1.0F);
-
-		if (mode == g_DrawColor && m_pScreenEffect && !onlyPhysical) {
-			SetPostScreenEffectToDraw();
-		}
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Entities/MOSParticle.cpp

@@ -147,6 +147,8 @@ namespace RTE {
 
 			if (m_Frame >= m_FrameCount) { m_Frame = m_FrameCount - 1; }
 		}
+
+		if (m_pScreenEffect) { SetPostScreenEffectToDraw(); }
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -221,8 +223,6 @@ namespace RTE {
 
 			g_SceneMan.RegisterDrawing(targetBitmap, mode == g_DrawNoMOID ? g_NoMOID : m_MOID, spriteX, spriteY, spriteX + m_aSprite[m_Frame]->w, spriteY + m_aSprite[m_Frame]->h);
 		}
-
-		if (m_pScreenEffect && mode == g_DrawColor && !onlyPhysical) { SetPostScreenEffectToDraw(); }
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Entities/MOSRotating.cpp

@@ -326,7 +326,7 @@ int MOSRotating::ReadProperty(const std::string_view &propName, Reader &reader)
 	MatchProperty("SpecialBehaviour_ClearAllAttachables", {
 		// This special property is used to make Attachables work with our limited serialization system, when saving the game. Note that we discard the property value here, because all that matters is whether or not we have the property.
 		reader.ReadPropValue();
-		for (std::list<Attachable *>::iterator attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
+		for (auto attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
 			Attachable *attachable = *attachableIterator;
 			++attachableIterator;
 			delete RemoveAttachable(attachable);
@@ -404,7 +404,7 @@ int MOSRotating::Save(Writer &writer) const
         writer << (*aItr);
     }
 */
-    for (std::list<Gib>::const_iterator gItr = m_Gibs.begin(); gItr != m_Gibs.end(); ++gItr)
+    for (auto gItr = m_Gibs.begin(); gItr != m_Gibs.end(); ++gItr)
     {
         writer.NewProperty("AddGib");
         writer << (*gItr);
@@ -582,11 +582,11 @@ float MOSRotating::RemoveWounds(int numberOfWoundsToRemove, bool includePositive
 }
 
 void MOSRotating::DestroyScriptState() {
-    for (std::list<AEmitter *>::const_iterator itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) {
+    for (auto itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) {
         (*itr)->DestroyScriptState();
     }
 
-    for (std::list<Attachable *>::const_iterator itr = m_Attachables.begin(); itr != m_Attachables.end(); ++itr) {
+    for (auto itr = m_Attachables.begin(); itr != m_Attachables.end(); ++itr) {
         (*itr)->DestroyScriptState();
     }
 
@@ -605,11 +605,11 @@ void MOSRotating::Destroy(bool notInherited)
     delete m_pAtomGroup;
     delete m_pDeepGroup;
 
-    for (std::list<AEmitter *>::iterator itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) { 
+    for (auto itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) { 
         delete (*itr); 
     }
 
-    for (std::list<Attachable *>::iterator aItr = m_Attachables.begin(); aItr != m_Attachables.end(); ++aItr) {
+    for (auto aItr = m_Attachables.begin(); aItr != m_Attachables.end(); ++aItr) {
         if (m_HardcodedAttachableUniqueIDsAndRemovers.find((*aItr)->GetUniqueID()) == m_HardcodedAttachableUniqueIDsAndRemovers.end()) {
             delete (*aItr);
         }
@@ -1261,10 +1261,10 @@ void MOSRotating::ResetAllTimers()
 {
     MovableObject::ResetAllTimers();
 
-    for (std::list<AEmitter *>::iterator emitter = m_Wounds.begin(); emitter != m_Wounds.end(); ++emitter)
+    for (auto emitter = m_Wounds.begin(); emitter != m_Wounds.end(); ++emitter)
         (*emitter)->ResetAllTimers();
 
-    for (std::list<Attachable *>::iterator attachable = m_Attachables.begin(); attachable != m_Attachables.end(); ++attachable)
+    for (auto attachable = m_Attachables.begin(); attachable != m_Attachables.end(); ++attachable)
         (*attachable)->ResetAllTimers();
 }
 
@@ -1543,7 +1543,7 @@ void MOSRotating::PostTravel()
 
 
     Attachable *attachable;
-    for (std::list<Attachable *>::iterator attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
+    for (auto attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
         attachable = *attachableIterator;
         RTEAssert(attachable, "Broken Attachable in PostTravel!");
         ++attachableIterator;
@@ -1614,11 +1614,11 @@ void MOSRotating::Update() {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 void MOSRotating::PostUpdate() {
-    for (std::list<AEmitter *>::const_iterator itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) {
+    for (auto itr = m_Wounds.begin(); itr != m_Wounds.end(); ++itr) {
         (*itr)->PostUpdate();
     }
 
-    for (std::list<Attachable *>::const_iterator itr = m_Attachables.begin(); itr != m_Attachables.end(); ++itr) {
+    for (auto itr = m_Attachables.begin(); itr != m_Attachables.end(); ++itr) {
         (*itr)->PostUpdate();
     }
 
@@ -1774,7 +1774,7 @@ void MOSRotating::RemoveAndDeleteAttachable(Attachable *attachable) {
 
 void MOSRotating::RemoveOrDestroyAllAttachables(bool destroy) {
     Attachable *attachable;
-    for (std::list<Attachable *>::iterator attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
+    for (auto attachableIterator = m_Attachables.begin(); attachableIterator != m_Attachables.end(); ) {
         attachable = *attachableIterator;
         RTEAssert(attachable, "Broken Attachable!");
         ++attachableIterator;

Entities/Scene.cpp

@@ -44,6 +44,8 @@
 #include "Magazine.h"
 #include "ThrownDevice.h"
 
+#include "tracy/Tracy.hpp"
+
 namespace RTE {
 
 ConcreteClassInfo(Scene, Entity, 0);
@@ -2967,6 +2969,8 @@ void Scene::BlockUntilAllPathingRequestsComplete() {
 
 void Scene::UpdatePathFinding()
 {
+    ZoneScoped;
+
     constexpr int nodeUpdatesPerCall = 100;
     constexpr int maxUnupdatedMaterialAreas = 1000;
 
@@ -3099,6 +3103,8 @@ void Scene::Unlock()
 
 void Scene::Update()
 {
+    ZoneScoped;
+
     m_PathfindingUpdated = false;
 
 	if (g_SettingsMan.BlipOnRevealUnseen())