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

2006-08-10 08:18:05 +00:00
parent 3a27e8b1bf
commit 16781831dc
22 changed files with 206 additions and 55 deletions
--- a/BulletDynamics/Dynamics/RigidBody.cpp
+++ b/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);