Changeset 1581
- Timestamp:
- Jul 5, 2012, 6:44:59 PM (9 years ago)
- Location:
- trunk/test
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/BtPhysTest.cpp
r1573 r1581 121 121 // Re-using the same collision is better for memory usage and performance 122 122 btCollisionShape* colShape = new btBoxShape(btVector3(1,1,1)); 123 m_rigid_mesh[0].Compile("[sc#daa afcb2 2 2 -.1]"); 124 m_rigid_mesh[1].Compile("[sc#ada afcb2 2 2 -.1]"); 125 m_rigid_mesh[2].Compile("[sc#aad afcb2 2 2 -.1]"); 123 m_rigid_mesh[0].Compile("[sc#add afcb2 2 2 -.1]"); 124 m_rigid_mesh[1].Compile("[sc#dad afcb2 2 2 -.1]"); 125 m_rigid_mesh[2].Compile("[sc#dda afcb2 2 2 -.1]"); 126 m_rigid_mesh[3].Compile("[sc#daa afcb2 2 2 -.1]"); 127 m_rigid_mesh[4].Compile("[sc#ada afcb2 2 2 -.1]"); 128 m_rigid_mesh[5].Compile("[sc#aad afcb2 2 2 -.1]"); 126 129 127 130 m_bt_collision_shapes << colShape; … … 160 163 161 164 btVector3 pos(((row+col+row2) % 4)*CUBE_HALF_EXTENTS, 162 20.0f + row* 4*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT,163 col* 3*CUBE_HALF_EXTENTS +(row2%2)*CUBE_HALF_EXTENTS);165 20.0f + row*8*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT, 166 col*8*CUBE_HALF_EXTENTS + 2 * (row2%2)*CUBE_HALF_EXTENTS); 164 167 165 168 trans.setOrigin(pos); … … 227 230 m_rigid_mesh[1].MeshConvert(); 228 231 m_rigid_mesh[2].MeshConvert(); 232 m_rigid_mesh[3].MeshConvert(); 233 m_rigid_mesh[4].MeshConvert(); 234 m_rigid_mesh[5].MeshConvert(); 229 235 /* FIXME: this object never cleans up */ 230 236 m_ready = true; … … 260 266 m_ground_mesh.Render(m); 261 267 else 262 m_rigid_mesh[i % 3].Render(m);268 m_rigid_mesh[i % 6].Render(m); 263 269 } 264 270 if (BarycenterFactor > .0f) … … 267 273 268 274 m_camera->SetTarget(BarycenterLocation); 269 m_camera->SetPosition(BarycenterLocation + vec3(- 15.0f, 8.0f, .0f));275 m_camera->SetPosition(BarycenterLocation + vec3(-20.0f, 8.0f, .0f)); 270 276 } 271 277 } … … 308 314 int main(int argc, char **argv) 309 315 { 310 Application app("BtPhysTest", ivec2( 800, 600), 60.0f);316 Application app("BtPhysTest", ivec2(1280, 720), 60.0f); 311 317 312 318 #if defined _MSC_VER && !defined _XBOX -
trunk/test/BtPhysTest.h
r1571 r1581 25 25 bool m_ready; 26 26 EasyMesh m_ground_mesh; 27 EasyMesh m_rigid_mesh[ 3];27 EasyMesh m_rigid_mesh[6]; 28 28 29 29 //Bullet Physics Datas
Note: See TracChangeset
for help on using the changeset viewer.