(hopefully) cross-platform directory functions

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index ae704946dc4403079ebae724c54c828b0cc82fd8..da02b1f25902f42dc4ba8774900005a57e9f071c 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -8,20 +8,21 @@
 #include "../model/shapes.hpp"
 
 #include <list>
+#include <vector>
 #include <glm/glm.hpp>
 
 
 namespace blank {
 
-class BlockLighting;
-class DirectionalLighting;
+class Viewport;
+class WorldCollision;
 
 class World {
 
 public:
        struct Config {
                // initial player position
-               glm::vec3 spawn = { 4.0f, 4.0f, 4.0f };
+               glm::vec3 spawn = { 0.0f, 0.0f, 0.0f };
                // direction facing towards(!) the light
                glm::vec3 light_direction = { -1.0f, -3.0f, -2.0f };
                // fade out reaches 1/e (0.3679) at 1/fog_density,
@@ -39,12 +40,16 @@ public:
        bool Intersection(
                const Ray &,
                const glm::mat4 &M,
-               Chunk **chunk = nullptr,
-               int *blkid = nullptr,
-               float *dist = nullptr,
-               glm::vec3 *normal = nullptr);
+               Chunk *&chunk,
+               int &blkid,
+               float &dist,
+               glm::vec3 &normal);
 
-       BlockTypeRegistry &BlockTypes() { return blockType; }
+       bool Intersection(const Entity &e, std::vector<WorldCollision> &);
+       void Resolve(Entity &e, std::vector<WorldCollision> &);
+
+       BlockTypeRegistry &BlockTypes() noexcept { return blockType; }
+       ChunkLoader &Loader() noexcept { return chunks; }
 
        Entity &Player() { return *player; }
        Entity &AddEntity() { entities.emplace_back(); return entities.back(); }
@@ -54,7 +59,7 @@ public:
 
        void Update(int dt);
 
-       void Render(BlockLighting &, DirectionalLighting &);
+       void Render(Viewport &);
 
 private:
        BlockTypeRegistry blockType;