From 7736e7850fa3a53e02cbb7847e29850f2525633e Mon Sep 17 00:00:00 2001 From: Faerbit Date: Tue, 25 Nov 2014 13:38:28 +0100 Subject: [PATCH] Removing global variables from physics, because they are not needed. --- physics.cc | 13 ------------- physics.hh | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/physics.cc b/physics.cc index b358098..03d353c 100644 --- a/physics.cc +++ b/physics.cc @@ -1,18 +1,5 @@ #include "physics.hh" - -btDynamicsWorld* world; //contains physical attributes of the world. -btDispatcher* dispatcher; // -btCollisionConfiguration* colConfig; //defines the type of collision detection. -btBroadphaseInterface* broadphase; //defines how objects are culled from collision detection. -btConstraintSolver* solver; //solver for forces and impulses. - -std::vector bodies; //list of all bodies. bodies are also in world, but save again to ease cleaning up process. -btRigidBody* playerBall; -btRigidBody* terrainBody; -btRigidBody* staticGroundBody; - - Physics::Physics() { } diff --git a/physics.hh b/physics.hh index fa69442..24f5afb 100644 --- a/physics.hh +++ b/physics.hh @@ -53,7 +53,7 @@ class Physics { void addBox(float width, float height, float length, Entity entity, float mass, unsigned indice); private: - btRigidBody* playerBody; + btRigidBody* playerBall; btRigidBody* terrainBody; std::vector bodies; //list of all bodies. bodies are also in world, but save again to ease cleaning up process. btRigidBody* staticGroundBody;