diff options
author | erwincoumans <erwin.coumans@gmail.com> | 2019-03-07 17:55:45 -0800 |
---|---|---|
committer | fuchuyuan <fuchuyuan.kelly@gmail.com> | 2019-03-11 10:12:38 -0700 |
commit | 0b41fe1a491097cfd9ce102679108f64a7e76b38 (patch) | |
tree | 5b46054a0ada2b398f6f77d72eaa3a326f1746c4 | |
parent | b347d9f667b44b83985f73ccaacf6dc7add521b4 (diff) | |
download | bullet3-0b41fe1a491097cfd9ce102679108f64a7e76b38.tar.gz |
use b3RobotJointInfo instead of b3JointInfo, so it is initialized.
don't reset the camera in SharedMemoryInProcessPhysicsC_API
-rw-r--r-- | examples/BulletRobotics/FixJointBoxes.cpp | 13 | ||||
-rw-r--r-- | examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/examples/BulletRobotics/FixJointBoxes.cpp b/examples/BulletRobotics/FixJointBoxes.cpp index 875a76b1d..fa29d4f93 100644 --- a/examples/BulletRobotics/FixJointBoxes.cpp +++ b/examples/BulletRobotics/FixJointBoxes.cpp @@ -57,7 +57,7 @@ public: args.m_startPosition.setValue(0, i * 0.05, 1); cubeIds[i] = m_robotSim.loadURDF("cube_small.urdf", args); - b3JointInfo jointInfo; + b3RobotJointInfo jointInfo; jointInfo.m_parentFrame[1] = -0.025; jointInfo.m_childFrame[1] = 0.025; @@ -102,12 +102,11 @@ public: virtual void resetCamera() { - // 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]); + 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]); } }; diff --git a/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp b/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp index d4215dc01..5df2d31d7 100644 --- a/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp +++ b/examples/SharedMemory/SharedMemoryInProcessPhysicsC_API.cpp @@ -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(); |