diff --git a/data/multibody.bullet b/data/multibody.bullet index 32b9e7f37..563b8939b 100644 Binary files a/data/multibody.bullet and b/data/multibody.bullet differ diff --git a/examples/ExampleBrowser/premake4.lua b/examples/ExampleBrowser/premake4.lua index b57b05a82..94cd3f7ee 100644 --- a/examples/ExampleBrowser/premake4.lua +++ b/examples/ExampleBrowser/premake4.lua @@ -27,7 +27,7 @@ project "App_BulletExampleBrowser" initOpenCL("clew") end - links{"BulletExampleBrowserLib","gwen", "OpenGL_Window","BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision","rbdl_static","LinearMath","BussIK", "Bullet3Common"} + links{"BulletExampleBrowserLib","gwen", "OpenGL_Window","BulletSoftBody", "BulletInverseDynamicsUtils", "BulletInverseDynamics", "BulletDynamics","BulletCollision","LinearMath","BussIK", "Bullet3Common"} initOpenGL() initGlew() @@ -137,13 +137,8 @@ project "App_BulletExampleBrowser" "../SharedMemory/plugins/stablePDPlugin/Shape.cpp", "../SharedMemory/plugins/stablePDPlugin/RBDUtil.cpp", "../SharedMemory/plugins/stablePDPlugin/RBDModel.cpp", - "../SharedMemory/plugins/stablePDPlugin/Rand.cpp", "../SharedMemory/plugins/stablePDPlugin/MathUtil.cpp", "../SharedMemory/plugins/stablePDPlugin/KinTree.cpp", - "../SharedMemory/plugins/stablePDPlugin/FileUtil.cpp", - "../SharedMemory/plugins/stablePDPlugin/json/json_writer.cpp", - "../SharedMemory/plugins/stablePDPlugin/json/json_value.cpp", - "../SharedMemory/plugins/stablePDPlugin/json/json_reader.cpp", "../SharedMemory/SharedMemoryCommands.h", "../SharedMemory/SharedMemoryPublic.h", "../SharedMemory/b3RobotSimulatorClientAPI_NoGUI.cpp", diff --git a/examples/pybullet/examples/humanoidMotionCapture.py b/examples/pybullet/examples/humanoidMotionCapture.py index 45d943a9a..765a88498 100644 --- a/examples/pybullet/examples/humanoidMotionCapture.py +++ b/examples/pybullet/examples/humanoidMotionCapture.py @@ -2,7 +2,11 @@ import pybullet as p import json import time -p.connect(p.GUI) +useGUI = True +if useGUI: + p.connect(p.GUI) +else: + p.connect(p.DIRECT) useZUp = False useYUp = not useZUp @@ -198,15 +202,19 @@ p.getCameraImage(320,200) while (p.isConnected()): - - erp = p.readUserDebugParameter(erpId) - - kpMotor = p.readUserDebugParameter(kpMotorId) - maxForce=p.readUserDebugParameter(forceMotorId) + if useGUI: + erp = p.readUserDebugParameter(erpId) + kpMotor = p.readUserDebugParameter(kpMotorId) + maxForce=p.readUserDebugParameter(forceMotorId) + frameReal = p.readUserDebugParameter(frameId) + else: + erp = 0.2 + kpMotor = 0.2 + maxForce=1000 + frameReal = 0 + kp=kpMotor - - frameReal = p.readUserDebugParameter(frameId) frame = int(frameReal) frameNext = frame+1 if (frameNext >= numFrames):