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

Code-style consistency improvement:

Browse Source 
Apply clang-format-all.sh using the _clang-format file through all the cpp/.h files.
make sure not to apply it to certain serialization structures, since some parser expects the * as part of the name, instead of type.
This commit contains no other changes aside from adding and applying clang-format-all.sh
This commit is contained in:
erwincoumans
2018-09-23 14:17:31 -07:00
parent b73b05e9fb
commit ab8f16961e
1773 changed files with 1081087 additions and 474249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
examples/RoboticsLearning/R2D2GraspExample.cpp
View File

@@ -17,195 +17,182 @@
///quick demo showing the right-handed coordinate system and positive rotations around each axis
class R2D2GraspExample : public CommonExampleInterface
{
CommonGraphicsApp* m_app;
CommonGraphicsApp* m_app;
GUIHelperInterface* m_guiHelper;
b3RobotSimulatorClientAPI m_robotSim;
int m_options;
int m_r2d2Index;
b3AlignedObjectArray<int> m_movingInstances;
enum
{
numCubesX = 20,
numCubesY = 20
};
public:
R2D2GraspExample(GUIHelperInterface* helper, int options)
:m_app(helper->getAppInterface()),
m_guiHelper(helper),
m_options(options),
m_r2d2Index(-1)
{
m_app->setUpAxis(2);
}
virtual ~R2D2GraspExample()
{
}
virtual void physicsDebugDraw(int debugDrawMode)
{
}
virtual void initPhysics()
{
public:
R2D2GraspExample(GUIHelperInterface* helper, int options)
: m_app(helper->getAppInterface()),
m_guiHelper(helper),
m_options(options),
m_r2d2Index(-1)
{
m_app->setUpAxis(2);
}
virtual ~R2D2GraspExample()
{
}
virtual void physicsDebugDraw(int debugDrawMode)
{
}
virtual void initPhysics()
{
int mode = eCONNECT_EXISTING_EXAMPLE_BROWSER;
m_robotSim.setGuiHelper(m_guiHelper);
bool connected = m_robotSim.connect(mode);
b3Printf("robotSim connected = %d",connected);
if ((m_options & eROBOTIC_LEARN_GRASP)!=0)
b3Printf("robotSim connected = %d", connected);
if ((m_options & eROBOTIC_LEARN_GRASP) != 0)
{
{
b3RobotSimulatorLoadUrdfFileArgs args;
args.m_startPosition.setValue(0,0,.5);
m_r2d2Index = m_robotSim.loadURDF("r2d2.urdf",args);
args.m_startPosition.setValue(0, 0, .5);
m_r2d2Index = m_robotSim.loadURDF("r2d2.urdf", args);
if (m_r2d2Index>=0)
if (m_r2d2Index >= 0)
{
int numJoints = m_robotSim.getNumJoints(m_r2d2Index);
b3Printf("numJoints = %d",numJoints);
b3Printf("numJoints = %d", numJoints);
for (int i=0;i<numJoints;i++)
for (int i = 0; i < numJoints; i++)
{
b3JointInfo jointInfo;
m_robotSim.getJointInfo(m_r2d2Index,i,&jointInfo);
b3Printf("joint[%d].m_jointName=%s",i,jointInfo.m_jointName);
m_robotSim.getJointInfo(m_r2d2Index, i, &jointInfo);
b3Printf("joint[%d].m_jointName=%s", i, jointInfo.m_jointName);
}
int wheelJointIndices[4]={2,3,6,7};
int wheelTargetVelocities[4]={-10,-10,-10,-10};
for (int i=0;i<4;i++)
int wheelJointIndices[4] = {2, 3, 6, 7};
int wheelTargetVelocities[4] = {-10, -10, -10, -10};
for (int i = 0; i < 4; i++)
{
b3RobotSimulatorJointMotorArgs controlArgs(CONTROL_MODE_VELOCITY);
controlArgs.m_targetVelocity = wheelTargetVelocities[i];
controlArgs.m_maxTorqueValue = 1e30;
m_robotSim.setJointMotorControl(m_r2d2Index,wheelJointIndices[i],controlArgs);
m_robotSim.setJointMotorControl(m_r2d2Index, wheelJointIndices[i], controlArgs);
}
}
}
{
b3RobotSimulatorLoadFileResults results;
m_robotSim.loadSDF("kiva_shelf/model.sdf",results);
m_robotSim.loadSDF("kiva_shelf/model.sdf", results);
}
{
m_robotSim.loadURDF("plane.urdf");
}
m_robotSim.setGravity(btVector3(0,0,-10));
m_robotSim.setGravity(btVector3(0, 0, -10));
}
if ((m_options & eROBOTIC_LEARN_COMPLIANT_CONTACT)!=0)
if ((m_options & eROBOTIC_LEARN_COMPLIANT_CONTACT) != 0)
{
b3RobotSimulatorLoadUrdfFileArgs args;
b3RobotSimulatorLoadFileResults results;
{
args.m_startPosition.setValue(0,0,2.5);
args.m_startOrientation.setEulerZYX(0,0.2,0);
m_r2d2Index = m_robotSim.loadURDF("cube_soft.urdf",args);
args.m_startPosition.setValue(0, 0, 2.5);
args.m_startOrientation.setEulerZYX(0, 0.2, 0);
m_r2d2Index = m_robotSim.loadURDF("cube_soft.urdf", args);
}
{
args.m_startPosition.setValue(0,2,2.5);
args.m_startOrientation.setEulerZYX(0,0.2,0);
m_robotSim.loadURDF("cube_no_friction.urdf",args);
args.m_startPosition.setValue(0, 2, 2.5);
args.m_startOrientation.setEulerZYX(0, 0.2, 0);
m_robotSim.loadURDF("cube_no_friction.urdf", args);
}
{
args.m_startPosition.setValue(0,0,0);
args.m_startOrientation.setEulerZYX(0,0.2,0);
args.m_startPosition.setValue(0, 0, 0);
args.m_startOrientation.setEulerZYX(0, 0.2, 0);
args.m_forceOverrideFixedBase = true;
m_robotSim.loadURDF("plane.urdf",args);
m_robotSim.loadURDF("plane.urdf", args);
}
m_robotSim.setGravity(btVector3(0,0,-10));
m_robotSim.setGravity(btVector3(0, 0, -10));
}
if ((m_options & eROBOTIC_LEARN_ROLLING_FRICTION)!=0)
{
b3RobotSimulatorLoadUrdfFileArgs args;
if ((m_options & eROBOTIC_LEARN_ROLLING_FRICTION) != 0)
{
b3RobotSimulatorLoadUrdfFileArgs args;
b3RobotSimulatorLoadFileResults results;
{
args.m_startPosition.setValue(0,0,2.5);
args.m_startOrientation.setEulerZYX(0,0,0);
args.m_useMultiBody = true;
m_robotSim.loadURDF("sphere2_rolling_friction.urdf",args);
}
{
args.m_startPosition.setValue(0,2,2.5);
args.m_startOrientation.setEulerZYX(0,0,0);
args.m_useMultiBody = true;
m_robotSim.loadURDF("sphere2.urdf", args);
}
{
args.m_startPosition.setValue(0,0,0);
args.m_startOrientation.setEulerZYX(0,0.2,0);
args.m_useMultiBody = true;
args.m_forceOverrideFixedBase = true;
m_robotSim.loadURDF("plane.urdf", args);
}
{
args.m_startPosition.setValue(0, 0, 2.5);
args.m_startOrientation.setEulerZYX(0, 0, 0);
args.m_useMultiBody = true;
m_robotSim.loadURDF("sphere2_rolling_friction.urdf", args);
}
{
args.m_startPosition.setValue(0, 2, 2.5);
args.m_startOrientation.setEulerZYX(0, 0, 0);
args.m_useMultiBody = true;
m_robotSim.loadURDF("sphere2.urdf", args);
}
{
args.m_startPosition.setValue(0, 0, 0);
args.m_startOrientation.setEulerZYX(0, 0.2, 0);
args.m_useMultiBody = true;
args.m_forceOverrideFixedBase = true;
m_robotSim.loadURDF("plane.urdf", args);
}
m_robotSim.setGravity(btVector3(0,0,-10));
m_robotSim.setGravity(btVector3(0, 0, -10));
}
}
virtual void exitPhysics()
{
}
virtual void exitPhysics()
{
m_robotSim.disconnect();
}
virtual void stepSimulation(float deltaTime)
}
virtual void stepSimulation(float deltaTime)
{
m_robotSim.stepSimulation();
}
virtual void renderScene()
{
}
virtual void renderScene()
{
m_robotSim.renderScene();
//m_app->m_renderer->renderScene();
}
}
virtual void physicsDebugDraw()
{
}
virtual bool mouseMoveCallback(float x, float y)
{
return false;
}
virtual bool mouseButtonCallback(int button, int state, float x, float y)
{
return false;
}
virtual bool keyboardCallback(int key, int state)
{
return false;
}
virtual void physicsDebugDraw()
{
}
virtual bool mouseMoveCallback(float x,float y)
{
return false;
}
virtual bool mouseButtonCallback(int button, int state, float x, float y)
{
return false;
}
virtual bool keyboardCallback(int key, int state)
{
return false;
}
virtual void resetCamera()
{
float dist = 3;
float pitch = -30;
float yaw = -75;
float targetPos[3]={-0.2,0.8,0.3};
if (m_app->m_renderer && m_app->m_renderer->getActiveCamera())
float targetPos[3] = {-0.2, 0.8, 0.3};
if (m_app->m_renderer && m_app->m_renderer->getActiveCamera())
{
m_app->m_renderer->getActiveCamera()->setCameraDistance(dist);
m_app->m_renderer->getActiveCamera()->setCameraPitch(pitch);
m_app->m_renderer->getActiveCamera()->setCameraYaw(yaw);
m_app->m_renderer->getActiveCamera()->setCameraTargetPosition(targetPos[0],targetPos[1],targetPos[2]);
m_app->m_renderer->getActiveCamera()->setCameraTargetPosition(targetPos[0], targetPos[1], targetPos[2]);
}
}
};
class CommonExampleInterface* R2D2GraspExampleCreateFunc(struct CommonExampleOptions& options)
class CommonExampleInterface* R2D2GraspExampleCreateFunc(struct CommonExampleOptions& options)
{
return new R2D2GraspExample(options.m_guiHelper, options.m_option);
}