svn merge -r15643:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

3 files changed, 32 insertions, 3 deletions

diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
index 37fa465351f..abb71956f5a 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h
@@ -106,6 +106,7 @@ class CcdPhysicsController : public PHY_IPhysicsController
 	btRigidBody* m_body;
 	class PHY_IMotionState*		m_MotionState;
 	btMotionState* 	m_bulletMotionState;
+	friend class CcdPhysicsEnvironment;	// needed when updating the controller
 
 
 	void*		m_newClientInfo;
@@ -194,7 +195,6 @@ class CcdPhysicsController : public PHY_IPhysicsController
 			return m_cci.m_collisionFilterMask;
 		}
 
-
 		virtual void	calcXform() {} ;
 		virtual void SetMargin(float margin) {};
 		virtual float GetMargin() const {return 0.f;};
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
index 7f5457121ea..b773f40650b 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
@@ -466,17 +466,39 @@ void	CcdPhysicsEnvironment::removeCcdPhysicsController(CcdPhysicsController* ctr
 
 }
 
-void	CcdPhysicsEnvironment::updateCcdPhysicsController(CcdPhysicsController* ctrl, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask)
+void	CcdPhysicsEnvironment::updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask)
 {
 	// this function is used when the collisionning group of a controller is changed
 	// remove and add the collistioning object
 	btRigidBody* body = ctrl->GetRigidBody();
+	btVector3 inertia;
 
 	m_dynamicsWorld->removeCollisionObject(body);
 	body->setCollisionFlags(newCollisionFlags);
+	body->getCollisionShape()->calculateLocalInertia(newMass, inertia);
+	body->setMassProps(newMass, inertia);
 	m_dynamicsWorld->addCollisionObject(body, newCollisionGroup, newCollisionMask);
+	// to avoid nasty interaction, we must update the property of the controller as well
+	ctrl->m_cci.m_mass = newMass;
+	ctrl->m_cci.m_collisionFilterGroup = newCollisionGroup;
+	ctrl->m_cci.m_collisionFilterMask = newCollisionMask;
+	ctrl->m_cci.m_collisionFlags = newCollisionFlags;
 }
 
+void CcdPhysicsEnvironment::enableCcdPhysicsController(CcdPhysicsController* ctrl)
+{
+	std::vector<CcdPhysicsController*>::iterator i =
+		std::find(m_controllers.begin(), m_controllers.end(), ctrl);
+	if (i == m_controllers.end())
+	{
+		btRigidBody* body = ctrl->GetRigidBody();
+		m_dynamicsWorld->addCollisionObject(body, 
+			ctrl->GetCollisionFilterGroup(), ctrl->GetCollisionFilterMask());
+	}
+}
+
+
+
 void	CcdPhysicsEnvironment::beginFrame()
 {
 
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
index dff17517b85..453749b27b3 100644
--- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
+++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
@@ -183,7 +183,14 @@ protected:
 
 		void	removeCcdPhysicsController(CcdPhysicsController* ctrl);
 
-		void	updateCcdPhysicsController(CcdPhysicsController* ctrl, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask);
+		void	updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask);
+
+		void	disableCcdPhysicsController(CcdPhysicsController* ctrl)
+		{ 
+			removeCcdPhysicsController(ctrl); 
+		}
+
+		void	enableCcdPhysicsController(CcdPhysicsController* ctrl);
 
 		btBroadphaseInterface*	getBroadphase();