X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Forbi.cpp;h=91974974704d67bd939023a8c9fe468af36fa733;hb=7cf057b5b3a28c3896af27cb725fbf0b4f1459c2;hp=f410a40bcab41c612dd8a9c1b4dabe355a8fb7b0;hpb=4a51a83bdff30d1e25a5867cfb19936adc0034b1;p=orbi.git

diff --git a/src/orbi.cpp b/src/orbi.cpp
index f410a40..9197497 100644
--- a/src/orbi.cpp
+++ b/src/orbi.cpp
@@ -31,8 +31,8 @@ int main(int argc, const char *argv[]) {
 	));
 
 	Tileset tiles(
-		canv.LoadTexture("/home/holy/projects/orbi/data/test-tile.png"),
-		Vector<int>(32, 32)
+		canv.LoadTexture(sdl.GetBasePath() + "../../data/test-tile.png"),
+		Vector<int>(16, 16)
 	);
 
 	World world(Vector<int>(10, 10));
@@ -48,11 +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, 2), Vector<float>(2, 3));
-	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));
+	Entity &player = 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.Run();
 
 	return 0;