equal
deleted
inserted
replaced
2 #include "PhysicsWorld.hh" |
2 #include "PhysicsWorld.hh" |
3 #include "Engine.hh" |
3 #include "Engine.hh" |
4 |
4 |
5 #include <functional> |
5 #include <functional> |
6 |
6 |
7 PhysicsWorld::PhysicsWorld (Vector gravity, Vector dimensions) : |
7 PhysicsWorld::PhysicsWorld (Vector gravity, Vector dimensions, Terrain &terrain) : |
8 // XXX: assume Vector == PixelCoordinate |
8 terrain(terrain), |
9 Terrain((unsigned int) dimensions.x, (unsigned int) dimensions.y, 1337), |
|
10 dimensions(dimensions), |
9 dimensions(dimensions), |
11 gravity(gravity), |
10 gravity(gravity), |
12 tick_timer(PHYSICS_TICK_MS) |
11 tick_timer(PHYSICS_TICK_MS) |
13 { |
12 { |
|
13 // wire up our timer |
14 slots.connect(tick_timer.sig_tick(), this, &PhysicsWorld::tick); |
14 slots.connect(tick_timer.sig_tick(), this, &PhysicsWorld::tick); |
15 tick_timer.start(); |
15 tick_timer.start(); |
16 } |
16 } |
17 |
17 |
18 void PhysicsWorld::addPhysicsObject (PhysicsObject *po) { |
18 void PhysicsWorld::addPhysicsObject (PhysicsObject *po) { |