Merge pull request #97 from cortex-command-community/lerp-improvements

Causeless · web-flow · commit 77fa001d5128 · 2024-02-18T21:36:55.000Z
Lerp Improvements
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - New `MovableObject` INI and Lua property `PostEffectEnabled` (R/W), which determines whether or not the screen effect of an MO is enabled. Defaults to `true` for `MOPixels` and `MOSParticles`, `false` for everything else (to avoid backwards compatibility issues).
 
+- `Lerp` can now be used on Vectors and Matrices/Rotations, not just numbers.
+
 </details>
 
 <details><summary><b>Changed</b></summary>
@@ -22,6 +24,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Screen effects (glows) can now show on *any* `MovableObject` they're attached to; you may need to set `EffectAlwaysShows = 1` to see them on `MOSRotatings`. Try `InheritEffectRotAngle = 1` on one of them!
 
+- `LERP` Lua binding has been deprecated, and renamed to `Lerp`.
+
 </details>
 
 <details><summary><b>Fixed</b></summary>
diff --git a/Data/Missions.rte/Activities/DecisionDay.lua b/Data/Missions.rte/Activities/DecisionDay.lua
@@ -2045,8 +2045,8 @@ function DecisionDay:UpdateMainBunkerExternalPopoutTurrets()
 			if not boxData.movementTimer:IsPastSimTimeLimit() and boxData.actor then
 				local startPos = self.popoutTurretsData[bunkerId].turretsActivated and box.Center or box.Center + Vector(25, 25);
 				local endPos = self.popoutTurretsData[bunkerId].turretsActivated and box.Center + Vector(25, 25) or box.Center;
-				boxData.actor.Pos.X = LERP(0, 1, startPos.X, endPos.X, boxData.movementTimer.SimTimeLimitProgress);
-				boxData.actor.Pos.Y = LERP(0, 1, startPos.Y, endPos.Y, boxData.movementTimer.SimTimeLimitProgress);
+				boxData.actor.Pos.X = Lerp(0, 1, startPos.X, endPos.X, boxData.movementTimer.SimTimeLimitProgress);
+				boxData.actor.Pos.Y = Lerp(0, 1, startPos.Y, endPos.Y, boxData.movementTimer.SimTimeLimitProgress);
 				if boxData.movementSound:IsBeingPlayed() then
 					boxData.movementSound.Pos = boxData.actor.Pos;
 				else
diff --git a/Source/Entities/ADoor.cpp b/Source/Entities/ADoor.cpp
@@ -478,13 +478,13 @@ void ADoor::Update() {
 	// Lose health when door is lost, spinning out of control until grinds to halt
 	if (!m_Door && m_Status != DYING && m_Status != DEAD) {
 		m_SpriteAnimMode = ALWAYSLOOP;
-		m_SpriteAnimDuration = static_cast<int>(LERP(0, m_MaxHealth, 10.0F, static_cast<float>(m_InitialSpriteAnimDuration), m_Health));
+		m_SpriteAnimDuration = static_cast<int>(Lerp(0, m_MaxHealth, 10.0F, static_cast<float>(m_InitialSpriteAnimDuration), m_Health));
 
 		if (m_DoorMoveSound) {
 			if (!m_DoorMoveSound->IsBeingPlayed()) {
 				m_DoorMoveSound->Play(m_Pos);
 			}
-			m_DoorMoveSound->SetPitch(LERP(10.0F, static_cast<float>(m_InitialSpriteAnimDuration), 2.0F, 1.0F, static_cast<float>(m_SpriteAnimDuration)));
+			m_DoorMoveSound->SetPitch(Lerp(10.0F, static_cast<float>(m_InitialSpriteAnimDuration), 2.0F, 1.0F, static_cast<float>(m_SpriteAnimDuration)));
 		}
 
 		m_Health -= 0.4F;
@@ -580,11 +580,8 @@ void ADoor::UpdateDoorAttachableActions() {
 				m_DoorState = CLOSED;
 			}
 		} else {
-			Vector updatedOffset(LERP(0, m_DoorMoveTime, startOffset.m_X, endOffset.m_X, m_DoorMoveTimer.GetElapsedSimTimeMS()), LERP(0, m_DoorMoveTime, startOffset.m_Y, endOffset.m_Y, m_DoorMoveTimer.GetElapsedSimTimeMS()));
-
-			// TODO: Make this work across rotation 0. Probably the best solution would be to setup an angle LERP that properly handles the 2PI border and +- angles.
-			// TODO_MULTITHREAD: multithread branch has lerped rotation, so once that's done!
-			float updatedAngle = LERP(0, m_DoorMoveTime, startAngle, endAngle, m_DoorMoveTimer.GetElapsedSimTimeMS());
+			Vector updatedOffset(Lerp(0, m_DoorMoveTime, startOffset.m_X, endOffset.m_X, m_DoorMoveTimer.GetElapsedSimTimeMS()), Lerp(0, m_DoorMoveTime, startOffset.m_Y, endOffset.m_Y, m_DoorMoveTimer.GetElapsedSimTimeMS()));
+			float updatedAngle = Lerp(0, m_DoorMoveTime, Matrix(startAngle), Matrix(endAngle), m_DoorMoveTimer.GetElapsedSimTimeMS()).GetRadAngle();
 
 			m_Door->SetParentOffset(updatedOffset);
 			m_Door->SetRotAngle(m_Rotation.GetRadAngle() + (updatedAngle * GetFlipFactor()));
diff --git a/Source/Entities/ADoor.h b/Source/Entities/ADoor.h
@@ -153,7 +153,7 @@ namespace RTE {
 	protected:
 		static Entity::ClassInfo m_sClass; //!< ClassInfo for this class.
 
-		int m_InitialSpriteAnimDuration; //!< This stores the original SpriteAnimDuration value so we can drive the death spin-up animation using LERP. For internal use only.
+		int m_InitialSpriteAnimDuration; //!< This stores the original SpriteAnimDuration value so we can drive the death spin-up animation using Lerp. For internal use only.
 
 		std::list<ADSensor> m_Sensors; //!< All the sensors for detecting Actors approaching the door.
 		Timer m_SensorTimer; //!< Times the exit interval.
diff --git a/Source/Entities/AEmitter.cpp b/Source/Entities/AEmitter.cpp
@@ -314,8 +314,8 @@ int AEmitter::GetTotalBurstSize() const {
 }
 
 float AEmitter::GetScaledThrottle(float throttle, float multiplier) const {
-	float throttleFactor = LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);
-	return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);
+	float throttleFactor = Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);
+	return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);
 }
 
 void AEmitter::SetFlash(Attachable* newFlash) {
diff --git a/Source/Entities/AEmitter.h b/Source/Entities/AEmitter.h
@@ -140,11 +140,11 @@ namespace RTE {
 
 		/// Gets the adjusted throttle multiplier that is factored into the emission rate of this AEmitter.
 		/// @return The throttle strength as a multiplier.
-		float GetThrottleFactor() const { return LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
+		float GetThrottleFactor() const { return Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
 
 		/// Gets the throttle value that will achieve a given throttle factor that is factored into the emission rate of this AEmitter.
 		/// @return The throttle value that will achieve the given throttle factor.
-		float GetThrottleForThrottleFactor(float throttleFactor) const { return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
+		float GetThrottleForThrottleFactor(float throttleFactor) const { return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
 
 		/// Returns a scaled throttle value that represents a linear increase of force.
 		/// Because of (bad) reasons, throttle is in the range -1.0F to 1.0F, where -1.0F is "minimum force" and 1.0F is "maximum force".
diff --git a/Source/Entities/AHuman.cpp b/Source/Entities/AHuman.cpp
@@ -1404,12 +1404,12 @@ void AHuman::UpdateCrouching() {
 			desiredWalkPathYOffset = m_CrouchAmountOverride * m_MaxWalkPathCrouchShift;
 		}
 
-		float finalWalkPathYOffset = std::clamp(LERP(0.0F, 1.0F, -m_WalkPathOffset.m_Y, desiredWalkPathYOffset, 0.3F), 0.0F, m_MaxWalkPathCrouchShift);
+		float finalWalkPathYOffset = std::clamp(Lerp(0.0F, 1.0F, -m_WalkPathOffset.m_Y, desiredWalkPathYOffset, 0.3F), 0.0F, m_MaxWalkPathCrouchShift);
 		m_WalkPathOffset.m_Y = -finalWalkPathYOffset;
 
 		// If crouching, move at reduced speed
 		const float crouchSpeedMultiplier = 0.5F;
-		float travelSpeedMultiplier = LERP(0.0F, m_MaxWalkPathCrouchShift, 1.0F, crouchSpeedMultiplier, -m_WalkPathOffset.m_Y);
+		float travelSpeedMultiplier = Lerp(0.0F, m_MaxWalkPathCrouchShift, 1.0F, crouchSpeedMultiplier, -m_WalkPathOffset.m_Y);
 		m_Paths[FGROUND][WALK].SetTravelSpeedMultiplier(travelSpeedMultiplier);
 		m_Paths[BGROUND][WALK].SetTravelSpeedMultiplier(travelSpeedMultiplier);
 
@@ -2413,7 +2413,7 @@ void AHuman::Update() {
 
 			// Lean forwards when crouching
 			float crouchAngleAdjust = m_HFlipped ? m_MaxCrouchRotation : -m_MaxCrouchRotation;
-			rotTarget += LERP(0.0F, m_MaxWalkPathCrouchShift, 0.0F, crouchAngleAdjust, m_WalkPathOffset.m_Y * -1.0F);
+			rotTarget += Lerp(0.0F, m_MaxWalkPathCrouchShift, 0.0F, crouchAngleAdjust, m_WalkPathOffset.m_Y * -1.0F);
 
 			float rotDiff = rot - rotTarget;
 			m_AngularVel = m_AngularVel * (0.98F - 0.06F * (m_Health / m_MaxHealth)) - (rotDiff * 0.5F);
diff --git a/Source/Entities/HDFirearm.cpp b/Source/Entities/HDFirearm.cpp
@@ -959,16 +959,16 @@ void HDFirearm::Update() {
 				int animDuration = m_SpriteAnimDuration;
 				// Spin up - can only spin up if mag is inserted
 				if (m_Activated && !m_Reloading && m_ActivationTimer.GetElapsedSimTimeMS() < m_ActivationDelay) {
-					animDuration = (int)LERP(0, m_ActivationDelay, (float)(m_SpriteAnimDuration * 10), (float)m_SpriteAnimDuration, m_ActivationTimer.GetElapsedSimTimeMS());
+					animDuration = (int)Lerp(0, m_ActivationDelay, (float)(m_SpriteAnimDuration * 10), (float)m_SpriteAnimDuration, m_ActivationTimer.GetElapsedSimTimeMS());
 					if (m_ActiveSound) {
-						m_ActiveSound->SetPitch(LERP(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()));
+						m_ActiveSound->SetPitch(Lerp(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()));
 					}
 				}
 				// Spin down
 				if ((!m_Activated || m_Reloading) && m_LastFireTmr.GetElapsedSimTimeMS() < m_DeactivationDelay) {
-					animDuration = (int)LERP(0, m_DeactivationDelay, (float)m_SpriteAnimDuration, (float)(m_SpriteAnimDuration * 10), m_LastFireTmr.GetElapsedSimTimeMS());
+					animDuration = (int)Lerp(0, m_DeactivationDelay, (float)m_SpriteAnimDuration, (float)(m_SpriteAnimDuration * 10), m_LastFireTmr.GetElapsedSimTimeMS());
 					if (m_ActiveSound) {
-						m_ActiveSound->SetPitch(LERP(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()));
+						m_ActiveSound->SetPitch(Lerp(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()));
 					}
 				}
 
diff --git a/Source/Entities/MOPixel.cpp b/Source/Entities/MOPixel.cpp
@@ -245,3 +245,11 @@ void MOPixel::Draw(BITMAP* targetBitmap, const Vector& targetPos, DrawMode mode,
 
 	g_SceneMan.RegisterDrawing(targetBitmap, m_MOID, pixelPos, 1.0F);
 }
+
+void MOPixel::SetPostScreenEffectToDraw() const {
+	if (m_AgeTimer.GetElapsedSimTimeMS() >= m_EffectStartTime && (m_EffectStopTime == 0 || !m_AgeTimer.IsPastSimMS(m_EffectStopTime))) {
+		if (m_EffectAlwaysShows || !g_SceneMan.ObscuredPoint(m_Pos.GetFloorIntX(), m_Pos.GetFloorIntY())) {
+			g_PostProcessMan.RegisterPostEffect(m_Pos, m_pScreenEffect, m_ScreenEffectHash, Lerp(m_EffectStartTime, m_EffectStopTime, m_EffectStartStrength, m_EffectStopStrength, m_AgeTimer.GetElapsedSimTimeMS()), m_EffectRotAngle);
+		}
+	}
+}
diff --git a/Source/Entities/MOSParticle.cpp b/Source/Entities/MOSParticle.cpp
@@ -217,3 +217,11 @@ void MOSParticle::Draw(BITMAP* targetBitmap, const Vector& targetPos, DrawMode m
 		g_SceneMan.RegisterDrawing(targetBitmap, m_MOID, spriteX, spriteY, spriteX + m_aSprite[m_Frame]->w, spriteY + m_aSprite[m_Frame]->h);
 	}
 }
+
+void MOSParticle::SetPostScreenEffectToDraw() const {
+	if (m_AgeTimer.GetElapsedSimTimeMS() >= m_EffectStartTime && (m_EffectStopTime == 0 || !m_AgeTimer.IsPastSimMS(m_EffectStopTime))) {
+		if (m_EffectAlwaysShows || !g_SceneMan.ObscuredPoint(m_Pos.GetFloorIntX(), m_Pos.GetFloorIntY())) {
+			g_PostProcessMan.RegisterPostEffect(m_Pos, m_pScreenEffect, m_ScreenEffectHash, Lerp(m_EffectStartTime, m_EffectStopTime, m_EffectStartStrength, m_EffectStopStrength, m_AgeTimer.GetElapsedSimTimeMS()), m_EffectRotAngle);
+		}
+	}
+}
diff --git a/Source/Entities/PEmitter.h b/Source/Entities/PEmitter.h
@@ -141,11 +141,11 @@ namespace RTE {
 
 		/// Gets the adjusted throttle multiplier that is factored into the emission rate of this PEmitter.
 		/// @return The throttle strength as a multiplier.
-		float GetThrottleFactor() const { return LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
+		float GetThrottleFactor() const { return Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, m_Throttle); }
 
 		/// Gets the throttle value that will achieve a given throttle factor that is factored into the emission rate of this AEmitter.
 		/// @return The throttle value that will achieve the given throttle factor.
-		float GetThrottleForThrottleFactor(float throttleFactor) const { return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
+		float GetThrottleForThrottleFactor(float throttleFactor) const { return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor); }
 
 		/*
 		/// Sets the rate at which this PEmitter emits its particles.
diff --git a/Source/Entities/PieMenu.cpp b/Source/Entities/PieMenu.cpp
@@ -674,14 +674,14 @@ void PieMenu::UpdateWobbling() {
 void PieMenu::UpdateEnablingAndDisablingProgress() {
 	m_BGBitmapNeedsRedrawing = true;
 	if (m_EnabledState == EnabledState::Enabling) {
-		m_CurrentInnerRadius = static_cast<int>(LERP(0.0F, static_cast<float>(c_EnablingDelay), 0.0F, static_cast<float>(m_FullInnerRadius), static_cast<float>(m_EnableDisableAnimationTimer.GetElapsedRealTimeMS())));
+		m_CurrentInnerRadius = static_cast<int>(Lerp(0.0F, static_cast<float>(c_EnablingDelay), 0.0F, static_cast<float>(m_FullInnerRadius), static_cast<float>(m_EnableDisableAnimationTimer.GetElapsedRealTimeMS())));
 		if (IsSubPieMenu() || m_EnableDisableAnimationTimer.IsPastRealMS(c_EnablingDelay)) {
 			m_EnabledState = EnabledState::Enabled;
 			m_CurrentInnerRadius = m_FullInnerRadius;
 			m_SubPieMenuHoverOpenTimer.Reset();
 		}
 	} else if (m_EnabledState == EnabledState::Disabling) {
-		m_CurrentInnerRadius = static_cast<int>(LERP(0.0F, static_cast<float>(c_EnablingDelay), static_cast<float>(m_FullInnerRadius), 0.0F, static_cast<float>(m_EnableDisableAnimationTimer.GetElapsedRealTimeMS())));
+		m_CurrentInnerRadius = static_cast<int>(Lerp(0.0F, static_cast<float>(c_EnablingDelay), static_cast<float>(m_FullInnerRadius), 0.0F, static_cast<float>(m_EnableDisableAnimationTimer.GetElapsedRealTimeMS())));
 		if (IsSubPieMenu() || m_EnableDisableAnimationTimer.IsPastRealMS(c_EnablingDelay)) {
 			m_EnabledState = EnabledState::Disabled;
 			m_CurrentInnerRadius = 0;
diff --git a/Source/Managers/AudioMan.cpp b/Source/Managers/AudioMan.cpp
@@ -866,7 +866,7 @@ void AudioMan::Update3DEffectsForSFXChannels() {
 				if (sqrDistanceToPlayer < (m_MinimumDistanceForPanning * m_MinimumDistanceForPanning) || soundContainer->GetCustomPanValue() != 0.0f) {
 					soundChannel->set3DLevel(0);
 				} else if (sqrDistanceToPlayer < (doubleMinimumDistanceForPanning * doubleMinimumDistanceForPanning)) {
-					soundChannel->set3DLevel(LERP(0, 1, 0, m_SoundPanningEffectStrength * soundContainer->GetPanningStrengthMultiplier(), channel3dLevel));
+					soundChannel->set3DLevel(Lerp(0, 1, 0, m_SoundPanningEffectStrength * soundContainer->GetPanningStrengthMultiplier(), channel3dLevel));
 				} else {
 					soundChannel->set3DLevel(m_SoundPanningEffectStrength * soundContainer->GetPanningStrengthMultiplier());
 				}
diff --git a/Source/Managers/LuaMan.cpp b/Source/Managers/LuaMan.cpp
@@ -93,7 +93,10 @@ void LuaStateWrapper::Initialize() {
 	                             .def("FileEOF", &LuaStateWrapper::FileEOF),
 
 	                         luabind::def("DeleteEntity", &LuaAdaptersUtility::DeleteEntity, luabind::adopt(_1)), // NOT a member function, so adopting _1 instead of the _2 for the first param, since there's no "this" pointer!!
-	                         luabind::def("LERP", &LERP),
+	                         luabind::def("LERP", (float (*)(float, float, float, float, float)) & Lerp),
+	                         luabind::def("Lerp", (float (*)(float, float, float, float, float)) & Lerp),
+	                         luabind::def("Lerp", (Vector(*)(float, float, Vector, Vector, float)) & Lerp),
+	                         luabind::def("Lerp", (Matrix(*)(float, float, Matrix, Matrix, float)) & Lerp),
 	                         luabind::def("EaseIn", &EaseIn),
 	                         luabind::def("EaseOut", &EaseOut),
 	                         luabind::def("EaseInOut", &EaseInOut),
diff --git a/Source/Menus/MetagameGUI.cpp b/Source/Menus/MetagameGUI.cpp
@@ -1,3 +1,4 @@
+
 #include "MetagameGUI.h"
 
 #include "WindowMan.h"
@@ -69,9 +70,9 @@ void MetagameGUI::SiteTarget::Draw(BITMAP* drawBitmap) const {
 
 	// Draw the appropriate growing geometric figure around the location, growing
 	if (m_Style == SiteTarget::CROSSHAIRSSHRINK) {
-		float radius = LERP(0.0, 1.0, 200, 10, m_AnimProgress);
-		float lineLen = LERP(0.0, 1.0, 60, 10, m_AnimProgress);
-		float rotation = 0; // LERP(0.0, 1.0, -c_EighthPI, 0.0, m_AnimProgress);
+		float radius = Lerp(0.0f, 1.0f, 200.0f, 10.0f, m_AnimProgress);
+		float lineLen = Lerp(0.0f, 1.0f, 60.0f, 10.0f, m_AnimProgress);
+		float rotation = Lerp(0.0f, 1.0f, Matrix(-c_EighthPI), Matrix(0.0f), m_AnimProgress).GetRadAngle();
 		Vector inner;
 		Vector outer;
 
@@ -84,9 +85,9 @@ void MetagameGUI::SiteTarget::Draw(BITMAP* drawBitmap) const {
 			DrawGlowLine(drawBitmap, m_CenterPos + inner, m_CenterPos + outer, m_Color);
 		}
 	} else if (m_Style == SiteTarget::CROSSHAIRSGROW) {
-		float radius = LERP(0.0, 1.0, 10, 200, m_AnimProgress);
-		float lineLen = LERP(0.0, 1.0, 10, 60, m_AnimProgress);
-		float rotation = 0; // LERP(0.0, 1.0, -c_EighthPI, 0.0, m_AnimProgress);
+		float radius = Lerp(0.0f, 1.0f, 10.0f, 200.0f, m_AnimProgress);
+		float lineLen = Lerp(0.0f, 1.0f, 10.0f, 60.0f, m_AnimProgress);
+		float rotation = Lerp(0.0f, 1.0f, Matrix(-c_EighthPI), Matrix(0.0f), m_AnimProgress).GetRadAngle();
 		Vector inner;
 		Vector outer;
 
@@ -99,26 +100,26 @@ void MetagameGUI::SiteTarget::Draw(BITMAP* drawBitmap) const {
 			DrawGlowLine(drawBitmap, m_CenterPos + inner, m_CenterPos + outer, m_Color);
 		}
 	} else if (m_Style == SiteTarget::CIRCLESHRINK) {
-		float radius = LERP(0.0, 1.0, 24, 6, m_AnimProgress);
-		int blendAmount = LERP(0.0, 1.0, 0, 255, m_AnimProgress); // + 15 * NormalRand();
+		float radius = Lerp(0.0f, 1.0f, 24.0f, 6.0f, m_AnimProgress);
+		int blendAmount = Lerp(0.0f, 1.0f, 0.0f, 255.0f, m_AnimProgress); // + 15 * NormalRand();
 		set_screen_blender(blendAmount, blendAmount, blendAmount, blendAmount);
 		circle(drawBitmap, m_CenterPos.m_X, m_CenterPos.m_Y, radius, m_Color);
 	} else if (m_Style == SiteTarget::CIRCLEGROW) {
-		float radius = LERP(0.0, 1.0, 6, 24, m_AnimProgress);
-		int blendAmount = LERP(0.0, 1.0, 255, 0, m_AnimProgress); // + 15 * NormalRand();
+		float radius = Lerp(0.0f, 1.0f, 6.0f, 24.0f, m_AnimProgress);
+		int blendAmount = Lerp(0.0f, 1.0f, 255.0f, 0.0f, m_AnimProgress); // + 15 * NormalRand();
 		set_screen_blender(blendAmount, blendAmount, blendAmount, blendAmount);
 		circle(drawBitmap, m_CenterPos.m_X, m_CenterPos.m_Y, radius, m_Color);
 	} else if (m_Style == SiteTarget::SQUARESHRINK) {
-		float radius = LERP(0.0, 1.0, 24, 6, m_AnimProgress);
-		int blendAmount = LERP(0.0, 1.0, 0, 255, m_AnimProgress); // + 15 * NormalRand();
+		float radius = Lerp(0.0f, 1.0f, 24.0f, 6.0f, m_AnimProgress);
+		int blendAmount = Lerp(0.0f, 1.0f, 0.0f, 255.0f, m_AnimProgress); // + 15 * NormalRand();
 		set_screen_blender(blendAmount, blendAmount, blendAmount, blendAmount);
 		rect(drawBitmap, m_CenterPos.m_X - radius, m_CenterPos.m_Y - radius, m_CenterPos.m_X + radius, m_CenterPos.m_Y + radius, m_Color);
 	}
 	// Default
 	else // if (m_Style == SiteTarget::SQUAREGROW)
 	{
-		float radius = LERP(0.0, 1.0, 6, 24, m_AnimProgress);
-		int blendAmount = LERP(0.0, 1.0, 255, 0, m_AnimProgress); // + 15 * NormalRand();
+		float radius = Lerp(0.0f, 1.0f, 6.0f, 24.0f, m_AnimProgress);
+		int blendAmount = Lerp(0.0f, 1.0f, 255.0f, 0.0f, m_AnimProgress); // + 15 * NormalRand();
 		set_screen_blender(blendAmount, blendAmount, blendAmount, blendAmount);
 		rect(drawBitmap, m_CenterPos.m_X - radius, m_CenterPos.m_Y - radius, m_CenterPos.m_X + radius, m_CenterPos.m_Y + radius, m_Color);
 	}
diff --git a/Source/Menus/TitleScreen.cpp b/Source/Menus/TitleScreen.cpp
diff --git a/Source/System/RTETools.cpp b/Source/System/RTETools.cpp
diff --git a/Source/System/RTETools.h b/Source/System/RTETools.h

Original file line number	Diff line number	Diff line change
`@@ -314,8 +314,8 @@ int AEmitter::GetTotalBurstSize() const {`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`float AEmitter::GetScaledThrottle(float throttle, float multiplier) const {`
`317`		`- float throttleFactor = LERP(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);`
`318`		`- return LERP(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);`
	`317`	`+ float throttleFactor = Lerp(-1.0f, 1.0f, m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, throttle);`
	`318`	`+ return Lerp(m_NegativeThrottleMultiplier, m_PositiveThrottleMultiplier, -1.0f, 1.0f, throttleFactor * multiplier);`
`319`	`319`	`}`
`320`	`320`
`321`	`321`	`void AEmitter::SetFlash(Attachable* newFlash) {`
Original file line number	Diff line number	Diff line change
`@@ -959,16 +959,16 @@ void HDFirearm::Update() {`
`959`	`959`	`int animDuration = m_SpriteAnimDuration;`
`960`	`960`	`// Spin up - can only spin up if mag is inserted`
`961`	`961`	`if (m_Activated && !m_Reloading && m_ActivationTimer.GetElapsedSimTimeMS() < m_ActivationDelay) {`
`962`		`- animDuration = (int)LERP(0, m_ActivationDelay, (float)(m_SpriteAnimDuration * 10), (float)m_SpriteAnimDuration, m_ActivationTimer.GetElapsedSimTimeMS());`
	`962`	`+ animDuration = (int)Lerp(0, m_ActivationDelay, (float)(m_SpriteAnimDuration * 10), (float)m_SpriteAnimDuration, m_ActivationTimer.GetElapsedSimTimeMS());`
`963`	`963`	`if (m_ActiveSound) {`
`964`		`- m_ActiveSound->SetPitch(LERP(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()));`
	`964`	`+ m_ActiveSound->SetPitch(Lerp(0, m_ActivationDelay, 0, 1.0, m_ActivationTimer.GetElapsedSimTimeMS()));`
`965`	`965`	`}`
`966`	`966`	`}`
`967`	`967`	`// Spin down`
`968`	`968`	`if ((!m_Activated \|\| m_Reloading) && m_LastFireTmr.GetElapsedSimTimeMS() < m_DeactivationDelay) {`
`969`		`- animDuration = (int)LERP(0, m_DeactivationDelay, (float)m_SpriteAnimDuration, (float)(m_SpriteAnimDuration * 10), m_LastFireTmr.GetElapsedSimTimeMS());`
	`969`	`+ animDuration = (int)Lerp(0, m_DeactivationDelay, (float)m_SpriteAnimDuration, (float)(m_SpriteAnimDuration * 10), m_LastFireTmr.GetElapsedSimTimeMS());`
`970`	`970`	`if (m_ActiveSound) {`
`971`		`- m_ActiveSound->SetPitch(LERP(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()));`
	`971`	`+ m_ActiveSound->SetPitch(Lerp(0, m_DeactivationDelay, 1.0, 0, m_LastFireTmr.GetElapsedSimTimeMS()));`
`972`	`972`	`}`
`973`	`973`	`}`
`974`	`974`
Original file line number	Diff line number	Diff line change
`@@ -217,3 +217,11 @@ void MOSParticle::Draw(BITMAP* targetBitmap, const Vector& targetPos, DrawMode m`
`217`	`217`	`g_SceneMan.RegisterDrawing(targetBitmap, m_MOID, spriteX, spriteY, spriteX + m_aSprite[m_Frame]->w, spriteY + m_aSprite[m_Frame]->h);`
`218`	`218`	`}`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+void MOSParticle::SetPostScreenEffectToDraw() const {`
	`222`	`+ if (m_AgeTimer.GetElapsedSimTimeMS() >= m_EffectStartTime && (m_EffectStopTime == 0 \|\| !m_AgeTimer.IsPastSimMS(m_EffectStopTime))) {`
	`223`	`+ if (m_EffectAlwaysShows \|\| !g_SceneMan.ObscuredPoint(m_Pos.GetFloorIntX(), m_Pos.GetFloorIntY())) {`
	`224`	`+ g_PostProcessMan.RegisterPostEffect(m_Pos, m_pScreenEffect, m_ScreenEffectHash, Lerp(m_EffectStartTime, m_EffectStopTime, m_EffectStartStrength, m_EffectStopStrength, m_AgeTimer.GetElapsedSimTimeMS()), m_EffectRotAngle);`
	`225`	`+ }`
	`226`	`+ }`
	`227`	`+}`