From d080bfe9ea2a9db032bb79fa6b60ee6d39561178 Mon Sep 17 00:00:00 2001
From: Irlan <->
Date: Tue, 3 Apr 2018 15:03:01 -0300
Subject: [PATCH] rename an experiment, prints energy

---
 examples/testbed/framework/test_entries.cpp   |  4 ++--
 .../{implicit_spring.h => mass_spring.h}      | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)
 rename examples/testbed/tests/{implicit_spring.h => mass_spring.h} (90%)

diff --git a/examples/testbed/framework/test_entries.cpp b/examples/testbed/framework/test_entries.cpp
index b925e92..e480218 100644
--- a/examples/testbed/framework/test_entries.cpp
+++ b/examples/testbed/framework/test_entries.cpp
@@ -64,7 +64,7 @@
 #include <testbed/tests/cloth_dragger.h>
 #include <testbed/tests/rope_test.h>
 //#include <testbed/tests/tree_test.h>
-#include <testbed/tests/implicit_spring.h>
+#include <testbed/tests/mass_spring.h>
 
 TestEntry g_tests[] =
 {
@@ -114,6 +114,6 @@ TestEntry g_tests[] =
 	{ "Spring Cloth Dragging", &ClothDraggerTest::Create },
 	{ "Rope", &Rope::Create },
 	//{ "Tree", &Tree::Create },
-	{ "Implicit Spring", &ImplicitSpring::Create },
+	{ "Mass-Spring System", &MassSpring::Create },
 	{ NULL, NULL }
 };
\ No newline at end of file
diff --git a/examples/testbed/tests/implicit_spring.h b/examples/testbed/tests/mass_spring.h
similarity index 90%
rename from examples/testbed/tests/implicit_spring.h
rename to examples/testbed/tests/mass_spring.h
index a057509..3d1204e 100644
--- a/examples/testbed/tests/implicit_spring.h
+++ b/examples/testbed/tests/mass_spring.h
@@ -16,17 +16,17 @@
 * 3. This notice may not be removed or altered from any source distribution.
 */
 
-#ifndef IMPLICIT_SPRING_H
-#define IMPLICIT_SPRING_H
+#ifndef MASS_SPRING_H
+#define MASS_SPRING_H
 
 extern DebugDraw* g_debugDraw;
 extern Camera g_camera;
 extern Settings g_settings;
 
-class ImplicitSpring : public Test
+class MassSpring : public Test
 {
 public:
-	ImplicitSpring()
+	MassSpring()
 	{
 		g_camera.m_zoom = 20.0f;
 
@@ -154,14 +154,19 @@ public:
 		b3Vec3_zero.SetZero();
 		g_debugDraw->DrawSegment(b3Vec3_zero, m_x, b3Color_white);
 
-		char text[64];
-		sprintf(text, "Iterations = %u", m_iterations);
-		g_debugDraw->DrawString(text, b3Color_white);
+		char text1[64];
+		sprintf(text1, "Iterations = %u", m_iterations);
+		g_debugDraw->DrawString(text1, b3Color_white);
+
+		char text2[64];
+		float32 E = 0.5f * b3Dot(m_v, m_v);
+		sprintf(text2, "E = %f", E);
+		g_debugDraw->DrawString(text2, b3Color_white);
 	}
 
 	static Test* Create()
 	{
-		return new ImplicitSpring();
+		return new MassSpring();
 	}
 
 	// State