Merge branch 'master' into addExample
This commit is contained in:
@@ -157,12 +157,12 @@ public:
|
||||
|
||||
virtual void resetCamera()
|
||||
{
|
||||
float dist = 1.2;
|
||||
float pitch = -20;
|
||||
float yaw = 90;
|
||||
float targetPos[3] = {.5, 0.6, 0.5};
|
||||
|
||||
m_guiHelper->resetCamera(dist, yaw, pitch, targetPos[0], targetPos[1], targetPos[2]);
|
||||
float dist = 1;
|
||||
float pitch = -20;
|
||||
float yaw = -30;
|
||||
float targetPos[3] = {0, 0.2, 0.5};
|
||||
m_guiHelper->resetCamera(dist, yaw, pitch, targetPos[0], targetPos[1], targetPos[2]);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -163,7 +163,7 @@ public:
|
||||
options.m_skipGraphicsUpdate = skipGraphicsUpdate;
|
||||
m_physicsServerExample = PhysicsServerCreateFuncBullet2(options);
|
||||
m_physicsServerExample->initPhysics();
|
||||
m_physicsServerExample->resetCamera();
|
||||
//m_physicsServerExample->resetCamera();
|
||||
setSharedMemoryInterface(m_sharedMem);
|
||||
m_clock.reset();
|
||||
m_prevTime = m_clock.getTimeMicroseconds();
|
||||
|
||||
Reference in New Issue
Block a user