enable URDF loading throught the 'File/Open' menu

set a default camera targets for each demo. note that it is only reset when switching to a different demo, so you can restart at your chosen location.
no OpenCL pairbench drawing in OpenGL2 (there is no VBO available etc)
This commit is contained in:
erwincoumans
2015-05-01 11:42:14 -07:00
parent 3dd41b84a8
commit 218e9f9bf9
66 changed files with 562 additions and 217 deletions

View File

@@ -93,7 +93,14 @@ class Planar2D : public CommonRigidBodyBase
void exitPhysics();
void resetCamera()
{
float dist = 9;
float pitch = 539;
float yaw = 11;
float targetPos[3]={8.6,10.5,-20.6};
m_guiHelper->resetCamera(dist,pitch,yaw,targetPos[0],targetPos[1],targetPos[2]);
}
};
@@ -325,7 +332,7 @@ void Planar2D::exitPhysics()
m_box2dbox2dAlgo = 0;
}
CommonExampleInterface* Planar2DCreateFunc(struct PhysicsInterface* pint, struct GUIHelperInterface* helper, int option)
CommonExampleInterface* Planar2DCreateFunc(struct CommonExampleOptions& options)
{
return new Planar2D(helper);
return new Planar2D(options.m_guiHelper);
}

View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#ifndef PLANAR2D_H
#define PLANAR2D_H
class CommonExampleInterface* Planar2DCreateFunc(struct PhysicsInterface* pint, struct GUIHelperInterface* helper, int option);
class CommonExampleInterface* Planar2DCreateFunc(struct CommonExampleOptions& options);
#endif //BOX2D_DEMO_H