some annotations

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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 8754d3992e800f518dd9b5db021a8c997a80ec9b..e2858739387830ddff08812d4907d084fea975a5 100644 (file)
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -45,24 +45,27 @@ 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 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 &);
 
        /// check if given entity intersects with the world
        bool Intersection(const Entity &e, const EntityState &, std::vector<WorldCollision> &);
+       /// combine contacts into a single penetration vector
+       /// depth is given to point towards position of given state
+       static glm::vec3 CombinedInterpenetration(
+               const EntityState &,
+               const std::vector<WorldCollision> &) noexcept;
 
        /// check if given box (M * AABB) intersects with the world
        /// M is assumed to be calculated in reference to given chunk coords