improved game soft bodies, works for objects that are using 'set smooth'

use shape matching by default for game soft bodies
store soft body index for game vertices

1 files changed, 86 insertions, 94 deletions

diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
index c4411a58856..5744a860e92 100644
--- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
+++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
@@ -667,6 +667,85 @@ void	KX_ConvertODEEngineObject(KX_GameObject* gameobj,
 #endif //WIN32
 
 
+							
+	class KX_SoftBodyDeformer : public RAS_Deformer
+	{
+		btSoftBody*	m_softBody;
+		class RAS_MeshObject*	m_pMeshObject;
+		class BL_DeformableGameObject*	m_gameobj;
+
+
+	public:
+		KX_SoftBodyDeformer(btSoftBody* softBody,RAS_MeshObject*	pMeshObject,BL_DeformableGameObject*	gameobj)
+			: m_softBody(softBody),
+			m_pMeshObject(pMeshObject),
+			m_gameobj(gameobj)
+		{
+			//printf("KX_SoftBodyDeformer\n");
+		};
+
+		virtual ~KX_SoftBodyDeformer()
+		{
+			//printf("~KX_SoftBodyDeformer\n");
+		};
+		virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
+		{
+			//printf("relink\n");
+		}
+		virtual bool Apply(class RAS_IPolyMaterial *polymat)
+		{
+			//printf("apply\n");
+			RAS_MeshSlot::iterator it;
+			RAS_MeshMaterial *mmat;
+			RAS_MeshSlot *slot;
+			size_t i;
+
+			// update the vertex in m_transverts
+			Update();
+
+			// The vertex cache can only be updated for this deformer:
+			// Duplicated objects with more than one ploymaterial (=multiple mesh slot per object)
+			// share the same mesh (=the same cache). As the rendering is done per polymaterial
+			// cycling through the objects, the entire mesh cache cannot be updated in one shot.
+			mmat = m_pMeshObject->GetMeshMaterial(polymat);
+			if(!mmat->m_slots[(void*)m_gameobj])
+				return true;
+
+			slot = *mmat->m_slots[(void*)m_gameobj];
+
+			// for each array
+			for(slot->begin(it); !slot->end(it); slot->next(it)) 
+			{
+				btSoftBody::tNodeArray&   nodes(m_softBody->m_nodes);
+
+				int index = 0;
+				for(i=it.startvertex; i<it.endvertex; i++,index++) {
+					RAS_TexVert& v = it.vertex[i];
+
+					MT_Point3 pt (
+						nodes[v.getSoftBodyIndex()].m_x.getX(),
+						nodes[v.getSoftBodyIndex()].m_x.getY(),
+						nodes[v.getSoftBodyIndex()].m_x.getZ());
+					v.SetXYZ(pt);
+				}
+			}
+			return true;
+		}
+		virtual bool Update(void)
+		{
+			//printf("update\n");
+			return true;//??
+		}
+		virtual RAS_Deformer *GetReplica()
+		{
+			//printf("getReplica\n");
+			return 0;
+		}
+	protected:
+		//class RAS_MeshObject	*m_pMesh;
+	};
+
+
 // forward declarations
 
 void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
@@ -916,6 +995,11 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 	ci.m_angularDamping = 1.f - shapeprops->m_ang_drag;
 	//need a bit of damping, else system doesn't behave well
 	ci.m_inertiaFactor = shapeprops->m_inertia/0.4f;//defaults to 0.4, don't want to change behaviour
+	ci.m_linearStiffness = objprop->m_linearStiffness;
+	ci.m_angularStiffness= objprop->m_angularStiffness;
+	ci.m_volumePreservation= objprop->m_volumePreservation;
+	ci.m_gamesoftFlag = objprop->m_gamesoftFlag;
+
 	ci.m_collisionFilterGroup = (isbulletdyna) ? short(CcdConstructionInfo::DefaultFilter) : short(CcdConstructionInfo::StaticFilter);
 	ci.m_collisionFilterMask = (isbulletdyna) ? short(CcdConstructionInfo::AllFilter) : short(CcdConstructionInfo::AllFilter ^ CcdConstructionInfo::StaticFilter);
 	ci.m_bRigid = objprop->m_dyna && objprop->m_angular_rigidbody;
@@ -990,107 +1074,15 @@ void	KX_ConvertBulletObject(	class	KX_GameObject* gameobj,
 
 	physicscontroller->SetObject(gameobj->GetSGNode());
 
-	class KX_SoftBodyDeformer : public RAS_Deformer
-	{
-		btSoftBody*	m_softBody;
-		class BL_SkinMeshObject*	m_pMeshObject;
-		class BL_DeformableGameObject*	m_gameobj;
-
-
-	public:
-		KX_SoftBodyDeformer(btSoftBody* softBody,BL_SkinMeshObject*	pMeshObject,BL_DeformableGameObject*	gameobj)
-			: m_softBody(softBody),
-			m_pMeshObject(pMeshObject),
-			m_gameobj(gameobj)
-		{
-			//printf("KX_SoftBodyDeformer\n");
-		};
-
-		virtual ~KX_SoftBodyDeformer()
-		{
-			//printf("~KX_SoftBodyDeformer\n");
-		};
-		virtual void Relink(GEN_Map<class GEN_HashedPtr, void*>*map)
-		{
-			//printf("relink\n");
-		}
-		virtual bool Apply(class RAS_IPolyMaterial *polymat)
-		{
-			//printf("apply\n");
-			RAS_MeshSlot::iterator it;
-			RAS_MeshMaterial *mmat;
-			RAS_MeshSlot *slot;
-			size_t i;
-
-			// update the vertex in m_transverts
-			Update();
-
-			// The vertex cache can only be updated for this deformer:
-			// Duplicated objects with more than one ploymaterial (=multiple mesh slot per object)
-			// share the same mesh (=the same cache). As the rendering is done per polymaterial
-			// cycling through the objects, the entire mesh cache cannot be updated in one shot.
-			mmat = m_pMeshObject->GetMeshMaterial(polymat);
-			if(!mmat->m_slots[(void*)m_gameobj])
-				return true;
-
-			slot = *mmat->m_slots[(void*)m_gameobj];
-
-			// for each array
-			for(slot->begin(it); !slot->end(it); slot->next(it)) 
-			{
-				// for each vertex
-				// copy the untransformed data from the original mvert
-				int count = 0;
-				{
-
-					for(i=it.startvertex; i<it.endvertex; i++,count++)
-					{
-					}
-				}
-				btSoftBody::tNodeArray&   nodes(m_softBody->m_nodes);
-
-				if (count == m_softBody->m_userIndexMapping.size())
-				{
-					int index = 0;
-					for(i=it.startvertex; i<it.endvertex; i++,index++) {
-						RAS_TexVert& v = it.vertex[i];
-
-						MT_Point3 pt (
-							nodes[m_softBody->m_userIndexMapping[index]].m_x.getX(),
-							nodes[m_softBody->m_userIndexMapping[index]].m_x.getY(),
-							nodes[m_softBody->m_userIndexMapping[index]].m_x.getZ());
-						v.SetXYZ(pt);
-
-						//(m_transverts[v.getOrigIndex()]);
-					}
-				}
-
-			}
-
-			return true;
-		}
-		virtual bool Update(void)
-		{
-			//printf("update\n");
-			return true;//??
-		}
-		virtual RAS_Deformer *GetReplica()
-		{
-			//printf("getReplica\n");
-			return 0;
-		}
-	protected:
-		//class RAS_MeshObject	*m_pMesh;
-	};
 
 	///test for soft bodies
 	if (objprop->m_softbody && physicscontroller)
 	{
 		btSoftBody* softBody = physicscontroller->GetSoftBody();
-		if (softBody && gameobj->GetMesh(0))
+		if (softBody && gameobj->GetMesh(0))//only the first mesh, if any
 		{
 			//should be a mesh then, so add a soft body deformer
-			KX_SoftBodyDeformer* softbodyDeformer = new KX_SoftBodyDeformer(softBody, (BL_SkinMeshObject*)gameobj->GetMesh(0),(BL_DeformableGameObject*)gameobj);
+			KX_SoftBodyDeformer* softbodyDeformer = new KX_SoftBodyDeformer(softBody, gameobj->GetMesh(0),(BL_DeformableGameObject*)gameobj);
 			gameobj->SetDeformer(softbodyDeformer);
 			
 		}