(hopefully) cross-platform directory functions

[blank.git] / src / world / World.hpp

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 183fa603209af587d23d18f8f2b0e40c0a98d177..da02b1f25902f42dc4ba8774900005a57e9f071c 100644 (file)
--- 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,9 +46,10 @@ 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(); }
@@ -59,7 +59,7 @@ public:
 
        void Update(int dt);
 
-       void Render(BlockLighting &, DirectionalLighting &);
+       void Render(Viewport &);
 
 private:
        BlockTypeRegistry blockType;