X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=da02b1f25902f42dc4ba8774900005a57e9f071c;hb=e24b4ec1a0fb3ba58a8ea67cd8d8affe3c5a0a71;hp=7f38942ea2e4d9b4389dc97e2a430a1458951ff3;hpb=c04ea5a6f67d446ea29aa2e88dc4c666956d7732;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7f38942..da02b1f 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,9 +45,11 @@ 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; }
+	BlockTypeRegistry &BlockTypes() noexcept { return blockType; }
+	ChunkLoader &Loader() noexcept { return chunks; }
 
 	Entity &Player() { return *player; }
 	Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
@@ -56,7 +59,7 @@ public:
 
 	void Update(int dt);
 
-	void Render(BlockLighting &, DirectionalLighting &);
+	void Render(Viewport &);
 
 private:
 	BlockTypeRegistry blockType;