Fix Bug #1309 Disabling Actor leaves Ghost, Dynamic and Rigid Body etc enabled.

Depth sorting for Transparent polygons.  Use ZTransp in Material buttons to enable.
This will cause an object's polygons to be sorted (back to front for alpha polygons, front to back for solid polygons.)

6 files changed, 148 insertions, 35 deletions

diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
index 8a4ffb3a668..e6bdf9143c9 100644
--- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp
+++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp
@@ -69,6 +69,9 @@ void RAS_BucketManager::RenderAlphaBuckets(
 	std::multiset<alphamesh, backtofront> alphameshset;
 	RAS_MaterialBucket::T_MeshSlotList::iterator mit;
 	
+	/* Camera's near plane equation: cam_norm.dot(point) + cam_origin */
+	const MT_Vector3 cam_norm(cameratrans.getBasis()[2]);
+	const MT_Scalar cam_origin = cameratrans.getOrigin()[2];
 	for (bit = m_AlphaBuckets.begin(); bit != m_AlphaBuckets.end(); ++bit)
 	{
 		(*bit)->ClearScheduledPolygons();
@@ -77,7 +80,7 @@ void RAS_BucketManager::RenderAlphaBuckets(
 			if ((*mit).m_bVisible)
 			{
 				MT_Point3 pos((*mit).m_OpenGLMatrix[12], (*mit).m_OpenGLMatrix[13], (*mit).m_OpenGLMatrix[14]);
-				alphameshset.insert(alphamesh(MT_dot(cameratrans.getBasis()[2], pos) + cameratrans.getOrigin()[2], mit, *bit));
+				alphameshset.insert(alphamesh(MT_dot(cam_norm, pos) + cam_origin, mit, *bit));
 			}
 		}
 	}
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
index 6a202780652..b5b47598b1b 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
@@ -42,7 +42,8 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 									 int tilexrep,
 									 int tileyrep,
 									 int mode,
-									 int transparant,
+									 bool transparant,
+									 bool zsort,
 									 int lightlayer,
 									 bool bIsTriangle,
 									 void* clientobject=NULL) :
@@ -54,6 +55,7 @@ RAS_IPolyMaterial::RAS_IPolyMaterial(const STR_String& texname,
 		m_tileyrep(tileyrep),
 		m_drawingmode (mode),
 		m_transparant(transparant),
+		m_zsort(zsort),
 		m_lightlayer(lightlayer),
 		m_bIsTriangle(bIsTriangle)
 {
@@ -71,6 +73,7 @@ bool RAS_IPolyMaterial::Equals(const RAS_IPolyMaterial& lhs) const
 			this->m_tilexrep	==		lhs.m_tilexrep &&
 			this->m_tileyrep	==		lhs.m_tileyrep &&
 			this->m_transparant	==		lhs.m_transparant &&
+			this->m_zsort		==		lhs.m_zsort &&
 			this->m_drawingmode	==		lhs.m_drawingmode &&
 			this->m_bIsTriangle	==		lhs.m_bIsTriangle &&
 			this->m_lightlayer  ==		lhs.m_lightlayer &&
@@ -117,51 +120,49 @@ bool RAS_IPolyMaterial::Less(const RAS_IPolyMaterial& rhs) const
 	    m_tilexrep > rhs.m_tilexrep)
 	    	return false;
 	
-	return (m_tilexrep < rhs.m_tilexrep ||
-	    m_tile < rhs.m_tile);
+	if (m_tilexrep < rhs.m_tilexrep ||
+	    m_tile < rhs.m_tile)
+	    	return true;
+	
+	return !(m_tile > rhs.m_tile ||
+		m_zsort > rhs.m_zsort);
 }
 
-int RAS_IPolyMaterial::GetLightLayer()
+int RAS_IPolyMaterial::GetLightLayer() const
 {
 	return m_lightlayer;
 }
 
-
-
-bool RAS_IPolyMaterial::IsTransparant()
+bool RAS_IPolyMaterial::IsTransparant() const
 {
-	return (m_transparant != 0);
+	return m_transparant;
 }
 
+bool RAS_IPolyMaterial::IsZSort() const
+{
+	return m_zsort;
+}
 
-
-bool RAS_IPolyMaterial::UsesTriangles()
+bool RAS_IPolyMaterial::UsesTriangles() const
 {
 	return m_bIsTriangle;
 }
 
-
-
 unsigned int RAS_IPolyMaterial::hash() const
 {
 	return m_texturename.hash();
 }
 
-
-
-int RAS_IPolyMaterial::GetDrawingMode()
+int RAS_IPolyMaterial::GetDrawingMode() const
 {
 	return m_drawingmode;
 }
 
-
-
 const STR_String& RAS_IPolyMaterial::GetMaterialName() const
 { 
 	return m_materialname;
 }
 
-
 const STR_String& RAS_IPolyMaterial::GetTextureName() const
 {
 	return m_texturename;
diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
index 7d10f23068b..93c6d829e85 100644
--- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
+++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
@@ -55,7 +55,8 @@ protected:
 	int				m_tile;
 	int				m_tilexrep,m_tileyrep;
 	int				m_drawingmode;	// tface->mode
-	int				m_transparant;
+	bool				m_transparant;
+	bool				m_zsort;
 	int				m_lightlayer;
 	bool				m_bIsTriangle;
 	
@@ -84,7 +85,8 @@ public:
 					  int tilexrep,
 					  int tileyrep,
 					  int mode,
-					  int transparant,
+					  bool transparant,
+					  bool zsort,
 					  int lightlayer,
 					  bool bIsTriangle,
 					  void* clientobject);
@@ -108,11 +110,12 @@ public:
 
 	bool				Equals(const RAS_IPolyMaterial& lhs) const;
 	bool				Less(const RAS_IPolyMaterial& rhs) const;
-	int					GetLightLayer();
-	bool				IsTransparant();
-	bool				UsesTriangles();
+	int					GetLightLayer() const;
+	bool				IsTransparant() const;
+	bool				IsZSort() const;
+	bool				UsesTriangles() const;
 	unsigned int		hash() const;
-	int					GetDrawingMode();
+	int					GetDrawingMode() const;
 	const STR_String&	GetMaterialName() const;
 	const STR_String&	GetTextureName() const;
 };
diff --git a/source/gameengine/Rasterizer/RAS_IRenderTools.h b/source/gameengine/Rasterizer/RAS_IRenderTools.h
index 47246d60c5c..fa3c777553d 100644
--- a/source/gameengine/Rasterizer/RAS_IRenderTools.h
+++ b/source/gameengine/Rasterizer/RAS_IRenderTools.h
@@ -184,7 +184,8 @@ public:
 		int tilexrep,
 		int tileyrep,
 		int mode,
-		int transparant,
+		bool transparant,
+		bool zsort,
 		int lightlayer,
 		bool bIsTriangle,
 		void* clientobject,
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
index 7ff43b53a65..c048479a46e 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp
@@ -29,13 +29,15 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "RAS_MeshObject.h"
 #include "RAS_IRasterizer.h"
 #include "MT_MinMax.h"
+#include "MT_Point3.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 STR_String RAS_MeshObject::s_emptyname = "";
 
@@ -67,6 +69,7 @@ KX_ArrayOptimizer::~KX_ArrayOptimizer()
 RAS_MeshObject::RAS_MeshObject(int lightlayer)
 	: m_bModified(true),
 	m_lightlayer(lightlayer),
+	m_zsort(false),
 	m_class(0)
 {
 }
@@ -550,9 +553,65 @@ void RAS_MeshObject::UpdateMaterialList()
 	}
 }
 
+RAS_MeshObject::polygonSlot::polygonSlot(const MT_Vector3 &pnorm, const MT_Scalar &pval, RAS_MeshObject *mesh, RAS_Polygon* poly) :
+			m_poly(poly)
+{
+	const KX_VertexIndex &base = m_poly->GetIndexBase();
+	RAS_TexVert *vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[0], poly->GetMaterial()->GetPolyMaterial());
+	m_z = MT_dot(pnorm, vert->getLocalXYZ()) + pval;
+	
+	for( unsigned int i = 1; i < m_poly->VertexCount(); i++)
+	{
+		vert = mesh->GetVertex(base.m_vtxarray, base.m_indexarray[i], poly->GetMaterial()->GetPolyMaterial());
+		float z = MT_dot(pnorm, vert->getLocalXYZ()) + pval;
+		if (z > m_z)
+			m_z = z;
+	}
+}
 
+void RAS_MeshObject::SortPolygons(const MT_Transform &transform)
+{
+	
+	const MT_Vector3 pnorm(transform.getBasis()[2]);
+	const MT_Scalar pval = transform.getOrigin()[2];
+	
+	unsigned int numpolys = m_Polygons.size();
+	std::multiset<polygonSlot, backtofront> alphapolyset;
+	std::multiset<polygonSlot, fronttoback> solidpolyset;
+	
+	for (unsigned int p = 0; p < numpolys; p++)
+	{
+		RAS_Polygon* poly = m_Polygons[p];
+		if (poly->IsVisible())
+		{
+			if (poly->GetMaterial()->GetPolyMaterial()->IsTransparant())
+			{
+				alphapolyset.insert(polygonSlot(pnorm, pval, this, poly));
+			} else {
+				solidpolyset.insert(polygonSlot(pnorm, pval, this, poly));
+			}
+		}
+	}
+	
+	for (RAS_MaterialBucket::Set::iterator it = m_materials.begin();it!=m_materials.end();++it)
+	{
+		vector<KX_IndexArray*> *indexcache = &GetArrayOptimizer((*it)->GetPolyMaterial())->m_IndexArrayCache1;
+		for (vector<KX_IndexArray*>::iterator iit = indexcache->begin(); iit != indexcache->end(); ++iit)
+			(*iit)->clear();
+	}
+
+	//ClearArrayData();
+	
+	std::multiset<polygonSlot, fronttoback>::iterator sit = solidpolyset.begin();
+	for (; sit != solidpolyset.end(); ++sit)
+		SchedulePoly((*sit).m_poly->GetVertexIndexBase(), (*sit).m_poly->VertexCount(), (*sit).m_poly->GetMaterial()->GetPolyMaterial());
+	
+	std::multiset<polygonSlot, backtofront>::iterator ait = alphapolyset.begin();
+	for (; ait != alphapolyset.end(); ++ait)
+		SchedulePoly((*ait).m_poly->GetVertexIndexBase(), (*ait).m_poly->VertexCount(), (*ait).m_poly->GetMaterial()->GetPolyMaterial());
+}
 
-void RAS_MeshObject::SchedulePolygons(int drawingmode,RAS_IRasterizer* rasty)
+void RAS_MeshObject::SchedulePolygons(const MT_Transform &transform, int drawingmode,RAS_IRasterizer* rasty)
 {
 //	int nummaterials = m_materials.size();
 	int i;
@@ -564,6 +623,8 @@ void RAS_MeshObject::SchedulePolygons(int drawingmode,RAS_IRasterizer* rasty)
 			RAS_MaterialBucket* bucket = *it;
 
 			bucket->SchedulePolygons(drawingmode);
+			if (bucket->GetPolyMaterial()->IsZSort())
+				m_zsort = true;
 		}
 
 		int numpolys = m_Polygons.size();
@@ -582,17 +643,24 @@ void RAS_MeshObject::SchedulePolygons(int drawingmode,RAS_IRasterizer* rasty)
 		}
 		else
 		{
-			for (i=0;i<numpolys;i++)
+			if (!m_zsort)
 			{
-				RAS_Polygon* poly = m_Polygons[i];
-				if (poly->IsVisible())
+				for (i=0;i<numpolys;i++)
 				{
-					SchedulePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetMaterial()->GetPolyMaterial());
+					RAS_Polygon* poly = m_Polygons[i];
+					if (poly->IsVisible())
+					{
+						SchedulePoly(poly->GetVertexIndexBase(),poly->VertexCount(),poly->GetMaterial()->GetPolyMaterial());
+					}
 				}
 			}
 		}
 
 		m_bModified = false;
 	} 
-	//	}
+	
+	if (m_zsort)
+	{
+		SortPolygons(transform);
+	}
 }
diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h
index 335e9784553..9058fe4d31f 100644
--- a/source/gameengine/Rasterizer/RAS_MeshObject.h
+++ b/source/gameengine/Rasterizer/RAS_MeshObject.h
@@ -135,6 +135,40 @@ class RAS_MeshObject
 	vector<class RAS_Polygon*> 	m_Polygons;
 	STR_String					m_name;
 	static STR_String			s_emptyname;
+	bool					m_zsort;
+	
+	struct polygonSlot
+	{
+		float        m_z;
+		RAS_Polygon *m_poly;
+			
+		polygonSlot(float z, RAS_Polygon* poly) :
+			m_z(z),
+			m_poly(poly)
+		{}
+		/**
+		 * pnorm and pval form the plane equation that the distance from is used to
+		 * sort against.
+		 */
+		polygonSlot(const MT_Vector3 &pnorm, const MT_Scalar &pval, RAS_MeshObject* mesh, RAS_Polygon* poly);
+	};
+		
+	struct backtofront
+	{
+		bool operator()(const polygonSlot &a, const polygonSlot &b) const
+		{
+			return a.m_z < b.m_z;
+		}
+	};
+	
+	struct fronttoback
+	{
+		bool operator()(const polygonSlot &a, const polygonSlot &b) const
+		{
+			return a.m_z > b.m_z;
+		}
+	};
+
 	
 protected:
 	GEN_Map<class RAS_IPolyMaterial,KX_ArrayOptimizer*> m_matVertexArrayS;
@@ -184,7 +218,10 @@ public:
 
 	void				DebugColor(unsigned int abgr);
 	
+	void SortPolygons(const MT_Transform &transform);
+
 	void				SchedulePolygons(
+							const MT_Transform &transform,
 							int drawingmode,
 							class RAS_IRasterizer* rasty
 						);