tweak(drawable): Decouple material opacity of detected stealth models from render update

Scalar value is NOT calculated ahead of rendering.

Author: Caball009

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

@@ -545,9 +545,6 @@ class Drawable : public Thing,
 	inline 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.
 
-	Real getSecondMaterialPassOpacityScalar() const { return m_secondMaterialPassOpacityScalar; } ///< get alpha/opacity scalar value used to render e.g. detected stealth units.
-	void setSecondMaterialPassOpacityScalar(Real scalar) { m_secondMaterialPassOpacityScalar = scalar; } ///< set 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
 	void fadeIn( UnsignedInt frames );		///< fade object in...how gradually this is done is determined by frames
@@ -727,7 +724,6 @@ class Drawable : public Thing,
 	DrawableIconInfo*		m_iconInfo;					///< lazily allocated!
 
 	Real m_secondMaterialPassOpacity;			///< drawable gets rendered again in hardware with an extra material layer
-	Real m_secondMaterialPassOpacityScalar; ///< multiply opacity by scalar value; used for non-default render framerates
 	// --------- 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

@@ -88,7 +88,6 @@
 
 
 #define VERY_TRANSPARENT_MATERIAL_PASS_OPACITY (0.001f)
-#define MATERIAL_PASS_OPACITY_FADE_SCALAR (0.8f)
 
 static const char *const TheDrawableIconNames[] =
 {
@@ -433,7 +432,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu
 	m_hidden = false;
 	m_hiddenByStealth = false;
 	m_secondMaterialPassOpacity = 0.0f;
-	m_secondMaterialPassOpacityScalar = MATERIAL_PASS_OPACITY_FADE_SCALAR;
 	m_drawableFullyObscuredByShroud = false;
 
   m_receivesDynamicLights = TRUE; // a good default... overridden by one of my draw modules if at all
@@ -2613,8 +2611,14 @@ void Drawable::draw()
     if ( getObject() && getObject()->isEffectivelyDead() )
 		  m_secondMaterialPassOpacity = 0.0f;//dead folks don't stealth anyway
 	  else if ( m_secondMaterialPassOpacity > VERY_TRANSPARENT_MATERIAL_PASS_OPACITY )// keep fading any add'l material unless something has set it to zero
-		  // TheSuperHackers @tweak The opacity step is now decoupled from the render update.
-		  m_secondMaterialPassOpacity *= m_secondMaterialPassOpacityScalar;
+		{
+			// TheSuperHackers @tweak The opacity step is now decoupled from the render update.
+			// minOpacity = (X ^ (framerate / updatesPerSec)) -> e.g. [ 0.05 = X ^ (100 / 2) ] -> [ X = 0.941845 ] -> [ 0.941845 ^ 50 = 0.05 ]
+			constexpr const Real minOpacity = 0.05f;
+			constexpr const Real updatesPerSec = 2.0f; // (LOGICFRAMES_PER_MSEC_REAL / data->m_updateRate (15))
+			const Real scalar = pow(minOpacity, updatesPerSec / TheFramePacer->getUpdateFps());
+			m_secondMaterialPassOpacity *= scalar;
+		}
 	  else
 		  m_secondMaterialPassOpacity = 0.0f;
   }

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Update/StealthDetectorUpdate.cpp

@@ -51,7 +51,6 @@
 #include "Common/BitFlagsIO.h"
 #include "Common/PlayerList.h"
 #include "Common/Player.h"
-#include "Common/FramePacer.h"
 
 
 //-------------------------------------------------------------------------------------------------
@@ -309,17 +308,10 @@ UpdateSleepTime StealthDetectorUpdate::update( void )
 			{
 				constexpr const Real minOpacity = 0.05f;
 				constexpr const Real resetThreshold = 2 * minOpacity;
-				constexpr const Real updatesPerSec = 2.0f; // (LOGICFRAMES_PER_MSEC_REAL / data->m_updateRate (15))
 
 				// TheSuperHackers @tweak Reset opacity only below threshold to prevent models flickering from multiple detections or special powers.
 				if (theirDraw->getSecondMaterialPassOpacity() < resetThreshold)
-				{
-					// calculate opacity scalar to get smooth pulsating effect decoupled from the render update
-					// minOpacity = (X ^ (framerate / updatesPerSec)) -> e.g. [ 0.05 = X ^ (100 / 2) ] -> [ X = 0.941845 ] -> [ 0.941845 ^ 50 = 0.05 ]
-					const Real scalar = pow(minOpacity, updatesPerSec / TheFramePacer->getUpdateFps());
-					theirDraw->setSecondMaterialPassOpacityScalar(scalar);
 					theirDraw->setSecondMaterialPassOpacity(1.0f);
-				}
 			}
 
 			if (data->m_IRGridParticleSysTmpl)