gmueller/gremlin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bullet destroy order

Browse Source
This commit is contained in:
Gero Müller 2011-01-27 22:24:14 +01:00
parent d4e31fea35
commit f93135b20f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/Game.h
View File

@ -104,11 +104,6 @@ private:
void loadLevelShape(); void loadLevelShape();
void loadShipShape(); void loadShipShape();
const std::auto_ptr<btDefaultCollisionConfiguration> collisionConfiguration;
const std::auto_ptr<btCollisionDispatcher> dispatcher;
const std::auto_ptr<btBroadphaseInterface> overlappingPairCache;
const std::auto_ptr<btSequentialImpulseConstraintSolver> solver;
const std::auto_ptr<btDiscreteDynamicsWorld> dynamicsWorld;
std::auto_ptr<btTriangleIndexVertexArray> levelVertexArray; std::auto_ptr<btTriangleIndexVertexArray> levelVertexArray;
std::auto_ptr<btCollisionShape> levelShape; std::auto_ptr<btCollisionShape> levelShape;
std::auto_ptr<btMotionState> levelState; std::auto_ptr<btMotionState> levelState;
@ -117,6 +112,12 @@ private:
std::auto_ptr<btTriangleIndexVertexArray> shipVertexArray; std::auto_ptr<btTriangleIndexVertexArray> shipVertexArray;
std::auto_ptr<btCollisionShape> shipShape; std::auto_ptr<btCollisionShape> shipShape;
const std::auto_ptr<btDefaultCollisionConfiguration> collisionConfiguration;
const std::auto_ptr<btCollisionDispatcher> dispatcher;
const std::auto_ptr<btBroadphaseInterface> overlappingPairCache;
const std::auto_ptr<btSequentialImpulseConstraintSolver> solver;
const std::auto_ptr<btDiscreteDynamicsWorld> dynamicsWorld;
Schedule slaveUpdate; Schedule slaveUpdate;
}; };