Changeset 1568
- Timestamp:
- Jul 3, 2012, 7:15:24 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/games/ToukyDemo/ToukyDemo.cpp
r1552 r1568 48 48 vec3(0.f, 0.f, 0.f), 49 49 vec3(0, 0, -1)); 50 m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f));51 //m_camera->SetPerspective(120.f, 1280.f, 960.f, -1000.f, 1000.f);50 //m_camera->SetRotation(quat::fromeuler_yxz(0.f, -30.f, 0.f)); 51 m_camera->SetPerspective(120.f, 1280.f, 960.f, .1f, 1000.f); 52 52 m_camera->SetOrtho(1280.f / 6, 960.f / 6, -1000.f, 1000.f); 53 53 Ticker::Ref(m_camera); -
trunk/test/BtPhysTest.cpp
r1564 r1568 46 46 #define EXTRA_HEIGHT 1.f 47 47 48 int gNumObjects = 8;48 int gNumObjects = 16; 49 49 50 50 BtPhysTest::BtPhysTest(bool editor) … … 54 54 vec3(0.f, 0.f, 0.f), 55 55 vec3(0, 0, -1)); 56 m_camera->SetRotation(quat::fromeuler_yxz(0.f, - 30.f, 0.f));56 m_camera->SetRotation(quat::fromeuler_yxz(0.f, -40.f, 0.f)); 57 57 m_camera->SetPerspective(90.f, 1280.f, 960.f, .1f, 1000.f); 58 58 //m_camera->SetOrtho(1280.f / 6, 960.f / 6, -1000.f, 1000.f); … … 156 156 } 157 157 158 btVector3 pos(col*2*CUBE_HALF_EXTENTS + (row2%2)*CUBE_HALF_EXTENTS, 158 btVector3 pos(col*2*CUBE_HALF_EXTENTS + (row2%2)*CUBE_HALF_EXTENTS, 20.0f + 159 159 row*2*CUBE_HALF_EXTENTS+CUBE_HALF_EXTENTS+EXTRA_HEIGHT,0); 160 160 … … 175 175 //using motionstate is recommended, it provides interpolation capabilities, and only synchronizes 'active' objects 176 176 177 btDefaultMotionState* myMotionState = new btDefaultMotionState( startTransform);177 btDefaultMotionState* myMotionState = new btDefaultMotionState(trans); 178 178 179 179 btRigidBody::btRigidBodyConstructionInfo cInfo(mass,myMotionState,shape,localInertia); … … 244 244 rot = colObj->getWorldTransform().getBasis(); 245 245 } 246 if (i == 2)246 if (i > 0) 247 247 { 248 248 BarycenterLocation += m.v3.xyz; … … 259 259 260 260 m_camera->SetTarget(BarycenterLocation); 261 m_camera->SetPosition(BarycenterLocation + vec3(- 50.0f, 50.0f, .0f));261 m_camera->SetPosition(BarycenterLocation + vec3(-10.0f, 10.0f, .0f)); 262 262 } 263 263 }
Note: See TracChangeset
for help on using the changeset viewer.