minor tweaks to demos: enable constraint debug drawing in AllBulletDemos, default constraint debugging size set to 0.3,

set svn:eol-style native for folder files
http://code.google.com/p/bullet/issues/detail?id=191

Demos/AllBulletDemos/DemoEntries.cpp

@@ -103,13 +103,13 @@ public:
 btDemoEntry g_demoEntries[] =
 {
 
-
+	{"ConstraintDemo",ConstraintDemo::Create},
 	{"ForkLift Demo",ForkLiftDemo::Create},
 	{"Ragdoll Demo",RagdollDemo::Create},
 	{"Basic Demo", BasicDemo::Create},	
 	{"Convex Decomposition",ConvexDecompositionDemo::Create},
 	{"Concave Moving", GimpactConcaveDemo::Create},
-	{"Dynamic Control Demo",MotorDemo::Create},
+//	{"Dynamic Control Demo",MotorDemo::Create},
 	//{"ConcaveDemo",ConcaveDemo::Create},
 	{"Concave Convexcast Demo",ConcaveConvexcastDemo::Create},
 	//	{"SoftBody Cloth",SoftDemo0::Create},

Demos/AllBulletDemos/Main.cpp

@@ -52,6 +52,7 @@ namespace
 	int	gDrawAabb;
 	int	gWireFrame;
 	int gHelpText;
+	int gDebugConstraints;
 	int	gDebugContacts;
 	int	gDrawTextures=1;
 	int gDrawShadows=0;
@@ -80,6 +81,14 @@ void	setDefaultSettings()
 	gDrawAabb=0;
 	gWireFrame=0;
 	gDebugContacts=0;
+	//enable constraint debug visualization for first demo, only if user hasn't overridden the setting
+	if (testSelection>1)
+	{
+		gDebugConstraints=0;
+	} else
+	{
+		 gDebugConstraints=1;
+	}
 	gHelpText = 0;
 	gDrawTextures=1;
 	gDrawShadows=0;
@@ -118,6 +127,14 @@ void	ResetScene()
 void	NextScene()
 {
 	testSelection++;
+	if (testSelection>1)
+        {
+                gDebugConstraints=0;
+        } else
+        {
+                 gDebugConstraints=1;
+        }
+
 	if(testSelection>23)
 		testSelection=0;
 	if (glui)
@@ -216,6 +233,13 @@ void SimulationLoop()
 	{
 		demo->setDebugMode(demo->getDebugMode() |btIDebugDraw::DBG_NoHelpText);
 	}
+	if (gDebugConstraints)
+	{
+		 demo->setDebugMode(demo->getDebugMode() |btIDebugDraw::DBG_DrawConstraints+btIDebugDraw::DBG_DrawConstraintLimits);
+	} else
+	{
+		demo->setDebugMode(demo->getDebugMode() & (~btIDebugDraw::DBG_DrawConstraints+btIDebugDraw::DBG_DrawConstraintLimits));
+	}
 	if (gDebugContacts)
 	{
 		demo->setDebugMode(demo->getDebugMode() |btIDebugDraw::DBG_DrawContactPoints);
@@ -281,6 +305,14 @@ void SimulationLoop()
 	}
 	if (testSelection != testIndex)
 	{
+		if (testSelection>1)
+	        {
+                gDebugConstraints=0;
+        	} else
+        	{
+               	  gDebugConstraints=1;
+        	}
+
 		testIndex = testSelection;
 		if (demo->getDynamicsWorld() && demo->getDynamicsWorld()->getDebugDrawer())
 			delete demo->getDynamicsWorld()->getDebugDrawer();
@@ -464,6 +496,7 @@ int main(int argc, char** argv)
 	glui->add_checkbox_to_panel(drawPanel, "AABBs", &gDrawAabb);
 	glui->add_checkbox_to_panel(drawPanel, "Wireframe", &gWireFrame);
 	glui->add_checkbox_to_panel(drawPanel, "Contacts", &gDebugContacts);
+	glui->add_checkbox_to_panel(drawPanel, "Constraints", &gDebugConstraints);
 
 	glui->add_checkbox_to_panel(drawPanel, "Textures", &gDrawTextures);
 	glui->add_checkbox_to_panel(drawPanel, "Shadows", &gDrawShadows);

Demos/ColladaDemo/ColladaDemo.cpp

@@ -76,7 +76,7 @@ int main(int argc,char** argv)
 
 	/// Import Collada 1.4 Physics objects
 	/// also can pass filename in as argument
-	const char* filename = "boxc4d.dae";
+	const char* filename = "jenga.dae";
 	printf("argc=%i\n",argc);
 	{
 		for (int i=0;i<argc;i++)

Demos/RagdollDemo/RagdollDemo.cpp

@@ -16,6 +16,8 @@ subject to the following restrictions:
 Written by: Marten Svanfeldt
 */
 
+#define CONSTRAINT_DEBUG_SIZE 0.2f
+
 
 #include "btBulletDynamicsCommon.h"
 #include "GlutStuff.h"
@@ -197,6 +199,8 @@ public:
 		hingeC =  new btHingeConstraint(*m_bodies[BODYPART_PELVIS], *m_bodies[BODYPART_SPINE], localA, localB);
 		hingeC->setLimit(btScalar(-M_PI_4), btScalar(M_PI_2));
 		m_joints[JOINT_PELVIS_SPINE] = hingeC;
+		hingeC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_PELVIS_SPINE], true);
 
 
@@ -206,6 +210,8 @@ public:
 		coneC = new btConeTwistConstraint(*m_bodies[BODYPART_SPINE], *m_bodies[BODYPART_HEAD], localA, localB);
 		coneC->setLimit(M_PI_4, M_PI_4, M_PI_2);
 		m_joints[JOINT_SPINE_HEAD] = coneC;
+		coneC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_SPINE_HEAD], true);
 
 
@@ -215,6 +221,8 @@ public:
 		coneC = new btConeTwistConstraint(*m_bodies[BODYPART_PELVIS], *m_bodies[BODYPART_LEFT_UPPER_LEG], localA, localB);
 		coneC->setLimit(M_PI_4, M_PI_4, 0);
 		m_joints[JOINT_LEFT_HIP] = coneC;
+		coneC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_LEFT_HIP], true);
 
 		localA.setIdentity(); localB.setIdentity();
@@ -223,6 +231,8 @@ public:
 		hingeC =  new btHingeConstraint(*m_bodies[BODYPART_LEFT_UPPER_LEG], *m_bodies[BODYPART_LEFT_LOWER_LEG], localA, localB);
 		hingeC->setLimit(btScalar(0), btScalar(M_PI_2));
 		m_joints[JOINT_LEFT_KNEE] = hingeC;
+		hingeC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_LEFT_KNEE], true);
 
 
@@ -232,6 +242,8 @@ public:
 		coneC = new btConeTwistConstraint(*m_bodies[BODYPART_PELVIS], *m_bodies[BODYPART_RIGHT_UPPER_LEG], localA, localB);
 		coneC->setLimit(M_PI_4, M_PI_4, 0);
 		m_joints[JOINT_RIGHT_HIP] = coneC;
+		coneC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_RIGHT_HIP], true);
 
 		localA.setIdentity(); localB.setIdentity();
@@ -240,6 +252,8 @@ public:
 		hingeC =  new btHingeConstraint(*m_bodies[BODYPART_RIGHT_UPPER_LEG], *m_bodies[BODYPART_RIGHT_LOWER_LEG], localA, localB);
 		hingeC->setLimit(btScalar(0), btScalar(M_PI_2));
 		m_joints[JOINT_RIGHT_KNEE] = hingeC;
+		hingeC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_RIGHT_KNEE], true);
 
 
@@ -248,6 +262,8 @@ public:
 		localB.getBasis().setEulerZYX(0,0,M_PI_2); localB.setOrigin(btVector3(btScalar(0.), btScalar(-0.18), btScalar(0.)));
 		coneC = new btConeTwistConstraint(*m_bodies[BODYPART_SPINE], *m_bodies[BODYPART_LEFT_UPPER_ARM], localA, localB);
 		coneC->setLimit(M_PI_2, M_PI_2, 0);
+		coneC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_joints[JOINT_LEFT_SHOULDER] = coneC;
 		m_ownerWorld->addConstraint(m_joints[JOINT_LEFT_SHOULDER], true);
 
@@ -258,6 +274,8 @@ public:
 //		hingeC->setLimit(btScalar(-M_PI_2), btScalar(0));
 		hingeC->setLimit(btScalar(0), btScalar(M_PI_2));
 		m_joints[JOINT_LEFT_ELBOW] = hingeC;
+		hingeC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_LEFT_ELBOW], true);
 
 
@@ -268,6 +286,8 @@ public:
 		coneC = new btConeTwistConstraint(*m_bodies[BODYPART_SPINE], *m_bodies[BODYPART_RIGHT_UPPER_ARM], localA, localB);
 		coneC->setLimit(M_PI_2, M_PI_2, 0);
 		m_joints[JOINT_RIGHT_SHOULDER] = coneC;
+		coneC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_RIGHT_SHOULDER], true);
 
 		localA.setIdentity(); localB.setIdentity();
@@ -277,6 +297,8 @@ public:
 //		hingeC->setLimit(btScalar(-M_PI_2), btScalar(0));
 		hingeC->setLimit(btScalar(0), btScalar(M_PI_2));
 		m_joints[JOINT_RIGHT_ELBOW] = hingeC;
+		hingeC->setDbgDrawSize(CONSTRAINT_DEBUG_SIZE);
+
 		m_ownerWorld->addConstraint(m_joints[JOINT_RIGHT_ELBOW], true);
 	}
 

src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.cpp

@@ -82,6 +82,7 @@ bool	btTriangleIndexVertexArray::hasPremadeAabb() const
 	return (m_hasAabb == 1);
 }
 
+
 void	btTriangleIndexVertexArray::setPremadeAabb(const btVector3& aabbMin, const btVector3& aabbMax ) const
 {
 	m_aabbMin = aabbMin;

src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp

@@ -1,3 +1,4 @@
+
 /*
 Bullet Continuous Collision Detection and Physics Library
 Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/

src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp

@@ -19,7 +19,7 @@ subject to the following restrictions:
 
 static btRigidBody s_fixed(0, 0,0);
 
-#define DEFAULT_DEBUGDRAW_SIZE btScalar(5.f)
+#define DEFAULT_DEBUGDRAW_SIZE btScalar(0.3f)
 
 btTypedConstraint::btTypedConstraint(btTypedConstraintType type)
 :m_userConstraintType(-1),