hbox/vbox implementation

[orbi.git] / src / orbi.cpp

diff --git a/src/orbi.cpp b/src/orbi.cpp
index f410a40bcab41c612dd8a9c1b4dabe355a8fb7b0..5775459dd5a6f5f6c9a95c578b01d46d4c80c13b 100644 (file)
--- a/src/orbi.cpp
+++ b/src/orbi.cpp
@@ -31,7 +31,7 @@ int main(int argc, const char *argv[]) {
        ));
 
        Tileset tiles(
-               canv.LoadTexture("/home/holy/projects/orbi/data/test-tile.png"),
+               canv.LoadTexture(sdl.GetBasePath() + "../../data/test-tile.png"),
                Vector<int>(32, 32)
        );
 
@@ -48,11 +48,18 @@ 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, 2), Vector<float>(2, 3));
-       world.AddEntity(e);
+       e.vbox = AABB(Vector<float>(.1, 0), Vector<float>(1.8, 3));
+       e.hbox = AABB(Vector<float>(0, .1), Vector<float>(2, 1.8));
+       e.Move(Vector<float>(5, 0));
+       Entity &player = world.AddEntity(e);
 
        Application app(canv, world, tiles);
+       app.Control(player);
        app.Run();
 
        return 0;