equal
deleted
inserted
replaced
24 */ |
24 */ |
25 class PhysicsWorld : public Terrain { |
25 class PhysicsWorld : public Terrain { |
26 friend class PhysicsObject; |
26 friend class PhysicsObject; |
27 |
27 |
28 private: |
28 private: |
29 Timer tick_timer; |
|
30 |
29 |
31 // Terrain terrain; |
30 |
32 |
|
33 protected: |
31 protected: |
34 std::list<PhysicsObject*> players; |
32 std::list<PhysicsObject*> players; |
35 std::list<Projectile*> projectiles; |
33 std::list<Projectile*> projectiles; |
36 // std::vector<PhysicsObject*> objects; |
34 // std::vector<PhysicsObject*> objects; |
37 |
35 |
43 Vector gravity; |
41 Vector gravity; |
44 |
42 |
45 |
43 |
46 |
44 |
47 public: |
45 public: |
|
46 |
|
47 // Someone is going to kill me for this |
|
48 Timer tick_timer; |
|
49 |
48 |
50 |
49 PhysicsWorld(Vector gravity, Vector dimensions); |
51 PhysicsWorld(Vector gravity, Vector dimensions); |
50 |
52 |
51 // TODO: Replace addObject with these? |
53 // TODO: Replace addObject with these? |
52 //void addPlayerObject(PlayerObject *object); |
54 //void addPlayerObject(PlayerObject *object); |