Changeset 1581Tweet

Timestamp:

Jul 5, 2012, 6:44:59 PM (8 years ago)

Author:

sam

Message:

test: minor tweaks to the Bullet demo.

Location:

trunk/test

Files:

• BtPhysTest.cpp (modified) (6 diffs)
• BtPhysTest.h (modified) (1 diff)

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[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_rigid_mesh[0].Compile("[sc#add afcb2 2 2 -.1]");
+                        m_rigid_mesh[1].Compile("[sc#dad afcb2 2 2 -.1]");
+                        m_rigid_mesh[2].Compile("[sc#dda afcb2 2 2 -.1]");
+                        m_rigid_mesh[3].Compile("[sc#daa afcb2 2 2 -.1]");
+                        m_rigid_mesh[4].Compile("[sc#ada afcb2 2 2 -.1]");
+                        m_rigid_mesh[5].Compile("[sc#aad afcb2 2 2 -.1]");
 
                         m_bt_collision_shapes << colShape;
@@ -160 +163 @@
 
                                 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);
+                                              20.0f + row*8*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT,
+                                              col*8*CUBE_HALF_EXTENTS + 2 * (row2%2)*CUBE_HALF_EXTENTS);
 
                                 trans.setOrigin(pos);
@@ -227 +230 @@
                 m_rigid_mesh[1].MeshConvert();
                 m_rigid_mesh[2].MeshConvert();
+                m_rigid_mesh[3].MeshConvert();
+                m_rigid_mesh[4].MeshConvert();
+                m_rigid_mesh[5].MeshConvert();
         /* FIXME: this object never cleans up */
         m_ready = true;
@@ -260 +266 @@
                         m_ground_mesh.Render(m);
                 else 
-                        m_rigid_mesh[i % 3].Render(m);
+                        m_rigid_mesh[i % 6].Render(m);
         }
         if (BarycenterFactor > .0f)
@@ -267 +273 @@
 
                 m_camera->SetTarget(BarycenterLocation);
-                m_camera->SetPosition(BarycenterLocation + vec3(-15.0f, 8.0f, .0f));
+                m_camera->SetPosition(BarycenterLocation + vec3(-20.0f, 8.0f, .0f));
         }
 }
@@ -308 +314 @@
 int main(int argc, char **argv)
 {
-    Application app("BtPhysTest", ivec2(800, 600), 60.0f);
+    Application app("BtPhysTest", ivec2(1280, 720), 60.0f);
 
 #if defined _MSC_VER && !defined _XBOX

trunk/test/BtPhysTest.h

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