X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.cpp;h=27daecd3f27c78ffad686f5a4b0c2b494930b1c7;hb=5868f740c492a924cb865644b6201db1632b7376;hp=5244d152bbe1326e190d2819120c1e54d7b3729f;hpb=30d36f3d545617faef76f90c4121d6ed118ba272;p=blank.git

diff --git a/src/world.cpp b/src/world.cpp
index 5244d15..27daecd 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -85,12 +85,24 @@ World::World()
 	generate.Space(0);
 	generate.Solids({ 1, 4, 7, 10 });
 
-	player.Position({ 4.0f, 4.0f, 4.0f });
+	player = &AddEntity();
+	player->Position({ 4.0f, 4.0f, 4.0f });
 
 	chunks.Generate({ -4, -4, -4 }, { 5, 5, 5});
 }
 
 
+namespace {
+
+struct Candidate {
+	Chunk *chunk;
+	float dist;
+};
+
+std::vector<Candidate> candidates;
+
+}
+
 bool World::Intersection(
 		const Ray &ray,
 		const glm::mat4 &M,
@@ -98,18 +110,30 @@ bool World::Intersection(
 		int *blkid,
 		float *dist,
 		glm::vec3 *normal) {
+	candidates.clear();
+
+	for (Chunk &cur_chunk : chunks.Loaded()) {
+		float cur_dist;
+		if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player->ChunkCoords()), cur_dist)) {
+			candidates.push_back({ &cur_chunk, cur_dist });
+		}
+	}
+
+	if (candidates.empty()) return false;
+
 	Chunk *closest_chunk = nullptr;
-	int closest_blkid = -1;
 	float closest_dist = std::numeric_limits<float>::infinity();
+	int closest_blkid = -1;
 	glm::vec3 closest_normal;
 
-	for (Chunk &cur_chunk : chunks.Loaded()) {
+	for (Candidate &cand : candidates) {
+		if (cand.dist > closest_dist) continue;
 		int cur_blkid;
 		float cur_dist;
 		glm::vec3 cur_normal;
-		if (cur_chunk.Intersection(ray, M * cur_chunk.Transform(player.ChunkCoords()), &cur_blkid, &cur_dist, &cur_normal)) {
+		if (cand.chunk->Intersection(ray, M * cand.chunk->Transform(player->ChunkCoords()), cur_blkid, cur_dist, cur_normal)) {
 			if (cur_dist < closest_dist) {
-				closest_chunk = &cur_chunk;
+				closest_chunk = cand.chunk;
 				closest_blkid = cur_blkid;
 				closest_dist = cur_dist;
 				closest_normal = cur_normal;
@@ -140,24 +164,33 @@ Chunk &World::Next(const Chunk &to, const glm::tvec3<int> &dir) {
 
 
 void World::Update(int dt) {
-	player.Update(dt);
-	chunks.Rebase(player.ChunkCoords());
+	for (Entity &entity : entities) {
+		entity.Update(dt);
+	}
+	chunks.Rebase(player->ChunkCoords());
 	chunks.Update();
 }
 
 
 void World::Render(DirectionalLighting &program) {
 	program.SetLightDirection({ -1.0f, -3.0f, -2.0f });
-	program.SetView(glm::inverse(player.Transform(player.ChunkCoords())));
+	program.SetView(glm::inverse(player->Transform(player->ChunkCoords())));
 
 	for (Chunk &chunk : chunks.Loaded()) {
-		glm::mat4 m(chunk.Transform(player.ChunkCoords()));
+		glm::mat4 m(chunk.Transform(player->ChunkCoords()));
 		program.SetM(m);
 		glm::mat4 mvp(program.GetVP() * m);
 		if (!CullTest(Chunk::Bounds(), mvp)) {
 			chunk.Draw();
 		}
 	}
+
+	for (Entity &entity : entities) {
+		if (entity.HasShape()) {
+			program.SetM(entity.Transform(player->ChunkCoords()));
+			entity.Draw();
+		}
+	}
 }
 
 }