X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=b98efca544ef0969af3f056075b43f039986e80f;hb=549646ac3e5bede5e77031f773649edf8de83608;hp=183fa603209af587d23d18f8f2b0e40c0a98d177;hpb=32909aa3224ec0ed5656721178eb6ad31cd047df;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 183fa60..b98efca 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -14,8 +14,7 @@
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Viewport;
 class WorldCollision;
 
 class World {
@@ -47,19 +46,20 @@ public:
 		glm::vec3 &normal);
 
 	bool Intersection(const Entity &e, std::vector<WorldCollision> &);
-	void Resolve(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(); }
 
 	Chunk &PlayerChunk();
-	Chunk &Next(const Chunk &to, const glm::tvec3<int> &dir);
+	Chunk &Next(const Chunk &to, const glm::ivec3 &dir);
 
 	void Update(int dt);
 
-	void Render(BlockLighting &, DirectionalLighting &);
+	void Render(Viewport &);
 
 private:
 	BlockTypeRegistry blockType;