New Material property that allows dislodged pixels to relocate in order to avoid compacting, in the same fashion that was previously reserved only for gold

Author: fourZK

Entities/Material.cpp

@@ -10,6 +10,7 @@ namespace RTE {
 	void Material::Clear() {
 		m_Index = 0;
 		m_Priority = 0;
+		m_Piling = 0;
 		m_Integrity = 0.0F;
 		m_Restitution = 0.0F;
 		m_Friction = 0.0F;
@@ -34,6 +35,7 @@ namespace RTE {
 
 		m_Index = reference.m_Index;
 		m_Priority = reference.m_Priority;
+		m_Piling = reference.m_Piling;
 		m_Integrity = reference.m_Integrity;
 		m_Restitution = reference.m_Restitution;
 		m_Friction = reference.m_Friction;
@@ -61,6 +63,8 @@ namespace RTE {
 			reader >> m_Index;	
 		} else if (propName == "Priority") {
 			reader >> m_Priority;
+		} else if (propName == "Piling") {
+			reader >> m_Piling;
 		} else if (propName == "Integrity" || propName == "StructuralIntegrity") {
 			reader >> m_Integrity;
 		} else if (propName == "Restitution" || propName == "Bounce") {
@@ -108,6 +112,8 @@ namespace RTE {
 		if (m_IsOriginalPreset) {
 			writer.NewProperty("Priority");
 			writer << m_Priority;
+			writer.NewProperty("Piling");
+			writer << m_Piling;
 			writer.NewProperty("StructuralIntegrity");
 			writer << m_Integrity;
 			writer.NewProperty("Restitution");

Entities/Material.h

@@ -70,6 +70,12 @@ namespace RTE {
 		/// <returns>The drawing priority of this Material.</returns>
 		int GetPriority() const { return m_Priority; }
 
+		/// <summary>
+		/// Gets the amount of times a dislodged pixel of this Material will attempt to relocate to an open position.
+		/// </summary>
+		/// <returns>The amount of attempts at relocating.</returns>
+		int GetPiling() const { return m_Piling; }
+
 		/// <summary>
 		/// The impulse force that a particle needs to knock loose a terrain pixel of this material. In kg * m/s.
 		/// </summary>
@@ -152,6 +158,7 @@ namespace RTE {
 
 		unsigned char m_Index; //!< Index of this in the material palette. 0 - 255.
 		int m_Priority; //!< The priority that a pixel of this material has to be displayed. The higher the number, the higher chances that a pixel of this material will be drawn on top of others.
+		int m_Piling; //! The amount of times a dislodged pixel of this Material will attempt to relocate upwards, when intersecting a terrain pixel of the same Material. TODO: Better property name?
 
 		float m_Integrity; //!< The impulse force that a particle needs to knock loose a terrain pixel of this material. In kg * m/s.
 		float m_Restitution; //!< A scalar value that defines the restitution (elasticity). 1.0 = no kinetic energy is lost in a collision, 0.0 = all energy is lost (plastic).

Managers/MovableMan.cpp

@@ -1954,26 +1954,21 @@ void MovableMan::Update()
         {
             Vector parPos((*parIt)->GetPos().GetFloored());
             Material const * terrMat = g_SceneMan.GetMaterialFromID(g_SceneMan.GetTerrain()->GetMaterialPixel(parPos.m_X, parPos.m_Y));
-            if ((*parIt)->GetDrawPriority() >= terrMat->GetPriority())
-            {
-                // Gold particle special case to avoid compacting of gold
-                if ((*parIt)->GetMaterial()->GetIndex() == c_GoldMaterialID)
-                {
-                    for (int s = 0; terrMat->GetIndex() == c_GoldMaterialID; ++s)
-                    {
-                        if (s % 2 == 0)
-                            parPos.m_Y -= 1.0;
-                        else
-                            parPos.m_X += (RandomNum() >= 0.5F ? 1.0F : -1.0F);
-                        terrMat = g_SceneMan.GetMaterialFromID(g_SceneMan.GetTerrain()->GetMaterialPixel(parPos.m_X, parPos.m_Y));
-                    }
-                    (*parIt)->SetPos(parPos);
-                }
-
-//                (*parIt)->Draw(g_SceneMan.GetTerrain()->GetFGColorBitmap(), Vector(), g_DrawColor, true);
-//                (*parIt)->Draw(g_SceneMan.GetTerrain()->GetMaterialBitmap(), Vector(), g_DrawMaterial, true);
-                g_SceneMan.GetTerrain()->ApplyMovableObject(*parIt);
-            }
+			if ((*parIt)->GetDrawPriority() >= terrMat->GetPriority()) {
+				int piling = (*parIt)->GetMaterial()->GetPiling();
+				if (piling >= 0) {
+					for (int s = 0; terrMat->GetIndex() == (*parIt)->GetMaterial()->GetIndex() && s < piling; ++s) {
+						if (s % 2 == 0) {
+							parPos.m_Y -= 1.0F;
+						} else {
+							parPos.m_X += (RandomNum() >= 0.5F ? 1.0F : -1.0F);
+						}
+						terrMat = g_SceneMan.GetMaterialFromID(g_SceneMan.GetTerrain()->GetMaterialPixel(parPos.m_X, parPos.m_Y));
+					}
+					(*parIt)->SetPos(parPos);
+				}
+				g_SceneMan.GetTerrain()->ApplyMovableObject(*parIt);
+			}
             delete *(parIt++);
         }
         m_Particles.erase(midIt, m_Particles.end());