Changed scalar calculation logic.

Author: Caball009

GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h

@@ -545,6 +545,7 @@ class Drawable : public Thing,
 	Real getSecondMaterialPassOpacity() const { return m_secondMaterialPassOpacity; }								///< get alpha/opacity value used to render add'l  rendering pass.
 	void setSecondMaterialPassOpacity( Real op ) { m_secondMaterialPassOpacity = op; };							///< set alpha/opacity value used to render add'l  rendering pass.
 	void allowRefillSecondMaterialPassOpacity() { m_secondMaterialPassOpacityAllowRefill = TRUE; }	///< allow the second material opacity to be set to 1.0f
+	static void updateSecondMaterialPassOpacityScalar();																						///< update alpha/opacity scalar value used to render e.g. detected stealth units.
 
 	// both of these assume that you are starting at one extreme 100% or 0% opacity and are trying to go to the other!! -- amit
 	void fadeOut( UnsignedInt frames );		///< fade object out...how gradually this is done is determined by frames
@@ -724,8 +725,9 @@ class Drawable : public Thing,
 	UnsignedInt					m_expirationDate;		///< if nonzero, Drawable should destroy itself at this frame
 	DrawableIconInfo*		m_iconInfo;					///< lazily allocated!
 
-	Real m_secondMaterialPassOpacity;							///< drawable gets rendered again in hardware with an extra material layer
-	Bool m_secondMaterialPassOpacityAllowRefill;	///< allow the second material opacity to be set to 1.0f
+	static inline Real m_secondMaterialPassOpacityScalar;	///< multiply opacity by scalar value; used for non-default render framerates
+	Real m_secondMaterialPassOpacity;											///< drawable gets rendered again in hardware with an extra material layer
+	Bool m_secondMaterialPassOpacityAllowRefill;					///< allow the second material opacity to be set to 1.0f
 	// --------- BYTE-SIZED THINGS GO HERE
 	Byte m_selected;						///< drawable is selected or not
 	Bool m_hidden;							///< drawable is "hidden" or not (overrides stealth effects)

GeneralsMD/Code/GameEngine/Source/GameClient/Drawable.cpp

@@ -2601,6 +2601,15 @@ void Drawable::setStealthLook(StealthLookType look)
 	}
 }
 
+void Drawable::updateSecondMaterialPassOpacityScalar()
+{
+	// TheSuperHackers @tweak The opacity step is no longer a fixed value.
+	// min opacity = (X ^ (frame rate / updates per second)) -> e.g. [ 0.05 = X ^ (100 / 2) ] -> [ X = 0.941845 ] -> [ 0.941845 ^ 50 = 0.05 ]
+	const Real updatesPerSec = 2.0f;
+	const Real scalar = pow(MATERIAL_PASS_OPACITY_MIN, updatesPerSec / TheFramePacer->getUpdateFps());
+
+	m_secondMaterialPassOpacityScalar = scalar;
+}
 
 //-------------------------------------------------------------------------------------------------
 /** default draw is to just call the database defined draw */
@@ -2615,24 +2624,19 @@ void Drawable::draw()
 		}
 		else if (!TheFramePacer->isGameHalted())
 		{
-			// TheSuperHackers @tweak The opacity step is no longer a fixed value.
-			const Bool shouldFade = (m_secondMaterialPassOpacity > MATERIAL_PASS_OPACITY_MIN);
+			const Bool shouldFade = m_secondMaterialPassOpacity > MATERIAL_PASS_OPACITY_MIN;
 			const Bool allowRefill = m_secondMaterialPassOpacityAllowRefill;
 
 			if (shouldFade || allowRefill)
 			{
-				// min opacity = (X ^ (frame rate / updates per second)) -> e.g. [ 0.05 = X ^ (100 / 2) ] -> [ X = 0.941845 ] -> [ 0.941845 ^ 50 = 0.05 ]
-				const Real updatesPerSec = 2.0f;
-				const Real scalar = pow(MATERIAL_PASS_OPACITY_MIN, updatesPerSec / TheFramePacer->getUpdateFps());
-
 				if (!shouldFade && allowRefill)
 				{
-					m_secondMaterialPassOpacity = scalar;
+					m_secondMaterialPassOpacity = m_secondMaterialPassOpacityScalar;
 					m_secondMaterialPassOpacityAllowRefill = FALSE;
 				}
 				else
 				{
-					m_secondMaterialPassOpacity *= scalar;
+					m_secondMaterialPassOpacity *= m_secondMaterialPassOpacityScalar;
 				}
 			}
 			else