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

fix conflut

Browse Source
This commit is contained in:
Chuyuan Fu
2019-03-25 14:12:00 -07:00
parent 3768bbcae3 2ca6172f1a
commit 19f3ec8b80
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/BulletRobotics/FixJointBoxes.cpp
View File

@@ -61,11 +61,7 @@ public:
b3RobotSimulatorLoadUrdfFileArgs args; b3RobotSimulatorLoadUrdfFileArgs args;
b3RobotSimulatorChangeDynamicsArgs dynamicsArgs; b3RobotSimulatorChangeDynamicsArgs dynamicsArgs;
for (int i = 0; i < numCubes; i++) b3RobotJointInfo jointInfo;
{
args.m_forceOverrideFixedBase = (i == 0);
args.m_startPosition.setValue(0, i * 0.05, 1);
cubeIds[i] = m_robotSim.loadURDF("cube_small.urdf", args);
b3RobotJointInfo jointInfo; b3RobotJointInfo jointInfo;