add event profiler, json profile dump, cleanup

include/testbed/tests/angular_motion.h

@@ -0,0 +1,79 @@
+/*
+* Copyright (c) 2016-2016 Irlan Robson http://www.irlan.net
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 1. The origin of this software must not be misrepresented; you must not
+* claim that you wrote the original software. If you use this software
+* in a product, an acknowledgment in the product documentation would be
+* appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef ANGULAR_MOTION_H
+#define ANGULAR_MOTION_H
+
+class AngularMotion : public Test
+{
+public:
+	AngularMotion()
+	{
+		b3BodyDef bdef;
+		bdef.type = e_dynamicBody;
+		bdef.position.Set(0.0f, 0.0f, 0.0f);
+
+		m_body = m_world.CreateBody(bdef);
+
+		b3CapsuleShape shape;
+		shape.m_centers[0].Set(0.0f, 1.0f, 0.0f);
+		shape.m_centers[1].Set(0.0f, -1.0f, 0.0f);
+		shape.m_radius = 1.0f;
+
+		b3ShapeDef sdef;
+		sdef.shape = &shape;
+		sdef.density = 1.0f;
+
+		m_body->CreateShape(sdef);
+
+		b3MassData data;
+		m_body->GetMassData(&data);
+
+		m_body->SetMassData(&data);
+
+		b3Vec3 g(0.0f, 0.0f, 0.0f);
+		m_world.SetGravity(g);
+	}
+
+	void Step()
+	{
+		Test::Step();
+
+		b3Vec3 v(0.0f, 0.0f, 0.0f);
+		m_body->SetLinearVelocity(v);
+
+		b3Vec3 p = m_body->GetSweep().worldCenter;
+		b3Quat quat = m_body->GetSweep().orientation;
+
+		b3Vec3 axis;
+		float32 angle;
+		quat.GetAxisAngle(&axis, &angle);
+		
+		b3Vec3 q(0.0f, 0.0f, 0.0f);
+		m_body->SetTransform(q, axis, angle);
+	}
+
+	static Test* Create()
+	{
+		return new AngularMotion();
+	}
+
+	b3Body* m_body;
+};
+
+#endif

include/testbed/tests/cloth_test.h

@@ -32,10 +32,10 @@ public:
 
 		b3ClothDef def;
 		def.mesh = m_meshes + e_clothMesh;
-		def.density = 0.4f;
+		def.density = 0.2f;
 		def.gravity.Set(-10.0f, 1.0f, 0.0f);
-		def.k1 = 0.9f;
-		def.k2 = 0.2f;
+		def.k1 = 0.5f;
+		def.k2 = 0.05f;
 		def.kd = 0.1f;
 		def.r = 1.0f;
 

include/testbed/tests/linear_motion.h

@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2016-2016 Irlan Robson http://www.irlan.net
+*
+* This software is provided 'as-is', without any express or implied
+* warranty.  In no event will the authors be held liable for any damages
+* arising from the use of this software.
+* Permission is granted to anyone to use this software for any purpose,
+* including commercial applications, and to alter it and redistribute it
+* freely, subject to the following restrictions:
+* 1. The origin of this software must not be misrepresented; you must not
+* claim that you wrote the original software. If you use this software
+* in a product, an acknowledgment in the product documentation would be
+* appreciated but is not required.
+* 2. Altered source versions must be plainly marked as such, and must not be
+* misrepresented as being the original software.
+* 3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef LINEAR_MOTION_H
+#define LINEAR_MOTION_H
+
+class LinearMotion : public Test
+{
+public:
+	LinearMotion()
+	{
+		b3BodyDef bdef;
+		bdef.type = e_dynamicBody;
+		bdef.position.Set(0.0f, 0.0f, 0.0f);
+
+		m_body = m_world.CreateBody(bdef);
+
+		b3CapsuleShape shape;
+		shape.m_centers[0].Set(0.0f, 1.0f, 0.0f);
+		shape.m_centers[1].Set(0.0f, -1.0f, 0.0f);
+		shape.m_radius = 1.0f;
+
+		b3ShapeDef sdef;
+		sdef.shape = &shape;
+		sdef.density = 1.0f;
+
+		m_body->CreateShape(sdef);
+
+		b3MassData data;
+		m_body->GetMassData(&data);
+
+		data.I.SetZero();
+
+		m_body->SetMassData(&data);
+
+		b3Vec3 g(0.0f, 0.0f, 0.0f);
+		m_world.SetGravity(g);
+
+		b3Vec3 f(0.0f, 0.0f, -10000.0f);
+		m_body->ApplyForceToCenter(f, true);
+	}
+
+	void Step()
+	{
+		Test::Step();
+
+		b3Vec3 q(0.0f, 0.0f, 0.0f);
+		b3Vec3 p = m_body->GetTransform().position;
+		if (b3Distance(p, q) > 50.0f)
+		{
+			b3Quat quat = m_body->GetSweep().orientation;
+
+			b3Vec3 axis;
+			float32 angle;
+			quat.GetAxisAngle(&axis, &angle);
+			m_body->SetTransform(q, axis, angle);
+		}
+	}
+
+	static Test* Create()
+	{
+		return new LinearMotion();
+	}
+
+	b3Body* m_body;
+};
+
+#endif

include/testbed/tests/test.h

@@ -19,11 +19,13 @@
 #ifndef TEST_H
 #define TEST_H
 
-#include <bounce/bounce.h>
-
 #include <glfw/glfw3.h>
 #include <imgui/imgui.h>
-#include "../framework/debug_draw.h"
+
+#include <bounce/bounce.h>
+
+#include <testbed/framework/debug_draw.h>
+#include <testbed/framework/profiler.h>
 
 struct Settings
 {
@@ -45,7 +47,7 @@ struct Settings
 		drawContactTangents = false;
 		drawStats = true;
 		drawProfile = true;
-		drawGrid = false;;
+		drawGrid = true;
 		pause = false;
 		singleStep = false;
 		lastTestID = -1;
@@ -131,8 +133,6 @@ public:
 	virtual void KeyUp(int button) { }
 
 	b3World m_world;
-	b3Profile m_profile;
-	b3Profile m_maxProfile;
 
 	b3RayCastSingleOutput m_rayHit;
 	b3BoxHull m_groundHull;