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

@@ -52,7 +52,14 @@ public:
virtual void stepSimulation(float deltaTime);
virtual void resetCamera()
{
float dist = 18;
float pitch = 129;
float yaw = 30;
float targetPos[3]={-4.6,-4.7,-5.75};
m_guiHelper->resetCamera(dist,pitch,yaw,targetPos[0],targetPos[1],targetPos[2]);
}
};
@@ -147,6 +154,7 @@ void RaytestDemo::castRays()
void RaytestDemo::initPhysics()
{
m_guiHelper->setUpAxis(1);
///collision configuration contains default setup for memory, collision setup
m_collisionConfiguration = new btDefaultCollisionConfiguration();
@@ -318,9 +326,9 @@ void RaytestDemo::exitPhysics()
}
class CommonExampleInterface* RaytestCreateFunc(struct PhysicsInterface* pint, struct GUIHelperInterface* helper, int option)
class CommonExampleInterface* RaytestCreateFunc(struct CommonExampleOptions& options)
{
return new RaytestDemo(helper);
return new RaytestDemo(options.m_guiHelper);
}