rename tests

examples/testbed/framework/test_entries.cpp

@@ -22,10 +22,10 @@
 #include <testbed/tests/distance_test.h>
 #include <testbed/tests/collide_test.h>
 #include <testbed/tests/capsule_collision.h>
-#include <testbed/tests/capsule_and_hull_collision_1.h>
-#include <testbed/tests/capsule_and_hull_collision_2.h>
-#include <testbed/tests/hull_collision.h>
-#include <testbed/tests/hull_collision_2.h>
+#include <testbed/tests/deep_capsule.h>
+#include <testbed/tests/degenerate_capsule.h>
+#include <testbed/tests/hull_face_contact.h>
+#include <testbed/tests/hull_edge_contact.h>
 #include <testbed/tests/linear_motion.h>
 #include <testbed/tests/angular_motion.h>
 #include <testbed/tests/gyro_motion.h>
@@ -73,10 +73,10 @@ TestEntry g_tests[] =
 	{ "Cluster Test", &Cluster::Create },
 	{ "Distance Test", &Distance::Create },
 	{ "Capsule Collision", &CapsuleCollision::Create },
-	{ "Capsule and Hull Collision (1)", &CapsuleAndHullCollision1::Create },
-	{ "Capsule and Hull Collision (2)", &CapsuleAndHullCollision2::Create },
-	{ "Hull Collision (1)", &HullAndHull::Create },
-	{ "Hull Collision (2)", &HullAndHull2::Create },
+	{ "Deep Capsule", &DeepCapsule::Create },
+	{ "Degenerate Capsule", &DegenerateCapsule::Create },
+	{ "Hull Face Contact", &HullFaceContact::Create },
+	{ "Hull Edge Contact", &HullEdgeContact::Create },
 	{ "Capsule Spin", &CapsuleSpin::Create },
 	{ "Mesh Contact Test", &MeshContactTest::Create },
 	{ "Linear Motion", &LinearMotion::Create },

examples/testbed/tests/deep_capsule.h

@@ -16,13 +16,13 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CAPSULE_HULL_COLLISION_1_H
-#define CAPSULE_HULL_COLLISION_1_H
+#ifndef DEEP_CAPSULE_H
+#define DEEP_CAPSULE_H
 
-class CapsuleAndHullCollision1 : public Collide
+class DeepCapsule : public Collide
 {
 public:
-	CapsuleAndHullCollision1()
+	DeepCapsule()
 	{
 		m_xfA.position.Set(0.0f, 0.0f, 0.0f);
 		m_xfA.rotation = b3QuatMat33(b3Quat(b3Vec3(0.0f, 0.0f, 1.0f), 0.55f * B3_PI));
@@ -49,7 +49,7 @@ public:
 
 	static Test* Create()
 	{
-		return new CapsuleAndHullCollision1();
+		return new DeepCapsule();
 	}
 
 	b3CapsuleShape m_sA;

examples/testbed/tests/degenerate_capsule.h

@@ -16,13 +16,13 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef CAPSULE_HULL_2_H
-#define CAPSULE_HULL_2_H
+#ifndef DEGENERATE_CAPSULE_H
+#define DEGENERATE_CAPSULE_H
 
-class CapsuleAndHullCollision2 : public Collide
+class DegenerateCapsule : public Collide
 {
 public:
-	CapsuleAndHullCollision2()
+	DegenerateCapsule()
 	{
 		m_xfA.position.Set(0.0f, 0.0f, 0.0f);
 		m_xfA.rotation = b3QuatMat33(b3Quat(b3Vec3(0.0f, 0.0f, 1.0f), 0.55f * B3_PI));
@@ -49,7 +49,7 @@ public:
 
 	static Test* Create()
 	{
-		return new CapsuleAndHullCollision2();
+		return new DegenerateCapsule();
 	}
 
 	b3CapsuleShape m_sA;

examples/testbed/tests/hull_edge_contact.h

@@ -16,13 +16,13 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef HULL_HULL2_H
-#define HULL_HULL2_H
+#ifndef HULL_EDGE_CONTACT_H
+#define HULL_EDGE_CONTACT_H
 
-class HullAndHull2 : public Collide
+class HullEdgeContact : public Collide
 {
 public:
-	HullAndHull2()
+	HullEdgeContact()
 	{
 		b3Transform xf;
 		xf.position.SetZero();
@@ -49,7 +49,7 @@ public:
 	
 	static Test* Create()
 	{
-		return new HullAndHull2();
+		return new HullEdgeContact();
 	}
 
 	b3BoxHull m_box;

examples/testbed/tests/hull_face_contact.h

@@ -16,13 +16,13 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef HULL_HULL_H
-#define HULL_HULL_H
+#ifndef HULL_FACE_CONTACT_H
+#define HULL_FACE_CONTACT_H
 
-class HullAndHull : public Collide
+class HullFaceContact : public Collide
 {
 public:
-	HullAndHull()
+	HullFaceContact()
 	{
 		b3Transform m;
 		m.rotation = b3Diagonal(1.0f, 2.0f, 1.0f);
@@ -50,7 +50,7 @@ public:
 
 	static Test* Create()
 	{
-		return new HullAndHull();
+		return new HullFaceContact();
 	}
 
 	b3BoxHull m_box1;