X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.hpp;h=7936f98cfd6dcec82a639454d4f8cf9f02c33f84;hb=b94a7dc7daad9ae9be90a39d723e332dae375325;hp=273bfa63abc3809a507f77889015f044515b254c;hpb=b4e5dad2ed5c7e77573de413f3bf5be88577856d;p=blank.git

diff --git a/src/world/World.hpp b/src/world/World.hpp
index 273bfa6..7936f98 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -17,7 +17,6 @@ namespace blank {
 
 class BlockTypeRegistry;
 class EntityCollision;
-struct EntityDerivative;
 class Viewport;
 class WorldCollision;
 
@@ -45,24 +44,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 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 &);
 
 	/// 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
@@ -97,8 +99,11 @@ public:
 
 	// dt in ms
 	void Update(int dt);
-	// dt in s
-	void Update(Entity &, float dt);
+
+	/// fix state so entity doesn't intersect with the solid world
+	void ResolveWorldCollision(const Entity &, EntityState &);
+	/// get force due to gravity at given location
+	glm::vec3 GravityAt(const ExactLocation &) const noexcept;
 
 	void Render(Viewport &);
 	void RenderDebug(Viewport &);
@@ -107,29 +112,6 @@ private:
 	using EntityHandle = std::list<Entity>::iterator;
 	EntityHandle RemoveEntity(EntityHandle &);
 
-	EntityDerivative CalculateStep(
-		const Entity &,
-		const EntityState &cur,
-		float dt,
-		const EntityDerivative &prev
-	);
-	glm::vec3 CalculateForce(
-		const Entity &,
-		const EntityState &cur
-	);
-	glm::vec3 ControlForce(
-		const Entity &,
-		const EntityState &
-	);
-	glm::vec3 CollisionForce(
-		const Entity &,
-		const EntityState &
-	);
-	glm::vec3 Gravity(
-		const Entity &,
-		const EntityState &
-	);
-
 	/// calculate light direction and intensity at entity's location
 	void GetLight(
 		const Entity &entity,