test entities for world collision

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index ae704946dc4403079ebae724c54c828b0cc82fd8..7f38942ea2e4d9b4389dc97e2a430a1458951ff3 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -21,7 +21,7 @@ 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,10 +39,12 @@ 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);
+
+       bool Intersection(const Entity &e);
 
        BlockTypeRegistry &BlockTypes() { return blockType; }