Changeset 1568Tweet

Timestamp:

Jul 3, 2012, 7:15:24 PM (9 years ago)

Author:

touky

Message:

BtPhysTest works !

Location:

trunk

Files:

• games/ToukyDemo/ToukyDemo.cpp (modified) (1 diff)
• test/BtPhysTest.cpp (modified) (6 diffs)

trunk/games/ToukyDemo/ToukyDemo.cpp

@@ -48 +48 @@
                           vec3(0.f, 0.f, 0.f),
                           vec3(0, 0, -1));
-    m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f));
-    //m_camera->SetPerspective(120.f, 1280.f, 960.f, -1000.f, 1000.f);
+    //m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f));
+    m_camera->SetPerspective(120.f, 1280.f, 960.f, .1f, 1000.f);
         m_camera->SetOrtho(1280.f / 6, 960.f / 6, -1000.f, 1000.f);
     Ticker::Ref(m_camera);

trunk/test/BtPhysTest.cpp

@@ -46 +46 @@
 #define EXTRA_HEIGHT 1.f
 
-int gNumObjects = 8;
+int gNumObjects = 16;
 
 BtPhysTest::BtPhysTest(bool editor)
@@ -54 +54 @@
                           vec3(0.f, 0.f, 0.f),
                           vec3(0, 0, -1));
-    m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f));
+    m_camera->SetRotation(quat::fromeuler_yxz(0.f, -40.f, 0.f));
     m_camera->SetPerspective(90.f, 1280.f, 960.f, .1f, 1000.f);
         //m_camera->SetOrtho(1280.f / 6, 960.f / 6, -1000.f, 1000.f);
@@ -156 +156 @@
                                 }
 
-                                btVector3 pos(col*2*CUBE_HALF_EXTENTS + (row2%2)*CUBE_HALF_EXTENTS,
+                                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);
 
@@ -175 +175 @@
                                 //using motionstate is recommended, it provides interpolation capabilities, and only synchronizes 'active' objects
 
-                                btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform);
+                                btDefaultMotionState* myMotionState = new btDefaultMotionState(trans);
 
                                 btRigidBody::btRigidBodyConstructionInfo cInfo(mass,myMotionState,shape,localInertia);
@@ -244 +244 @@
                         rot = colObj->getWorldTransform().getBasis();
                 }
-                if (i == 2)
+                if (i > 0)
                 {
                         BarycenterLocation += m.v3.xyz;
@@ -259 +259 @@
 
                 m_camera->SetTarget(BarycenterLocation);
-                m_camera->SetPosition(BarycenterLocation + vec3(-50.0f, 50.0f, .0f));
+                m_camera->SetPosition(BarycenterLocation + vec3(-10.0f, 10.0f, .0f));
         }
 }