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

@@ -103,6 +103,16 @@ public:
void exitPhysics();
virtual void resetCamera()
{
//@todo depends on current_demo?
float dist = 45;
float pitch = 27;
float yaw = 31;
float targetPos[3]={10-1,0};
m_guiHelper->resetCamera(dist,pitch,yaw,targetPos[0],targetPos[1],targetPos[2]);
}
SoftDemo(struct GUIHelperInterface* helper)
: CommonRigidBodyBase(helper),
m_drag(false)
@@ -2322,10 +2332,10 @@ void SoftDemo::exitPhysics()
}
class CommonExampleInterface* SoftDemoCreateFunc(struct PhysicsInterface* pint, struct GUIHelperInterface* helper, int option)
class CommonExampleInterface* SoftDemoCreateFunc(struct CommonExampleOptions& options)
{
current_demo = option;
return new SoftDemo(helper);
current_demo = options.m_option;
return new SoftDemo(options.m_guiHelper);
}