try to cleanly destruct world

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 7ee5f4306a228260f172d594c8776056020fcb6d..767f527a9034b97f352c66eda80f42d3f6569c0b 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -45,19 +45,17 @@ public:
        /// check if this ray hits a block
        /// depth in the collision is the distance between the ray's
        /// origin and the intersection point
-       /// M is the global transform for given reference chunk
+       /// reference is the chunk offset of the ray in world space
        bool Intersection(
                const Ray &,
-               const glm::mat4 &M,
-               const Chunk::Pos &reference,
+               const ExactLocation::Coarse &reference,
                WorldCollision &);
 
        /// check if this ray hits an entity
        /// intersections with the reference are not tested
-       /// M is the global transform for the chunk of given reference entity
+       /// the ray is assumed to be in world space offset by entity's chunk coords
        bool Intersection(
                const Ray &,
-               const glm::mat4 &M,
                const Entity &reference,
                EntityCollision &);
 
@@ -130,6 +128,14 @@ private:
                const EntityState &
        );
 
+       /// calculate light direction and intensity at entity's location
+       void GetLight(
+               const Entity &entity,
+               glm::vec3 &direction,
+               glm::vec3 &color,
+               glm::vec3 &ambient
+       );
+
 private:
        Config config;