Sync with Apricot Game Engine

=============================

* Clean up and optimizations in skinned/deformed mesh code.
* Compatibility fixes and clean up in the rasterizer.
* Changes related to GLSL shadow buffers which should have no
  effect, to keep the code in sync with apricot.

1 files changed, 11 insertions, 3 deletions

diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index 8d8b56b1eed..e9f7f0b192f 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -40,19 +40,25 @@
 #pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
 #endif //WIN32
 
+class BL_DeformableGameObject;
+
 class BL_MeshDeformer : public RAS_Deformer
 {
 public:
 	void VerifyStorage();
 	void RecalcNormals();
 	virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map){};
-	BL_MeshDeformer(struct Object* obj, class BL_SkinMeshObject *meshobj ):
+	BL_MeshDeformer(BL_DeformableGameObject *gameobj,
+					struct Object* obj,
+					class BL_SkinMeshObject *meshobj ):
 		m_pMeshObject(meshobj),
 		m_bmesh((struct Mesh*)(obj->data)),
 		m_transverts(0),
 		m_transnors(0),
 		m_objMesh(obj),
-		m_tvtot(0)
+		m_tvtot(0),
+		m_gameobj(gameobj),
+		m_lastDeformUpdate(-1)
 	{};
 	virtual ~BL_MeshDeformer();
 	virtual void SetSimulatedTime(double time){};
@@ -68,10 +74,12 @@ protected:
 	// this is so m_transverts doesn't need to be converted
 	// before deformation
 	float						(*m_transverts)[3];
-	MT_Vector3*					m_transnors;
+	float 						(*m_transnors)[3];
 	struct Object*				m_objMesh; 
 	// --
 	int							m_tvtot;
+	BL_DeformableGameObject*	m_gameobj;
+	double					 	m_lastDeformUpdate;
 };
 
 #endif