Optimize AE animation update logic

Starkku · Starkku · commit 400ae4951d75 · 2025-11-09T14:56:32.000+02:00
diff --git a/src/Ext/Techno/Body.Update.cpp b/src/Ext/Techno/Body.Update.cpp
@@ -1910,7 +1910,10 @@ void TechnoExt::ExtData::UpdateAttachEffects()
 	}
 
 	if (altered)
+	{
 		this->RecalculateStatMultipliers();
+		this->UpdateAEAnimLogic();
+	}
 
 	if (markForRedraw)
 		pThis->MarkForRedraw();
@@ -1980,7 +1983,10 @@ void TechnoExt::ExtData::UpdateSelfOwnedAttachEffects()
 	const int count = AttachEffectClass::Attach(pThis, pThis->Owner, pThis, pThis, pTypeExt->AttachEffects);
 
 	if (altered && !count)
+	{
 		this->RecalculateStatMultipliers();
+		this->UpdateAEAnimLogic();
+	}
 }
 
 // Updates CumulativeAnimations AE's on techno.
@@ -2025,6 +2031,15 @@ void TechnoExt::ExtData::UpdateCumulativeAttachEffects(AttachEffectTypeClass* pA
 	}
 }
 
+// Update AttachEffect animation logic.
+void TechnoExt::ExtData::UpdateAEAnimLogic()
+{
+	for (auto const& attachEffect : this->AttachedEffects)
+	{
+		attachEffect->UpdateAnimLogic();
+	}
+}
+
 // Recalculates AttachEffect stat multipliers and other bonuses.
 void TechnoExt::ExtData::RecalculateStatMultipliers()
 {
diff --git a/src/Ext/Techno/Body.cpp b/src/Ext/Techno/Body.cpp
@@ -480,37 +480,31 @@ bool TechnoExt::IsTypeImmune(TechnoClass* pThis, TechnoClass* pSource)
 	return false;
 }
 
-/// <summary>
-/// Gets whether or not techno has listed AttachEffect types active on it
-/// </summary>
-/// <param name="attachEffectTypes">Attacheffect types.</param>
-/// <param name="requireAll">Whether or not to require all listed types to be present or if only one will satisfy the check.</param>
-/// <param name="ignoreSameSource">Ignore AttachEffects that come from set invoker and source.</param>
-/// <param name="pInvoker">Invoker Techno used for same source check.</param>
-/// <param name="pSource">Source AbstractClass instance used for same source check.</param>
-/// <returns>True if techno has active AttachEffects that satisfy the source, false if not.</returns>
+// Gets whether or not techno has listed AttachEffect types active on it
 bool TechnoExt::ExtData::HasAttachedEffects(std::vector<AttachEffectTypeClass*> const& attachEffectTypes, bool requireAll, bool ignoreSameSource,
-	TechnoClass* pInvoker, AbstractClass* pSource, std::vector<int> const* minCounts, std::vector<int> const* maxCounts) const
+	TechnoClass* pInvoker, AbstractClass* pSource, std::vector<int> const* minCounts, std::vector<int> const* maxCounts, bool requireAnims) const
 {
 	unsigned int foundCount = 0;
 	unsigned int typeCounter = 1;
 	const bool checkSource = ignoreSameSource && pInvoker && pSource;
 
-	for (auto const& type : attachEffectTypes)
+	for (auto const& pType : attachEffectTypes)
 	{
 		for (auto const& attachEffect : this->AttachedEffects)
 		{
-			if (attachEffect->GetType() == type && attachEffect->IsActive())
+			auto const pAttachedType = attachEffect->GetType();
+
+			if (pAttachedType == pType && attachEffect->IsActive() && (!requireAnims || !pAttachedType->HasAnim() || attachEffect->HasAnim()))
 			{
 				if (checkSource && attachEffect->IsFromSource(pInvoker, pSource))
 					continue;
 
 				const unsigned int minSize = minCounts ? minCounts->size() : 0;
 				const unsigned int maxSize = maxCounts ? maxCounts->size() : 0;
 
-				if (type->Cumulative && (minSize > 0 || maxSize > 0))
+				if (pType->Cumulative && (minSize > 0 || maxSize > 0))
 				{
-					const int cumulativeCount = this->GetAttachedEffectCumulativeCount(type, ignoreSameSource, pInvoker, pSource);
+					const int cumulativeCount = this->GetAttachedEffectCumulativeCount(pType, ignoreSameSource, pInvoker, pSource);
 
 					if (minSize > 0)
 					{
@@ -546,14 +540,7 @@ bool TechnoExt::ExtData::HasAttachedEffects(std::vector<AttachEffectTypeClass*>
 	return false;
 }
 
-/// <summary>
-/// Gets how many counts of same cumulative AttachEffect type instance techno has active on it.
-/// </summary>
-/// <param name="pAttachEffectType">AttachEffect type.</param>
-/// <param name="ignoreSameSource">Ignore AttachEffects that come from set invoker and source.</param>
-/// <param name="pInvoker">Invoker Techno used for same source check.</param>
-/// <param name="pSource">Source AbstractClass instance used for same source check.</param>
-/// <returns>Number of active cumulative AttachEffect type instances on the techno. 0 if the AttachEffect type is not cumulative.</returns>
+// Gets how many counts of same cumulative AttachEffect type instance techno has active on it.
 int TechnoExt::ExtData::GetAttachedEffectCumulativeCount(AttachEffectTypeClass* pAttachEffectType, bool ignoreSameSource, TechnoClass* pInvoker, AbstractClass* pSource) const
 {
 	if (!pAttachEffectType->Cumulative)
diff --git a/src/Ext/Techno/Body.h b/src/Ext/Techno/Body.h
@@ -191,6 +191,7 @@ class TechnoExt
 		void UpdateKeepTargetOnMove();
 		void UpdateWarpInDelay();
 		void UpdateCumulativeAttachEffects(AttachEffectTypeClass* pAttachEffectType, AttachEffectClass* pRemoved = nullptr);
+		void UpdateAEAnimLogic();
 		void RecalculateStatMultipliers();
 		void UpdateTemporal();
 		void UpdateMindControlAnim();
@@ -200,7 +201,7 @@ class TechnoExt
 		void InitializeLaserTrails();
 		void InitializeAttachEffects();
 		void UpdateSelfOwnedAttachEffects();
-		bool HasAttachedEffects(std::vector<AttachEffectTypeClass*> const& attachEffectTypes, bool requireAll, bool ignoreSameSource, TechnoClass* pInvoker, AbstractClass* pSource, std::vector<int> const* minCounts, std::vector<int> const* maxCounts) const;
+		bool HasAttachedEffects(std::vector<AttachEffectTypeClass*> const& attachEffectTypes, bool requireAll, bool ignoreSameSource, TechnoClass* pInvoker, AbstractClass* pSource, std::vector<int> const* minCounts, std::vector<int> const* maxCounts, bool requireAnims = false) const;
 		int GetAttachedEffectCumulativeCount(AttachEffectTypeClass* pAttachEffectType, bool ignoreSameSource = false, TechnoClass* pInvoker = nullptr, AbstractClass* pSource = nullptr) const;
 		void InitializeDisplayInfo();
 		void ApplyMindControlRangeLimit();
diff --git a/src/New/Entity/AttachEffectClass.cpp b/src/New/Entity/AttachEffectClass.cpp
@@ -100,7 +100,11 @@ AttachEffectClass::~AttachEffectClass()
 	if (it != AttachEffectClass::Array.end())
 		AttachEffectClass::Array.erase(it);
 
-	this->KillAnim();
+	if (this->Animation)
+	{
+		this->Animation->UnInit();
+		this->Animation = nullptr;
+	}
 
 	if (this->Invoker)
 		TechnoExt::ExtMap.Find(this->Invoker)->AttachedEffectInvokerCount--;
@@ -250,8 +254,6 @@ void AttachEffectClass::AI()
 
 	if (!this->Animation && this->CanShowAnim())
 		this->CreateAnim();
-
-	this->AnimCheck();
 }
 
 void AttachEffectClass::AI_Temporal()
@@ -286,12 +288,10 @@ void AttachEffectClass::AI_Temporal()
 				break;
 			}
 		}
-
-		this->AnimCheck();
 	}
 }
 
-void AttachEffectClass::AnimCheck()
+void AttachEffectClass::UpdateAnimLogic()
 {
 	if (this->Type->Animation_HideIfAttachedWith.size() > 0)
 	{
@@ -319,7 +319,7 @@ void AttachEffectClass::AnimCheck()
 
 		for (auto const& drawOffset : this->Type->Animation_DrawOffsets)
 		{
-			if (drawOffset.RequiredTypes.size() < 1 || pTechnoExt->HasAttachedEffects(drawOffset.RequiredTypes, false, false, nullptr, nullptr, nullptr, nullptr))
+			if (drawOffset.RequiredTypes.size() < 1 || pTechnoExt->HasAttachedEffects(drawOffset.RequiredTypes, false, false, nullptr, nullptr, nullptr, nullptr, true))
 				pAnimExt->AEDrawOffset += drawOffset.Offset;
 		}
 	}
@@ -431,6 +431,7 @@ void AttachEffectClass::CreateAnim()
 
 		pAnim->RemainingIterations = 0xFFu;
 		this->Animation = pAnim;
+		TechnoExt::ExtMap.Find(this->Techno)->UpdateAEAnimLogic();
 	}
 }
 
@@ -440,8 +441,13 @@ void AttachEffectClass::KillAnim()
 	{
 		this->Animation->UnInit();
 		this->Animation = nullptr;
+		TechnoExt::ExtMap.Find(this->Techno)->UpdateAEAnimLogic();
 	}
 }
+bool AttachEffectClass::HasAnim()
+{
+	return this->Animation != nullptr;
+}
 
 void AttachEffectClass::UpdateCumulativeAnim()
 {
@@ -802,6 +808,8 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy
 		if (!currentTypeCount && pType->Cumulative && pType->CumulativeAnimations.size() > 0)
 			pAE->HasCumulativeAnim = true;
 
+		TechnoExt::ExtMap.Find(pTarget)->UpdateAEAnimLogic();
+
 		return pAE;
 	}
 
@@ -882,7 +890,11 @@ int AttachEffectClass::DetachTypes(TechnoClass* pTarget, AEAttachInfoTypeClass c
 	}
 
 	if (detachedCount > 0)
-		TechnoExt::ExtMap.Find(pTarget)->RecalculateStatMultipliers();
+	{
+		auto const pExt = TechnoExt::ExtMap.Find(pTarget);
+		pExt->RecalculateStatMultipliers();
+		pExt->UpdateAEAnimLogic();
+	}
 
 	if (markForRedraw)
 		pTarget->MarkForRedraw();
@@ -985,6 +997,7 @@ int AttachEffectClass::RemoveAllOfType(AttachEffectTypeClass* pType, TechnoClass
 /// <param name="pTarget">Target techno.</param>
 void AttachEffectClass::TransferAttachedEffects(TechnoClass* pSource, TechnoClass* pTarget)
 {
+	int transferCount = 0;
 	const auto pSourceExt = TechnoExt::ExtMap.Find(pSource);
 	const auto pTargetExt = TechnoExt::ExtMap.Find(pTarget);
 	std::vector<std::unique_ptr<AttachEffectClass>>::iterator it;
@@ -1035,8 +1048,15 @@ void AttachEffectClass::TransferAttachedEffects(TechnoClass* pSource, TechnoClas
 				pAE->Duration = attachEffect->Duration;
 		}
 
+		transferCount++;
 		it = pSourceExt->AttachedEffects.erase(it);
 	}
+
+	if (transferCount)
+	{
+		pSourceExt->UpdateAEAnimLogic();
+		pTargetExt->UpdateAEAnimLogic();
+	}
 }
 
 #pragma endregion
diff --git a/src/New/Entity/AttachEffectClass.h b/src/New/Entity/AttachEffectClass.h
@@ -18,8 +18,10 @@ class AttachEffectClass
 
 	void AI();
 	void AI_Temporal();
+	void UpdateAnimLogic();
 	void KillAnim();
 	void CreateAnim();
+	bool HasAnim();
 	void UpdateCumulativeAnim();
 	void TransferCumulativeAnim(AttachEffectClass* pSource);
 	bool CanShowAnim() const;
@@ -48,7 +50,6 @@ class AttachEffectClass
 private:
 	void OnlineCheck();
 	void CloakCheck();
-	void AnimCheck();
 
 	static AttachEffectClass* CreateAndAttach(AttachEffectTypeClass* pType, TechnoClass* pTarget, std::vector<std::unique_ptr<AttachEffectClass>>& targetAEs, HouseClass* pInvokerHouse, TechnoClass* pInvoker,
 		AbstractClass* pSource, AEAttachParams const& attachInfo);
diff --git a/src/New/Type/AttachEffectTypeClass.cpp b/src/New/Type/AttachEffectTypeClass.cpp
@@ -62,6 +62,14 @@ AnimTypeClass* AttachEffectTypeClass::GetCumulativeAnimation(int cumulativeCount
 	return this->CumulativeAnimations.at(index);
 }
 
+bool AttachEffectTypeClass::HasAnim()
+{
+	if (this->Cumulative)
+		return this->CumulativeAnimations.size() > 0 || this->Animation != nullptr;
+	else
+		return this->Animation != nullptr;
+}
+
 void AttachEffectTypeClass::HandleEvent(TechnoClass* pTarget) const
 {
 	if (const auto pTag = pTarget->AttachedTag)
diff --git a/src/New/Type/AttachEffectTypeClass.h b/src/New/Type/AttachEffectTypeClass.h
@@ -173,6 +173,7 @@ class AttachEffectTypeClass final : public Enumerable<AttachEffectTypeClass>
 	bool HasGroup(const std::string& groupID) const;
 	bool HasGroups(const std::vector<std::string>& groupIDs, bool requireAll) const;
 	AnimTypeClass* GetCumulativeAnimation(int cumulativeCount) const;
+	bool HasAnim();
 	void HandleEvent(TechnoClass* pTarget) const;
 
 	void LoadFromINI(CCINIClass* pINI);

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,11 @@ AttachEffectClass::~AttachEffectClass()`
`100`	`100`	`if (it != AttachEffectClass::Array.end())`
`101`	`101`	`AttachEffectClass::Array.erase(it);`
`102`	`102`
`103`		`- this->KillAnim();`
	`103`	`+ if (this->Animation)`
	`104`	`+ {`
	`105`	`+ this->Animation->UnInit();`
	`106`	`+ this->Animation = nullptr;`
	`107`	`+ }`
`104`	`108`
`105`	`109`	`if (this->Invoker)`
`106`	`110`	`TechnoExt::ExtMap.Find(this->Invoker)->AttachedEffectInvokerCount--;`
`@@ -250,8 +254,6 @@ void AttachEffectClass::AI()`
`250`	`254`
`251`	`255`	`if (!this->Animation && this->CanShowAnim())`
`252`	`256`	`this->CreateAnim();`
`253`		`-`
`254`		`- this->AnimCheck();`
`255`	`257`	`}`
`256`	`258`
`257`	`259`	`void AttachEffectClass::AI_Temporal()`
`@@ -286,12 +288,10 @@ void AttachEffectClass::AI_Temporal()`
`286`	`288`	`break;`
`287`	`289`	`}`
`288`	`290`	`}`
`289`		`-`
`290`		`- this->AnimCheck();`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`
`294`		`-void AttachEffectClass::AnimCheck()`
	`294`	`+void AttachEffectClass::UpdateAnimLogic()`
`295`	`295`	`{`
`296`	`296`	`if (this->Type->Animation_HideIfAttachedWith.size() > 0)`
`297`	`297`	`{`
`@@ -319,7 +319,7 @@ void AttachEffectClass::AnimCheck()`
`319`	`319`
`320`	`320`	`for (auto const& drawOffset : this->Type->Animation_DrawOffsets)`
`321`	`321`	`{`
`322`		`- if (drawOffset.RequiredTypes.size() < 1 \|\| pTechnoExt->HasAttachedEffects(drawOffset.RequiredTypes, false, false, nullptr, nullptr, nullptr, nullptr))`
	`322`	`+ if (drawOffset.RequiredTypes.size() < 1 \|\| pTechnoExt->HasAttachedEffects(drawOffset.RequiredTypes, false, false, nullptr, nullptr, nullptr, nullptr, true))`
`323`	`323`	`pAnimExt->AEDrawOffset += drawOffset.Offset;`
`324`	`324`	`}`
`325`	`325`	`}`
`@@ -431,6 +431,7 @@ void AttachEffectClass::CreateAnim()`
`431`	`431`
`432`	`432`	`pAnim->RemainingIterations = 0xFFu;`
`433`	`433`	`this->Animation = pAnim;`
	`434`	`+ TechnoExt::ExtMap.Find(this->Techno)->UpdateAEAnimLogic();`
`434`	`435`	`}`
`435`	`436`	`}`
`436`	`437`
`@@ -440,8 +441,13 @@ void AttachEffectClass::KillAnim()`
`440`	`441`	`{`
`441`	`442`	`this->Animation->UnInit();`
`442`	`443`	`this->Animation = nullptr;`
	`444`	`+ TechnoExt::ExtMap.Find(this->Techno)->UpdateAEAnimLogic();`
`443`	`445`	`}`
`444`	`446`	`}`
	`447`	`+bool AttachEffectClass::HasAnim()`
	`448`	`+{`
	`449`	`+ return this->Animation != nullptr;`
	`450`	`+}`
`445`	`451`
`446`	`452`	`void AttachEffectClass::UpdateCumulativeAnim()`
`447`	`453`	`{`
`@@ -802,6 +808,8 @@ AttachEffectClass* AttachEffectClass::CreateAndAttach(AttachEffectTypeClass* pTy`
`802`	`808`	`if (!currentTypeCount && pType->Cumulative && pType->CumulativeAnimations.size() > 0)`
`803`	`809`	`pAE->HasCumulativeAnim = true;`
`804`	`810`
	`811`	`+ TechnoExt::ExtMap.Find(pTarget)->UpdateAEAnimLogic();`
	`812`	`+`
`805`	`813`	`return pAE;`
`806`	`814`	`}`
`807`	`815`
`@@ -882,7 +890,11 @@ int AttachEffectClass::DetachTypes(TechnoClass* pTarget, AEAttachInfoTypeClass c`
`882`	`890`	`}`
`883`	`891`
`884`	`892`	`if (detachedCount > 0)`
`885`		`- TechnoExt::ExtMap.Find(pTarget)->RecalculateStatMultipliers();`
	`893`	`+ {`
	`894`	`+ auto const pExt = TechnoExt::ExtMap.Find(pTarget);`
	`895`	`+ pExt->RecalculateStatMultipliers();`
	`896`	`+ pExt->UpdateAEAnimLogic();`
	`897`	`+ }`
`886`	`898`
`887`	`899`	`if (markForRedraw)`
`888`	`900`	`pTarget->MarkForRedraw();`
`@@ -985,6 +997,7 @@ int AttachEffectClass::RemoveAllOfType(AttachEffectTypeClass* pType, TechnoClass`
`985`	`997`	`/// <param name="pTarget">Target techno.</param>`
`986`	`998`	`void AttachEffectClass::TransferAttachedEffects(TechnoClass* pSource, TechnoClass* pTarget)`
`987`	`999`	`{`
	`1000`	`+ int transferCount = 0;`
`988`	`1001`	`const auto pSourceExt = TechnoExt::ExtMap.Find(pSource);`
`989`	`1002`	`const auto pTargetExt = TechnoExt::ExtMap.Find(pTarget);`
`990`	`1003`	`std::vector<std::unique_ptr<AttachEffectClass>>::iterator it;`
`@@ -1035,8 +1048,15 @@ void AttachEffectClass::TransferAttachedEffects(TechnoClass* pSource, TechnoClas`
`1035`	`1048`	`pAE->Duration = attachEffect->Duration;`
`1036`	`1049`	`}`
`1037`	`1050`
	`1051`	`+ transferCount++;`
`1038`	`1052`	`it = pSourceExt->AttachedEffects.erase(it);`
`1039`	`1053`	`}`
	`1054`	`+`
	`1055`	`+ if (transferCount)`
	`1056`	`+ {`
	`1057`	`+ pSourceExt->UpdateAEAnimLogic();`
	`1058`	`+ pTargetExt->UpdateAEAnimLogic();`
	`1059`	`+ }`
`1040`	`1060`	`}`
`1041`	`1061`
`1042`	`1062`	`#pragma endregion`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ AnimTypeClass* AttachEffectTypeClass::GetCumulativeAnimation(int cumulativeCount`
`62`	`62`	`return this->CumulativeAnimations.at(index);`
`63`	`63`	`}`
`64`	`64`
	`65`	`+bool AttachEffectTypeClass::HasAnim()`
	`66`	`+{`
	`67`	`+ if (this->Cumulative)`
	`68`	`+ return this->CumulativeAnimations.size() > 0 \|\| this->Animation != nullptr;`
	`69`	`+ else`
	`70`	`+ return this->Animation != nullptr;`
	`71`	`+}`
	`72`	`+`
`65`	`73`	`void AttachEffectTypeClass::HandleEvent(TechnoClass* pTarget) const`
`66`	`74`	`{`
`67`	`75`	`if (const auto pTag = pTarget->AttachedTag)`