Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into addExample

Browse Source
This commit is contained in:
fuchuyuan
2019-03-07 19:59:48 -08:00
committed by GitHub
parent 2fb12400ac c1e1a0f37b
commit 2908bd9641
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/BulletRobotics/FixJointBoxes.cpp
View File

@@ -60,7 +60,7 @@ public:
{ {
b3RobotSimulatorLoadUrdfFileArgs args; b3RobotSimulatorLoadUrdfFileArgs args;
b3RobotSimulatorChangeDynamicsArgs dynamicsArgs; b3RobotSimulatorChangeDynamicsArgs dynamicsArgs;
for (int i = 0; i < numCubes; i++) for (int i = 0; i < numCubes; i++)
{ {
args.m_forceOverrideFixedBase = (i == 0); args.m_forceOverrideFixedBase = (i == 0);
@@ -157,12 +157,12 @@ public:
virtual void resetCamera() 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]);
} }
}; };

2
examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp
View File

@@ -163,7 +163,7 @@ public:
options.m_skipGraphicsUpdate = skipGraphicsUpdate; options.m_skipGraphicsUpdate = skipGraphicsUpdate;
m_physicsServerExample = PhysicsServerCreateFuncBullet2(options); m_physicsServerExample = PhysicsServerCreateFuncBullet2(options);
m_physicsServerExample->initPhysics(); m_physicsServerExample->initPhysics();
m_physicsServerExample->resetCamera(); //m_physicsServerExample->resetCamera();
setSharedMemoryInterface(m_sharedMem); setSharedMemoryInterface(m_sharedMem);
m_clock.reset(); m_clock.reset();
m_prevTime = m_clock.getTimeMicroseconds(); m_prevTime = m_clock.getTimeMicroseconds();