X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.h;h=6369757743d66c4d9d61a2ad04d1912e861995b0;hb=7cf057b5b3a28c3896af27cb725fbf0b4f1459c2;hp=d77b15b3d55db40ed96822a852e32d7cae273438;hpb=dbc08d84d9de1a77cba0dd97e4701f4ac99d056e;p=orbi.git

diff --git a/src/world/World.h b/src/world/World.h
index d77b15b..6369757 100644
--- a/src/world/World.h
+++ b/src/world/World.h
@@ -1,6 +1,7 @@
 #ifndef ORBI_WORLD_H_
 #define ORBI_WORLD_H_
 
+#include "AABB.h"
 #include "Entity.h"
 #include "Tile.h"
 #include "../graphics/Vector.h"
@@ -18,6 +19,7 @@ public:
 
 public:
 	Vector<int> Size() const { return size; }
+	Vector<int> TileSize() const { return Vector<int>(1, 1); }
 
 public:
 	void Update(float dt);
@@ -33,17 +35,25 @@ public:
 	const std::list<Entity> &Entities() const { return entities; }
 	Entity &AddEntity(const Entity &);
 
+private:
+	void BoundsCollision(Entity &, float dt);
+	void TileCollision(Entity &, float dt);
+	void EntityCollision();
+
 private:
 	Vector<int> size;
 	int count;
 
 	Vector<float> gravity;
 	Vector<float> terminal;
+	float fixSpeed;
 
 	std::vector<Tile> tiles;
 
 	std::list<Entity> entities;
 
+	mutable AABB tileShape;
+
 };
 
 }