Changeset 1571Tweet

Timestamp:

Jul 4, 2012, 10:52:32 PM (10 years ago)

Author:

sam

Message:

test: activate the Bullet Physics test on all Unix platforms.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• games/ToukyDemo/.gitignore (added)
• test/BtPhysTest.cpp (modified) (5 diffs)
• test/BtPhysTest.h (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)

trunk/.gitignore

@@ -61 +61 @@
 !contrib/*/*/*/*/*/*/*
 # Our binaries
+test/benchsuite
+test/btphystest
+test/quad
 test/testsuite
-test/benchsuite
-test/quad
 test/sandbox/sample
 test/math/pi

trunk/test/BtPhysTest.cpp

@@ -121 +121 @@
                         // Re-using the same collision is better for memory usage and performance
                         btCollisionShape* colShape = new btBoxShape(btVector3(1,1,1));
-                        m_rigid_mesh.Compile("[sc#ada afcb2 2 2 -.1]");
+                        m_rigid_mesh[0].Compile("[sc#daa afcb2 2 2 -.1]");
+                        m_rigid_mesh[1].Compile("[sc#ada afcb2 2 2 -.1]");
+                        m_rigid_mesh[2].Compile("[sc#aad afcb2 2 2 -.1]");
 
                         m_bt_collision_shapes << colShape;
@@ -157 +159 @@
                                 }
 
-                                btVector3 pos(col*2*CUBE_HALF_EXTENTS + (row2%2)*CUBE_HALF_EXTENTS, 20.0f +
-                                        row*2*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT,0);
+                                btVector3 pos(((row+col+row2) % 4)*CUBE_HALF_EXTENTS,
+                                              20.0f + row*4*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT,
+                                              col*3*CUBE_HALF_EXTENTS + (row2%2)*CUBE_HALF_EXTENTS);
 
                                 trans.setOrigin(pos);
@@ -219 +222 @@
     {
                 m_ground_mesh.MeshConvert();
-                m_rigid_mesh.MeshConvert();
+                m_rigid_mesh[0].MeshConvert();
+                m_rigid_mesh[1].MeshConvert();
+                m_rigid_mesh[2].MeshConvert();
         /* FIXME: this object never cleans up */
         m_ready = true;
@@ -253 +258 @@
                         m_ground_mesh.Render(m);
                 else 
-                        m_rigid_mesh.Render(m);
+                        m_rigid_mesh[i % 3].Render(m);
         }
         if (BarycenterFactor > .0f)
@@ -260 +265 @@
 
                 m_camera->SetTarget(BarycenterLocation);
-                m_camera->SetPosition(BarycenterLocation + vec3(-20.0f, 5.0f, .0f));
+                m_camera->SetPosition(BarycenterLocation + vec3(-15.0f, 8.0f, .0f));
         }
 }

trunk/test/BtPhysTest.h

@@ -25 +25 @@
     bool                                                                m_ready;
         EasyMesh                                                        m_ground_mesh;
-        EasyMesh                                                        m_rigid_mesh;
+        EasyMesh                                                        m_rigid_mesh[3];
 
         //Bullet Physics Datas

trunk/test/Makefile.am

@@ -18 +18 @@
 EXTRA_DIST = data/gradient.png
 
-noinst_PROGRAMS = quad benchsuite testsuite
+noinst_PROGRAMS = quad benchsuite testsuite btphystest
 
 TESTS = testsuite
@@ -42 +42 @@
 quad_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
+btphystest_SOURCES = BtPhysTest.cpp BtPhysTest.h
+btphystest_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@ -I$(top_builddir)/src/bullet
+btphystest_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+btphystest_DEPENDENCIES = $(top_builddir)/src/liblol.a
+