switch world entities from instance to pointer

[orbi.git] / src / orbi.cpp

diff --git a/src/orbi.cpp b/src/orbi.cpp
index b05244189b05a5c9535fee342f1cde49eb522d92..67409e6888f9122a0aeca50389ed24ba44c1f59b 100644 (file)
--- a/src/orbi.cpp
+++ b/src/orbi.cpp
@@ -32,7 +32,7 @@ int main(int argc, const char *argv[]) {
 
        Tileset tiles(
                canv.LoadTexture(sdl.GetBasePath() + "../../data/test-tile.png"),
-               Vector<int>(32, 32)
+               Vector<int>(16, 16)
        );
 
        World world(Vector<int>(10, 10));
@@ -48,12 +48,26 @@ int main(int argc, const char *argv[]) {
        world.SetTile(Vector<int>(9, 5), Tile(0));
        world.SetTile(Vector<int>(9, 6), Tile(0));
 
+       world.SetTile(Vector<int>(3, 8), Tile(0));
+       world.SetTile(Vector<int>(2, 9), Tile(0));
+       world.SetTile(Vector<int>(3, 9), Tile(0));
+
        Entity e;
-       e.bounds = AABB(Vector<float>(5, 0), Vector<float>(2, 3));
-       Entity &player = world.AddEntity(e);
+       e.bounds = AABB(0, 0, 2, 3);
+       e.vbox = AABB(.1, 0, 1.8, 3);
+       e.hbox = AABB(0, .1, 2, 1.8);
+       e.Move(Vector<float>(5, 0));
+       world.AddEntity(e);
+
+       Entity mob;
+       mob.bounds = AABB(0, 0, 2, 1.5);
+       mob.vbox = mob.bounds;
+       mob.hbox = mob.bounds;
+       mob.Move(Vector<float>(1, 0));
+       world.AddEntity(mob);
 
        Application app(canv, world, tiles);
-       app.Control(player);
+       app.Control(e);
        app.Run();
 
        return 0;