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

Start re-organizing demos so the physics setup can be shared easier (explicit create graphics objects, init/exit physics etc)

Browse Source 
Add B3G_RETURN key code, only implemented in Windows so far (todo: Mac, Linux)
Fix Windows key management (use WM_CHAR event instead of WM_KEYUP
Add Return (OnKeyReturn) key support TreeNode, so we can select an item using the return key.
This commit is contained in:
Erwin Coumans
2014-06-24 10:14:06 -07:00
parent 28f19f1bab
commit 68f798a2da
29 changed files with 746 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Demos3/bullet2/BasicDemo/Bullet2RigidBodyDemo.h
View File

@@ -6,31 +6,28 @@
#include "../../AllBullet2Demos/BulletDemoInterface.h"
#include "OpenGLWindow/b3gWindowInterface.h"
#include "../../../Demos/CommonPhysicsSetup.h"
class Bullet2RigidBodyDemo : public BulletDemoInterface
{
public:
class btDiscreteDynamicsWorld* m_dynamicsWorld;
class btCollisionDispatcher* m_dispatcher;
class btBroadphaseInterface* m_bp;
class btCollisionConfiguration* m_config;
class btConstraintSolver* m_solver;
CommonPhysicsSetup* m_physicsSetup;
public:
class btRigidBody* m_pickedBody;
class btTypedConstraint* m_pickedConstraint;
btVector3 m_oldPickingPos;
btVector3 m_hitPos;
btScalar m_oldPickingDist;
bool m_controlPressed;
bool m_altPressed;
public:
class SimpleOpenGL3App* m_glApp;
struct SimpleOpenGL3App* m_glApp;
Bullet2RigidBodyDemo(SimpleOpenGL3App* app);
Bullet2RigidBodyDemo(SimpleOpenGL3App* app, CommonPhysicsSetup* physicsSetup);
virtual void initPhysics();
virtual void exitPhysics();
virtual void renderScene();
virtual void stepSimulation(float dt);
virtual ~Bullet2RigidBodyDemo();
btVector3 getRayTo(int x,int y);
@@ -49,7 +46,6 @@ public:
return false;
}
virtual void stepSimulation(float deltaTime);
};