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

diff --git a/src/world/World.hpp b/src/world/World.hpp
index d58ad6f..7936f98 100644
--- a/src/world/World.hpp
+++ b/src/world/World.hpp
@@ -25,8 +25,8 @@ class World {
 public:
 	struct Config {
 		std::string name = "default";
-		// initial player position
-		glm::vec3 spawn = { 0.0f, 0.0f, 0.0f };
+		// chunk base where new players are spawned
+		glm::ivec3 spawn = { 0, 0, 0 };
 		// direction facing towards(!) the light
 		glm::vec3 light_direction = { -1.0f, -3.0f, -2.0f };
 		// fade out reaches 1/e (0.3679) at 1/fog_density,
@@ -44,25 +44,35 @@ 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, std::vector<WorldCollision> &);
-	void Resolve(Entity &e, std::vector<WorldCollision> &);
+	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
+	bool Intersection(
+		const AABB &box,
+		const glm::mat4 &M,
+		const glm::ivec3 &reference,
+		std::vector<WorldCollision> &);
 
 	const BlockTypeRegistry &BlockTypes() noexcept { return block_type; }
 	ChunkStore &Chunks() noexcept { return chunks; }
@@ -82,25 +92,40 @@ public:
 	/// returs an existing entity if ID is already taken
 	Entity &ForceAddEntity(std::uint32_t id);
 
+	std::list<Player> &Players() noexcept { return players; }
 	const std::list<Player> &Players() const noexcept { return players; }
 	std::list<Entity> &Entities() noexcept { return entities; }
 	const std::list<Entity> &Entities() const noexcept { return entities; }
 
+	// dt in ms
 	void Update(int 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 &);
 
 private:
 	using EntityHandle = std::list<Entity>::iterator;
 	EntityHandle RemoveEntity(EntityHandle &);
 
+	/// 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;
 
 	const BlockTypeRegistry &block_type;
 
 	ChunkStore chunks;
-	ChunkIndex &spawn_index;
 
 	std::list<Player> players;
 	std::list<Entity> entities;