X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=9ec4cb2faf7fae204c53672e0b1f6e800a09e9dc;hb=46b18a88fdda816f3c2c547aba68b0a5ea7970f7;hp=7f38942ea2e4d9b4389dc97e2a430a1458951ff3;hpb=c04ea5a6f67d446ea29aa2e88dc4c666956d7732;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7f38942..9ec4cb2 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -8,6 +8,7 @@
 #include "../model/shapes.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
@@ -15,6 +16,7 @@ namespace blank {
 
 class BlockLighting;
 class DirectionalLighting;
+class WorldCollision;
 
 class World {
 
@@ -44,7 +46,8 @@ public:
 		float &dist,
 		glm::vec3 &normal);
 
-	bool Intersection(const Entity &e);
+	bool Intersection(const Entity &e, std::vector<WorldCollision> &);
+	void Resolve(Entity &e, std::vector<WorldCollision> &);
 
 	BlockTypeRegistry &BlockTypes() { return blockType; }