minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed
moved some files in btgui/Bullet3AppSupport
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
#ifndef _LUA_PHYSICS_SETUP_H
|
||||
#define _LUA_PHYSICS_SETUP_H
|
||||
|
||||
#include "../Demos/CommonPhysicsSetup.h"
|
||||
#include "Bullet3AppSupport/CommonPhysicsSetup.h"
|
||||
|
||||
//we don't derive from CommonRigidBodySetup because we
|
||||
//create and own our own dynamics world (one or more)
|
||||
//at run-time
|
||||
struct LuaPhysicsSetup : public CommonPhysicsSetup
|
||||
//at run-time
|
||||
struct LuaPhysicsSetup : public CommonPhysicsSetup
|
||||
{
|
||||
|
||||
LuaPhysicsSetup(class SimpleOpenGL3App* app);
|
||||
@@ -18,9 +18,9 @@ struct LuaPhysicsSetup : public CommonPhysicsSetup
|
||||
class btNNCGConstraintSolver* m_solver;
|
||||
class btDiscreteDynamicsWorld* m_dynamicsWorld;
|
||||
class SimpleOpenGL3App* m_glApp;
|
||||
|
||||
virtual void initPhysics(GraphicsPhysicsBridge& gfxBridge);
|
||||
|
||||
|
||||
virtual void initPhysics(GraphicsPhysicsBridge& gfxBridge);
|
||||
|
||||
virtual void exitPhysics();
|
||||
|
||||
virtual void stepSimulation(float deltaTime);
|
||||
@@ -36,8 +36,8 @@ struct LuaPhysicsSetup : public CommonPhysicsSetup
|
||||
virtual btRigidBody* createRigidBody(float mass, const btTransform& startTransform,btCollisionShape* shape, const btVector4& color=btVector4(1,0,0,1));
|
||||
|
||||
virtual btBoxShape* createBoxShape(const btVector3& halfExtents);
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
#endif //_LUA_PHYSICS_SETUP_H
|
||||
|
||||
Reference in New Issue
Block a user