X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=d17cba65e70e6f767182a64bf253f7ad8735fdfb;hb=dbaf7ce2273e86297d04662452ad4c2e89d9b9e4;hp=767f527a9034b97f352c66eda80f42d3f6569c0b;hpb=7354c74fb8f409336db3a6d70455fbc10232ae64;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 767f527..d17cba6 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -61,6 +61,11 @@ public:
 
 	/// 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
@@ -119,9 +124,9 @@ private:
 		const Entity &,
 		const EntityState &
 	);
-	glm::vec3 CollisionForce(
+	void CollisionFix(
 		const Entity &,
-		const EntityState &
+		EntityState &
 	);
 	glm::vec3 Gravity(
 		const Entity &,