AnotherFoxGuy/bounce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename an experiment, prints energy

Browse Source
This commit is contained in:
Irlan 2018-04-03 15:03:01 -03:00
parent 6e0e269f68
commit d080bfe9ea
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/testbed/framework/test_entries.cpp
View File

@ -64,7 +64,7 @@
#include <testbed/tests/cloth_dragger.h> #include <testbed/tests/cloth_dragger.h>
#include <testbed/tests/rope_test.h> #include <testbed/tests/rope_test.h>
//#include <testbed/tests/tree_test.h> //#include <testbed/tests/tree_test.h>
#include <testbed/tests/implicit_spring.h> #include <testbed/tests/mass_spring.h>
TestEntry g_tests[] = TestEntry g_tests[] =
{ {
@ -114,6 +114,6 @@ TestEntry g_tests[] =
{ "Spring Cloth Dragging", &ClothDraggerTest::Create }, { "Spring Cloth Dragging", &ClothDraggerTest::Create },
{ "Rope", &Rope::Create }, { "Rope", &Rope::Create },
//{ "Tree", &Tree::Create }, //{ "Tree", &Tree::Create },
{ "Implicit Spring", &ImplicitSpring::Create }, { "Mass-Spring System", &MassSpring::Create },
{ NULL, NULL } { NULL, NULL }
}; };

21
examples/testbed/tests/implicit_spring.h → examples/testbed/tests/mass_spring.h
View File

@ -16,17 +16,17 @@
* 3. This notice may not be removed or altered from any source distribution. * 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifndef IMPLICIT_SPRING_H #ifndef MASS_SPRING_H
#define IMPLICIT_SPRING_H #define MASS_SPRING_H
extern DebugDraw* g_debugDraw; extern DebugDraw* g_debugDraw;
extern Camera g_camera; extern Camera g_camera;
extern Settings g_settings; extern Settings g_settings;
class ImplicitSpring : public Test class MassSpring : public Test
{ {
public: public:
ImplicitSpring() MassSpring()
{ {
g_camera.m_zoom = 20.0f; g_camera.m_zoom = 20.0f;
@ -154,14 +154,19 @@ public:
b3Vec3_zero.SetZero(); b3Vec3_zero.SetZero();
g_debugDraw->DrawSegment(b3Vec3_zero, m_x, b3Color_white); g_debugDraw->DrawSegment(b3Vec3_zero, m_x, b3Color_white);
char text[64]; char text1[64];
sprintf(text, "Iterations = %u", m_iterations); sprintf(text1, "Iterations = %u", m_iterations);
g_debugDraw->DrawString(text, b3Color_white); 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() static Test* Create()
{ {
return new ImplicitSpring(); return new MassSpring();
} }
// State // State