--- a/src/proto2/Physics.hh Sat Nov 29 16:54:21 2008 +0000
+++ b/src/proto2/Physics.hh Sat Nov 29 17:24:50 2008 +0000
@@ -119,17 +119,6 @@
bool facingRight; // Player facing
bool inAir; // Is the object "on the ground"
- // Shape of the object. The vector contains the polygon edge
- // points relative to the object location.
- std::vector<Vector> shape;
-
- // Force queue that is emptied on every tick
- std::queue<Force> forceq;
- // Helper variables for integration (TODO: should these be
- // somewhere else?)
- Vector posAfterTick;
- Vector velAfterTick;
-
PhysicsObject (PhysicsWorld &world, float mass, Vector position, Vector velocity);
~PhysicsObject() {}
@@ -222,6 +211,17 @@
*/
virtual void onCollision() {}
+ // Shape of the object. The vector contains the polygon edge
+ // points relative to the object location.
+ std::vector<Vector> shape;
+
+ // Force queue that is emptied on every tick
+ std::queue<Force> forceq;
+ // Helper variables for integration (TODO: should these be
+ // somewhere else?)
+ Vector posAfterTick;
+ Vector velAfterTick;
+
public:
/**
* Get current object position.