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

@@ -51,6 +51,15 @@ struct Dof6Spring2Setup : public CommonRigidBodyBase
virtual void stepSimulation(float deltaTime);
void animate();
virtual void resetCamera()
{
float dist = 5;
float pitch = 722;
float yaw = 35;
float targetPos[3]={4,2,-11};
m_guiHelper->resetCamera(dist,pitch,yaw,targetPos[0],targetPos[1],targetPos[2]);
}
};
@@ -475,7 +484,7 @@ void Dof6Spring2Setup::stepSimulation(float deltaTime)
m_dynamicsWorld->stepSimulation(deltaTime);
}
class CommonExampleInterface* Dof6Spring2CreateFunc(struct PhysicsInterface* pint, struct GUIHelperInterface* helper, int option)
class CommonExampleInterface* Dof6Spring2CreateFunc( CommonExampleOptions& options)
{
return new Dof6Spring2Setup(helper);
return new Dof6Spring2Setup(options.m_guiHelper);
}