X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;h=06ccb62cfea1f97f0341ac313c3848f9ee81e9a6;hb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;hp=19219e4dd9360a85b68c69cc81b9f982fd94eb54;hpb=d02daa5a4805dc3184884f3a7cd7620e5787adcb;p=blank.git

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 19219e4..06ccb62 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -1,10 +1,12 @@
 #include "World.hpp"
 
+#include "EntityCollision.hpp"
 #include "WorldCollision.hpp"
 #include "../app/Assets.hpp"
 #include "../graphics/Format.hpp"
 #include "../graphics/Viewport.hpp"
 
+#include <algorithm>
 #include <limits>
 #include <glm/gtx/io.hpp>
 #include <glm/gtx/transform.hpp>
@@ -12,189 +14,36 @@
 
 namespace blank {
 
-World::World(const Assets &assets, const Config &config, const WorldSave &save)
-: blockType()
-, blockShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }})
-, stairShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f })
-, slabShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }})
-, block_tex()
+World::World(const BlockTypeRegistry &types, const Config &config, const WorldSave &save)
+: config(config)
+, block_type(types)
 , generate(config.gen)
-, chunks(config.load, blockType, generate, save)
-, player()
+, chunks(config.load, types, generate, save)
+, players()
 , entities()
 , light_direction(config.light_direction)
 , fog_density(config.fog_density) {
-	BlockType::Faces block_fill = {  true,  true,  true,  true,  true,  true };
-	BlockType::Faces slab_fill  = { false,  true, false, false, false, false };
-	BlockType::Faces stair_fill = { false,  true, false, false, false,  true };
-
-	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);
-	block_tex.FilterNearest();
-
-	{ // white block
-		BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape);
-		type.texture = 1;
-		type.label = "White Block";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-	{ // white slab
-		BlockType type(true, { 1.0f, 1.0f, 1.0f }, &slabShape);
-		type.texture = 1;
-		type.label = "White Slab";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = slab_fill;
-		blockType.Add(type);
-	}
-	{ // white stair
-		BlockType type(true, { 1.0f, 1.0f, 1.0f }, &stairShape);
-		type.texture = 1;
-		type.label = "White Stair";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = stair_fill;
-		blockType.Add(type);
-	}
-
-	{ // red block
-		BlockType type(true, { 1.0f, 0.0f, 0.0f }, &blockShape);
-		type.texture = 3;
-		type.label = "Red Block";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-	{ // red slab
-		BlockType type(true, { 1.0f, 0.0f, 0.0f }, &slabShape);
-		type.texture = 3;
-		type.label = "Red Slab";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = slab_fill;
-		blockType.Add(type);
-	}
-	{ // red stair
-		BlockType type(true, { 1.0f, 0.0f, 0.0f }, &stairShape);
-		type.texture = 3;
-		type.label = "Red Stair";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = stair_fill;
-		blockType.Add(type);
-	}
-
-	{ // green block
-		BlockType type(true, { 0.0f, 1.0f, 0.0f }, &blockShape);
-		type.texture = 1;
-		type.label = "Green Block";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-	{ // green slab
-		BlockType type(true, { 0.0f, 1.0f, 0.0f }, &slabShape);
-		type.texture = 1;
-		type.label = "Green Slab";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = slab_fill;
-		blockType.Add(type);
-	}
-	{ // green stair
-		BlockType type(true, { 0.0f, 1.0f, 0.0f }, &stairShape);
-		type.texture = 1;
-		type.label = "Green Stair";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = stair_fill;
-		blockType.Add(type);
-	}
-
-	{ // blue block
-		BlockType type(true, { 0.0f, 0.0f, 1.0f }, &blockShape);
-		type.texture = 3;
-		type.label = "Blue Block";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-	{ // blue slab
-		BlockType type(true, { 0.0f, 0.0f, 1.0f }, &slabShape);
-		type.texture = 3;
-		type.label = "Blue Slab";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = slab_fill;
-		blockType.Add(type);
-	}
-	{ // blue stair
-		BlockType type(true, { 0.0f, 0.0f, 1.0f }, &stairShape);
-		type.texture = 3;
-		type.label = "Blue Stair";
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = stair_fill;
-		blockType.Add(type);
-	}
-
-	{ // glowing yellow block
-		BlockType type(true, { 1.0f, 1.0f, 0.0f }, &blockShape);
-		type.texture = 2;
-		type.label = "Light";
-		type.luminosity = 15;
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-
-	{ // the mysterious debug cube
-		BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape);
-		type.texture = 0;
-		type.label = "Debug Cube";
-		type.luminosity = 0;
-		type.block_light = true;
-		type.collision = true;
-		type.collide_block = true;
-		type.fill = block_fill;
-		blockType.Add(type);
-	}
-
 	generate.Space(0);
 	generate.Light(13);
 	generate.Solids({ 1, 4, 7, 10 });
+}
 
-	player = &AddEntity();
-	player->Name("player");
-	player->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
-	player->WorldCollidable(true);
-	player->Position(config.spawn);
 
-	chunks.QueueSurrounding(player->ChunkCoords());
+Entity *World::AddPlayer(const std::string &name) {
+	for (Entity *e : players) {
+		if (e->Name() == name) {
+			return nullptr;
+		}
+	}
+	Entity &player = AddEntity();
+	player.Name(name);
+	// TODO: load from save file here
+	player.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
+	player.WorldCollidable(true);
+	player.Position(config.spawn);
+	players.push_back(&player);
+	chunks.QueueSurrounding(player.ChunkCoords());
+	return &player;
 }
 
 
@@ -205,6 +54,10 @@ struct Candidate {
 	float dist;
 };
 
+bool CandidateLess(const Candidate &a, const Candidate &b) {
+	return a.dist < b.dist;
+}
+
 std::vector<Candidate> candidates;
 
 }
@@ -212,52 +65,78 @@ 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;
+	std::sort(candidates.begin(), candidates.end(), CandidateLess);
+
+	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;
 		}
 	}
@@ -265,16 +144,6 @@ bool World::Intersection(const Entity &e, std::vector<WorldCollision> &col) {
 }
 
 
-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 {
 
 std::vector<WorldCollision> col;
@@ -299,7 +168,8 @@ void World::Update(int dt) {
 			++iter;
 		}
 	}
-	chunks.Rebase(player->ChunkCoords());
+	// TODO: make flexible
+	chunks.Rebase(players[0]->ChunkCoords());
 	chunks.Update(dt);
 }
 
@@ -337,27 +207,12 @@ void World::Resolve(Entity &e, std::vector<WorldCollision> &col) {
 
 
 void World::Render(Viewport &viewport) {
-	viewport.WorldPosition(player->Transform(player->ChunkCoords()));
-
-	BlockLighting &chunk_prog = viewport.ChunkProgram();
-	chunk_prog.SetTexture(block_tex);
-	chunk_prog.SetFogDensity(fog_density);
-
-	for (Chunk &chunk : chunks.Loaded()) {
-		glm::mat4 m(chunk.Transform(player->ChunkCoords()));
-		chunk_prog.SetM(m);
-		glm::mat4 mvp(chunk_prog.GetVP() * m);
-		if (!CullTest(Chunk::Bounds(), mvp)) {
-			chunk.Draw();
-		}
-	}
-
 	DirectionalLighting &entity_prog = viewport.EntityProgram();
 	entity_prog.SetLightDirection(light_direction);
 	entity_prog.SetFogDensity(fog_density);
 
 	for (Entity &entity : entities) {
-		entity.Render(entity.ChunkTransform(player->ChunkCoords()), entity_prog);
+		entity.Render(entity.ChunkTransform(players[0]->ChunkCoords()), entity_prog);
 	}
 }