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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7f38942..10710fb 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -8,13 +8,14 @@
 #include "../model/shapes.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Viewport;
+class WorldCollision;
 
 class World {
 
@@ -44,7 +45,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; }
 
@@ -56,7 +58,7 @@ public:
 
 	void Update(int dt);
 
-	void Render(BlockLighting &, DirectionalLighting &);
+	void Render(Viewport &);
 
 private:
 	BlockTypeRegistry blockType;