X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;h=7ac9e18a6287e80ef989657f57b10d71c35b9ce3;hb=e872614d387c4bfc3afb04bcc7cba3d9b8f3954b;hp=5827e8f872f2112e6c057d5c98958ab6d4bbd5bf;hpb=ede25c0a2f59e21521d1cd962e6ea9d78169ca12;p=blank.git

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 5827e8f..7ac9e18 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -1,7 +1,9 @@
 #include "World.hpp"
 
+#include "EntityCollision.hpp"
 #include "WorldCollision.hpp"
 #include "../app/Assets.hpp"
+#include "../app/TextureIndex.hpp"
 #include "../graphics/Format.hpp"
 #include "../graphics/Viewport.hpp"
 
@@ -21,16 +23,13 @@ World::World(const Assets &assets, const Config &config, const WorldSave &save)
 , entities()
 , light_direction(config.light_direction)
 , fog_density(config.fog_density) {
+	TextureIndex tex_index;
+	assets.LoadBlockTypes("default", block_type, tex_index);
+
 	block_tex.Bind();
-	block_tex.Reserve(16, 16, 4, Format());
-	assets.LoadTexture("debug", block_tex, 0);
-	assets.LoadTexture("rock-1", block_tex, 1);
-	assets.LoadTexture("rock-2", block_tex, 2);
-	assets.LoadTexture("rock-3", block_tex, 3);
+	assets.LoadTextures(tex_index, block_tex);
 	block_tex.FilterNearest();
 
-	assets.LoadBlockTypes("default", block_type);
-
 	generate.Space(0);
 	generate.Light(13);
 	generate.Solids({ 1, 4, 7, 10 });
@@ -59,52 +58,76 @@ std::vector<Candidate> candidates;
 bool World::Intersection(
 	const Ray &ray,
 	const glm::mat4 &M,
-	Chunk *&chunk,
-	int &blkid,
-	float &dist,
-	glm::vec3 &normal
+	const Chunk::Pos &reference,
+	WorldCollision &coll
 ) {
 	candidates.clear();
 
 	for (Chunk &cur_chunk : chunks.Loaded()) {
 		float cur_dist;
-		if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player->ChunkCoords()), cur_dist)) {
+		if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(reference), cur_dist)) {
 			candidates.push_back({ &cur_chunk, cur_dist });
 		}
 	}
 
 	if (candidates.empty()) return false;
 
-	chunk = nullptr;
-	dist = std::numeric_limits<float>::infinity();
-	blkid = -1;
+	coll.chunk = nullptr;
+	coll.block = -1;
+	coll.depth = std::numeric_limits<float>::infinity();
 
 	for (Candidate &cand : candidates) {
-		if (cand.dist > dist) continue;
-		int cur_blkid;
+		if (cand.dist > coll.depth) continue;
+		WorldCollision cur_coll;
+		if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(reference), cur_coll)) {
+			if (cur_coll.depth < coll.depth) {
+				coll = cur_coll;
+			}
+		}
+	}
+
+	return coll.chunk;
+}
+
+bool World::Intersection(
+	const Ray &ray,
+	const glm::mat4 &M,
+	const Entity &reference,
+	EntityCollision &coll
+) {
+	coll.entity = nullptr;
+	coll.depth = std::numeric_limits<float>::infinity();
+	for (Entity &cur_entity : entities) {
+		if (&cur_entity == &reference) {
+			continue;
+		}
 		float cur_dist;
 		glm::vec3 cur_normal;
-		if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(player->ChunkCoords()), cur_blkid, cur_dist, cur_normal)) {
-			if (cur_dist < dist) {
-				chunk = cand.chunk;
-				blkid = cur_blkid;
-				dist = cur_dist;
-				normal = cur_normal;
+		if (blank::Intersection(ray, cur_entity.Bounds(), M * cur_entity.Transform(reference.ChunkCoords()), &cur_dist, &cur_normal)) {
+			// TODO: fine grained check goes here? maybe?
+			if (cur_dist < coll.depth) {
+				coll.entity = &cur_entity;
+				coll.depth = cur_dist;
+				coll.normal = cur_normal;
 			}
 		}
 	}
 
-	return chunk;
+	return coll.entity;
 }
 
 bool World::Intersection(const Entity &e, std::vector<WorldCollision> &col) {
 	AABB box = e.Bounds();
-	glm::mat4 M = e.Transform(player->ChunkCoords());
+	Chunk::Pos reference = e.ChunkCoords();
+	glm::mat4 M = e.Transform(reference);
 	bool any = false;
-	// TODO: this only needs to check the chunks surrounding the entity's chunk position
-	//       need find out if that is quicker than the rough chunk bounds test
 	for (Chunk &cur_chunk : chunks.Loaded()) {
-		if (cur_chunk.Intersection(box, M, cur_chunk.Transform(player->ChunkCoords()), col)) {
+		if (manhattan_radius(cur_chunk.Position() - e.ChunkCoords()) > 1) {
+			// chunk is not one of the 3x3x3 surrounding the entity
+			// since there's no entity which can extent over 16 blocks, they can be skipped
+			continue;
+		}
+		if (cur_chunk.Intersection(box, M, cur_chunk.Transform(reference), col)) {
 			any = true;
 		}
 	}
@@ -116,11 +139,6 @@ Chunk &World::PlayerChunk() {
 	return chunks.ForceLoad(player->ChunkCoords());
 }
 
-Chunk &World::Next(const Chunk &to, const glm::ivec3 &dir) {
-	const Chunk::Pos tgt_pos = to.Position() + dir;
-	return chunks.ForceLoad(tgt_pos);
-}
-
 
 namespace {