[Bf-blender-cvs] [2270db6] temp-bge-cleanup: Special cleanup for BL_MeshDeformer

Porteries Tristan noreply at git.blender.org
Mon May 4 21:07:42 CEST 2015


Commit: 2270db68880bc6fb58c021fdc714a0ff951c4863
Author: Porteries Tristan
Date:   Mon May 4 21:00:47 2015 +0200
Branches: temp-bge-cleanup
https://developer.blender.org/rB2270db68880bc6fb58c021fdc714a0ff951c4863

Special cleanup for BL_MeshDeformer

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

M	source/gameengine/Converter/BL_MeshDeformer.cpp
M	source/gameengine/Converter/BL_MeshDeformer.h

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

diff --git a/source/gameengine/Converter/BL_MeshDeformer.cpp b/source/gameengine/Converter/BL_MeshDeformer.cpp
index 2ac26f1..4eeeefa 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.cpp
+++ b/source/gameengine/Converter/BL_MeshDeformer.cpp
@@ -236,4 +236,3 @@ void BL_MeshDeformer::VerifyStorage()
 		m_tvtot = m_bmesh->totvert;
 	}
 }
-
diff --git a/source/gameengine/Converter/BL_MeshDeformer.h b/source/gameengine/Converter/BL_MeshDeformer.h
index ac8cb45..d08878a 100644
--- a/source/gameengine/Converter/BL_MeshDeformer.h
+++ b/source/gameengine/Converter/BL_MeshDeformer.h
@@ -43,6 +43,11 @@
 #endif
 
 class BL_DeformableGameObject;
+class CTR_HashedPtr;
+class RAS_MeshObject;
+class RAS_IPolyMaterial;
+struct Mesh;
+struct Object;
 
 class BL_MeshDeformer : public RAS_Deformer
 {
@@ -50,11 +55,12 @@ public:
 	void VerifyStorage();
 	void RecalcNormals();
 	virtual void Relink(CTR_Map<class CTR_HashedPtr, void *> *map);
+
 	BL_MeshDeformer(BL_DeformableGameObject *gameobj,
-	                struct Object *obj,
-					class RAS_MeshObject *meshobj) :
+	                Object *obj,
+					RAS_MeshObject *meshobj) :
 		m_pMeshObject(meshobj),
-		m_bmesh((struct Mesh *)(obj->data)),
+		m_bmesh((Mesh *)(obj->data)),
 		m_transverts(0),
 		m_transnors(0),
 		m_objMesh(obj),
@@ -62,39 +68,46 @@ public:
 		m_gameobj(gameobj),
 		m_lastDeformUpdate(-1)
 	{
-	};
+	}
 	virtual ~BL_MeshDeformer();
-	virtual void SetSimulatedTime(double time) {
+
+	virtual void SetSimulatedTime(double time)
+	{
 	}
-	virtual bool Apply(class RAS_IPolyMaterial *mat);
-	virtual bool Update(void) {
+	virtual bool Apply(RAS_IPolyMaterial *mat);
+	virtual bool Update(void)
+	{
 		return false;
 	}
-	virtual bool UpdateBuckets(void) {
+	virtual bool UpdateBuckets(void)
+	{
 		return false;
 	}
-	virtual RAS_Deformer *GetReplica() {
+	virtual RAS_Deformer *GetReplica()
+	{
 		return NULL;
 	}
 	virtual void ProcessReplica();
-	struct Mesh *GetMesh() {
+	Mesh *GetMesh()
+	{
 		return m_bmesh;
 	}
-	virtual class RAS_MeshObject *GetRasMesh() {
+	virtual RAS_MeshObject *GetRasMesh()
+	{
 		return m_pMeshObject;
 	}
 	virtual float(*GetTransVerts(int *tot))[3]    {   *tot = m_tvtot; return m_transverts; }
 	//	virtual void InitDeform(double time) {}
 
 protected:
-	class RAS_MeshObject *m_pMeshObject;
-	struct Mesh *m_bmesh;
+	RAS_MeshObject *m_pMeshObject;
+	Mesh *m_bmesh;
 
 	// this is so m_transverts doesn't need to be converted
 	// before deformation
 	float(*m_transverts)[3];
 	float(*m_transnors)[3];
-	struct Object *m_objMesh;
+	Object *m_objMesh;
 	// --
 	int m_tvtot;
 	BL_DeformableGameObject *m_gameobj;
@@ -107,4 +120,3 @@ protected:
 };
 
 #endif
-




More information about the Bf-blender-cvs mailing list