unity(particlesys): Merge removal of Drawable Particle Attachments from Zero Hour (TheSuperHackers#2153)

Author: xezon

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

@@ -432,9 +432,6 @@ class Drawable : public Thing,
 	void clearAndSetModelConditionFlags( const ModelConditionFlags& clr, const ModelConditionFlags& set );
 	void replaceModelConditionFlags( const ModelConditionFlags &flags, Bool forceReplace = FALSE );
 
-	void attachToParticleSystem( Particle *p );								///< attach this Drawable to a particle system
-	void detachFromParticleSystem( void );										///< detach this from any particle system
-
 	Bool handleWeaponFireFX(
 							WeaponSlotType wslot,
 							Int specificBarrelToUse,
@@ -538,8 +535,6 @@ class Drawable : public Thing,
 
 	Bool getShouldAnimate( Bool considerPower ) const;
 
-	void friend_setParticle( Particle *particle ) { m_particle = particle; }
-
 	// flash drawable methods ---------------------------------------------------------
   Int getFlashCount( void ) { return m_flashCount; }
 	void setFlashCount( Int count ) { m_flashCount = count; }
@@ -636,7 +631,6 @@ class Drawable : public Thing,
 	Real m_decalOpacity;
 
 	Object *m_object;						///< object (if any) that this drawable represents
-	Particle *m_particle;				///< particle (if any) that this Drawable is associated with
 
 	DrawableID m_id;						///< this drawable's unique ID
 	Drawable *m_nextDrawable;

Generals/Code/GameEngine/Include/GameClient/ParticleSys.h

@@ -174,7 +174,6 @@ class Particle : public MemoryPoolObject,
 	void doWindMotion( void );									///< do wind motion (if present) from particle system
 
 	void applyForce( const Coord3D *force );		///< add the given acceleration
-	void detachDrawable( void ) { m_drawable = nullptr; }	///< detach the Drawable pointer from this particle
 
 	const Coord3D *getPosition( void ) { return &m_pos; }
 	Real getSize( void ) { return m_size; }
@@ -231,7 +230,6 @@ class Particle : public MemoryPoolObject,
 	RGBColor					m_colorRate;												///< current rate of color change
 	Int								m_colorTargetKey;												///< next index into key array
 
-	Drawable *				m_drawable;												///< drawable associated with this particle
 
 	Bool							m_isCulled;														///< status of particle relative to screen bounds
 public:

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

@@ -384,7 +384,6 @@ Drawable::Drawable( const ThingTemplate *thingTemplate, DrawableStatusBits statu
 
 	// initially not bound to an object
 	m_object = nullptr;
-	m_particle = nullptr;
 
 	// tintStatusTracking
 	m_tintStatus = 0;
@@ -514,7 +513,6 @@ Drawable::~Drawable()
 
 	// reset object to nullptr so we never mistaken grab "dead" objects
 	m_object = nullptr;
-	m_particle = nullptr;
 
 	// delete any icons present
 	deleteInstance(m_iconInfo);
@@ -762,26 +760,6 @@ Bool Drawable::getCurrentWorldspaceClientBonePositions(const char* boneName, Mat
 	return false;
 }
 
-//-------------------------------------------------------------------------------------------------
-/** Attach to a particle system */
-//-------------------------------------------------------------------------------------------------
-void Drawable::attachToParticleSystem( Particle *p )
-{
-	m_particle = p;
-}
-
-//-------------------------------------------------------------------------------------------------
-/** Detach from a particle system, if attached */
-//-------------------------------------------------------------------------------------------------
-void Drawable::detachFromParticleSystem( void )
-{
-	if (m_particle)
-	{
-		m_particle->detachDrawable();
-		m_particle = nullptr;
-	}
-}
-
 //-------------------------------------------------------------------------------------------------
 void Drawable::setTerrainDecal(TerrainDecalType type)
 {

Generals/Code/GameEngine/Source/GameClient/GameClient.cpp

@@ -810,9 +810,6 @@ void GameClient::destroyDrawable( Drawable *draw )
 	// remove any notion of the Drawable in the in-game user interface
 	TheInGameUI->disregardDrawable( draw );
 
-	// detach this Drawable from any particle system that may be using it
-	draw->detachFromParticleSystem();
-
 	// remove from the master list
 	draw->removeFromList(&m_drawableList);
 

Generals/Code/GameEngine/Source/GameClient/System/ParticleSys.cpp

@@ -326,18 +326,6 @@ Particle::Particle( ParticleSystem *system, const ParticleInfo *info )
 
 	m_colorScale = info->m_colorScale;
 
-	if (system->isUsingDrawables())
-	{
-		const ThingTemplate *tmpl = TheThingFactory->findTemplate(system->getParticleTypeName());
-		DEBUG_ASSERTCRASH(tmpl, ("Drawable %s not found",system->getParticleTypeName().str()));
-		if (tmpl)
-		{
-			m_drawable = TheThingFactory->newDrawable(tmpl);
-			if (m_drawable)
-				m_drawable->attachToParticleSystem( this );
-		}
-	}
-
 	m_inSystemList = m_inOverallList = FALSE;
 	m_systemPrev = m_systemNext = m_overallPrev = m_overallNext = nullptr;
 
@@ -358,10 +346,6 @@ Particle::~Particle()
 	// tell the particle system that this particle is gone
 	m_system->removeParticle( this );
 
-	if (m_drawable)
-		TheGameClient->destroyDrawable( m_drawable );
-	m_drawable = nullptr;
-
 	// if this particle was controlling another particle system, destroy that system
 	if (m_systemUnderControl)
 	{
@@ -517,17 +501,6 @@ Bool Particle::update( void )
 	m_accel.y = 0.0f;
 	m_accel.z = 0.0f;
 
-	if (m_drawable)
-	{
-		Matrix3D rot;
-		rot.Make_Identity();
-		rot.Rotate_X( m_angleX );
-		rot.Rotate_Y( m_angleY );
-		rot.Rotate_Z( m_angleZ );
-		m_drawable->setInstanceMatrix( &rot );
-		m_drawable->setPosition( &m_pos );
-	}
-
 	// monitor lifetime
 	if (m_lifetimeLeft && --m_lifetimeLeft == 0)
 		return false;
@@ -640,11 +613,6 @@ ParticlePriorityType Particle::getPriority( void )
 // ------------------------------------------------------------------------------------------------
 Bool Particle::isInvisible( void )
 {
-	// Drawables are never invisible (yet)
-	/// @todo Allow Drawables to fade via alpha (MSB)
-	if (m_drawable)
-		return false;
-
 	switch (m_system->getShaderType())
 	{
 		case ParticleSystemInfo::ADDITIVE:
@@ -742,31 +710,8 @@ void Particle::xfer( Xfer *xfer )
 	xfer->xferInt( &m_colorTargetKey );
 
 	// drawable
-	DrawableID drawableID = m_drawable ? m_drawable->getID() : INVALID_DRAWABLE_ID;
-	xfer->xferDrawableID( &drawableID );
-	if( xfer->getXferMode() == XFER_LOAD && drawableID != INVALID_DRAWABLE_ID )
-	{
-
-		//
-		// save drawable pointer, note that this xfer block is after all the drawable stuff
-		// so we don't need to post process anything all the correct drawables are loaded
-		// and available to us
-		//
-		m_drawable = TheGameClient->findDrawableByID( drawableID );
-
-		// sanity
-		if( m_drawable == nullptr )
-		{
-
-			DEBUG_CRASH(( "Particle::xfer - Unable to find matching drawable id for particle" ));
-			throw SC_INVALID_DATA;
-
-		}
-
-		// set the particle pointer in the drawable
-		m_drawable->friend_setParticle( this );
-
-	}
+	DrawableID drawableID = INVALID_DRAWABLE_ID;
+	xfer->xferDrawableID( &drawableID );	//saving for backwards compatibility when we supported drawables.
 
 	// system under control as an id
 	ParticleSystemID systemUnderControlID = m_systemUnderControl ? m_systemUnderControl->getSystemID() : INVALID_PARTICLE_SYSTEM_ID;