From 16f5707c861a6bfbcaf7ae360289d9ad53b1e0c4 Mon Sep 17 00:00:00 2001 From: Irlan <-> Date: Wed, 18 Apr 2018 01:34:23 -0300 Subject: [PATCH] rename tests --- examples/testbed/framework/test_entries.cpp | 16 ++++++++-------- ...ule_and_hull_collision_1.h => deep_capsule.h} | 10 +++++----- ...d_hull_collision_2.h => degenerate_capsule.h} | 10 +++++----- .../{hull_collision_2.h => hull_edge_contact.h} | 10 +++++----- .../{hull_collision.h => hull_face_contact.h} | 10 +++++----- 5 files changed, 28 insertions(+), 28 deletions(-) rename examples/testbed/tests/{capsule_and_hull_collision_1.h => deep_capsule.h} (89%) rename examples/testbed/tests/{capsule_and_hull_collision_2.h => degenerate_capsule.h} (90%) rename examples/testbed/tests/{hull_collision_2.h => hull_edge_contact.h} (91%) rename examples/testbed/tests/{hull_collision.h => hull_face_contact.h} (91%) diff --git a/examples/testbed/framework/test_entries.cpp b/examples/testbed/framework/test_entries.cpp index 5180fa0..55ca991 100644 --- a/examples/testbed/framework/test_entries.cpp +++ b/examples/testbed/framework/test_entries.cpp @@ -22,10 +22,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -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 }, diff --git a/examples/testbed/tests/capsule_and_hull_collision_1.h b/examples/testbed/tests/deep_capsule.h similarity index 89% rename from examples/testbed/tests/capsule_and_hull_collision_1.h rename to examples/testbed/tests/deep_capsule.h index a0a2282..c4cb36e 100644 --- a/examples/testbed/tests/capsule_and_hull_collision_1.h +++ b/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; diff --git a/examples/testbed/tests/capsule_and_hull_collision_2.h b/examples/testbed/tests/degenerate_capsule.h similarity index 90% rename from examples/testbed/tests/capsule_and_hull_collision_2.h rename to examples/testbed/tests/degenerate_capsule.h index 754cf92..0ca046c 100644 --- a/examples/testbed/tests/capsule_and_hull_collision_2.h +++ b/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; diff --git a/examples/testbed/tests/hull_collision_2.h b/examples/testbed/tests/hull_edge_contact.h similarity index 91% rename from examples/testbed/tests/hull_collision_2.h rename to examples/testbed/tests/hull_edge_contact.h index e4b0a1e..8c6c14b 100644 --- a/examples/testbed/tests/hull_collision_2.h +++ b/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; diff --git a/examples/testbed/tests/hull_collision.h b/examples/testbed/tests/hull_face_contact.h similarity index 91% rename from examples/testbed/tests/hull_collision.h rename to examples/testbed/tests/hull_face_contact.h index f6eea52..901f7f4 100644 --- a/examples/testbed/tests/hull_collision.h +++ b/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;