added initial support for per-triangle material properties in a non-convex mesh. needs testing.

BulletDynamics/Dynamics/ContactJoint.cpp

@@ -178,7 +178,7 @@ void ContactJoint::GetInfo2(Info2 *info)
 	c2[1] = relativePositionB[1];
 	c2[2] = relativePositionB[2];
 	
-	
+	//combined friction is available in the contact point
 	float friction = FRICTION_CONSTANT*m_body0->getFriction() * m_body1->getFriction();
 	
 	// first friction direction

BulletDynamics/Dynamics/RigidBody.cpp

@@ -32,10 +32,13 @@ RigidBody::RigidBody( const MassProps& massProps,SimdScalar linearDamping,SimdSc
 	m_angularVelocity(0.f,0.f,0.f),
 	m_linearDamping(0.f),
 	m_angularDamping(0.5f),
-	m_friction(friction),
-	m_restitution(restitution),
 	m_kinematicTimeStep(0.f)
 {
+
+	//moved to CollisionObject
+	m_friction = friction;
+	m_restitution = restitution;
+
 	m_debugBodyId = uniqueId++;
 	
 	setMassProps(massProps.m_mass, massProps.m_inertiaLocal);

BulletDynamics/Dynamics/RigidBody.h

@@ -172,22 +172,7 @@ public:
 	void	getAabb(SimdVector3& aabbMin,SimdVector3& aabbMax) const;
 
 
-	void	setRestitution(float rest)
-	{
-		m_restitution = rest;
-	}
-	float	getRestitution() const
-	{
-		return m_restitution;
-	}
-	void	setFriction(float frict)
-	{
-		m_friction = frict;
-	}
-	float	getFriction() const
-	{
-		return m_friction;
-	}
+
 
 	
 	inline float ComputeImpulseDenominator(const SimdPoint3& pos, const SimdVector3& normal) const
@@ -227,8 +212,6 @@ private:
 	SimdScalar		m_angularDamping;
 	SimdScalar		m_inverseMass;
 
-	SimdScalar		m_friction;
-	SimdScalar		m_restitution;
 
 	SimdScalar		m_kinematicTimeStep;