added python binding for debugdraw,

tweaked friction, some more preparations but no real functionality added yet

4 files changed, 12 insertions, 10 deletions

diff --git a/extern/bullet/Bullet/Bullet3_vc7.vcproj b/extern/bullet/Bullet/Bullet3_vc7.vcproj
index fcfc0ffb2ff..dab745810a0 100644
--- a/extern/bullet/Bullet/Bullet3_vc7.vcproj
+++ b/extern/bullet/Bullet/Bullet3_vc7.vcproj
@@ -391,9 +391,6 @@ ECHO Done
 				RelativePath="..\LinearMath\GEN_random.h">
 			</File>
 			<File
-				RelativePath="..\LinearMath\IDebugDraw.h">
-			</File>
-			<File
 				RelativePath="..\LinearMath\SimdMatrix3x3.h">
 			</File>
 			<File
diff --git a/extern/bullet/Bullet/Bullet3_vc8.vcproj b/extern/bullet/Bullet/Bullet3_vc8.vcproj
index 125b4b6e0b1..b9046f451e5 100644
--- a/extern/bullet/Bullet/Bullet3_vc8.vcproj
+++ b/extern/bullet/Bullet/Bullet3_vc8.vcproj
@@ -509,6 +509,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\LinearMath\IDebugDraw.h"
+				>
+			</File>
+			<File
 				RelativePath="..\LinearMath\SimdMatrix3x3.h"
 				>
 			</File>
diff --git a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp
index b0f26a343d5..bc89bd34c38 100644
--- a/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp
+++ b/extern/bullet/BulletDynamics/Dynamics/ContactJoint.cpp
@@ -3,6 +3,9 @@
 #include "NarrowPhaseCollision/PersistentManifold.h"
 
 
+//this constant needs to be set up so different solvers give 'similar' results
+#define FRICTION_CONSTANT 120.f
+
 
 ContactJoint::ContactJoint(PersistentManifold* manifold,int index,bool swap,RigidBody* body0,RigidBody* body1)
 :m_manifold(manifold),
@@ -15,9 +18,6 @@ m_body1(body1)
 
 int m_numRows = 3;
 
-//float gContactFrictionFactor  = 0.f;//12.f;//30.5f;//100.f;//1e30f;//2.9f;
-
-
 
 void ContactJoint::GetInfo1(Info1 *info)
 {
@@ -150,7 +150,8 @@ void ContactJoint::GetInfo2(Info2 *info)
 	c2[1] = ccc2[1];
 	c2[2] = ccc2[2];
 	
-	float friction = 20.f*m_body0->getFriction() * m_body1->getFriction();
+	
+	float friction = FRICTION_CONSTANT*m_body0->getFriction() * m_body1->getFriction();
 	
 	// first friction direction
 	if (m_numRows >= 2) 
diff --git a/extern/bullet/LinearMath/SimdQuadWord.h b/extern/bullet/LinearMath/SimdQuadWord.h
index f256a215559..818b2e6007d 100644
--- a/extern/bullet/LinearMath/SimdQuadWord.h
+++ b/extern/bullet/LinearMath/SimdQuadWord.h
@@ -91,15 +91,15 @@ class	SimdQuadWord
 			m_unusedW=w;
 		}
 
-		SIMD_FORCE_INLINE SimdQuadWord() 
-		:m_x(0.f),m_y(0.f),m_z(0.f),m_unusedW(0.f)
+		SIMD_FORCE_INLINE SimdQuadWord() :
+		m_x(0.f),m_y(0.f),m_z(0.f),m_unusedW(0.f)
 		{
 		}
 
 		SIMD_FORCE_INLINE SimdQuadWord(const SimdScalar& x, const SimdScalar& y, const SimdScalar& z) 
 		:m_x(x),m_y(y),m_z(z)
 		//todo, remove this in release/simd ?
-		,m_unusedW(0.f)
+		,m_unusedW(1e30f)
 		{
 		}