X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=a1385138edd5fa135d84dba21025b2f4253f9e8b;hb=d2fa8ca97d291508ce3812fb052a8255d3190d00;hp=2fd312c7ce39efb990ed2be07b16f0ce6b7313a8;hpb=ede25c0a2f59e21521d1cd962e6ea9d78169ca12;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 2fd312c..a138513 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -15,6 +15,7 @@
 namespace blank {
 
 class Assets;
+class EntityCollision;
 class Viewport;
 class WorldCollision;
 
@@ -38,14 +39,21 @@ public:
 
 	World(const Assets &, const Config &, const WorldSave &);
 
+	/// check if this ray hits a block
+	/// depth in the collision is the distance between the ray's
+	/// origin and the intersection point
 	bool Intersection(
 		const Ray &,
 		const glm::mat4 &M,
-		Chunk *&chunk,
-		int &blkid,
-		float &dist,
-		glm::vec3 &normal);
+		WorldCollision &);
 
+	/// check if this ray hits an entity
+	bool Intersection(
+		const Ray &,
+		const glm::mat4 &M,
+		EntityCollision &);
+
+	/// check if given entity intersects with the world
 	bool Intersection(const Entity &e, std::vector<WorldCollision> &);
 	void Resolve(Entity &e, std::vector<WorldCollision> &);