X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2FWorld.cpp;h=6ad30ff0761b445a19dc6757203019b6b727d662;hb=4e3d9c23940c4511623b5bf328cbbe42641c4b30;hp=592558b303a943e655fac9eec3f43f5dc7471755;hpb=ad7cf72ed47c39640d5588ba53386e090289b4d1;p=blank.git

diff --git a/src/world/World.cpp b/src/world/World.cpp
index 592558b..6ad30ff 100644
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -6,6 +6,7 @@
 #include "../graphics/Format.hpp"
 #include "../graphics/Viewport.hpp"
 
+#include <algorithm>
 #include <limits>
 #include <glm/gtx/io.hpp>
 #include <glm/gtx/transform.hpp>
@@ -14,24 +15,99 @@
 namespace blank {
 
 World::World(const BlockTypeRegistry &types, const Config &config, const WorldSave &save)
-: block_type(types)
+: config(config)
+, block_type(types)
 , generate(config.gen)
 , chunks(config.load, types, generate, save)
-, player()
+, players()
 , entities()
 , light_direction(config.light_direction)
 , fog_density(config.fog_density) {
 	generate.Space(0);
 	generate.Light(13);
 	generate.Solids({ 1, 4, 7, 10 });
+}
+
 
-	player = &AddEntity();
-	player->Name("player");
+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;
+}
+
+Entity *World::AddPlayer(const std::string &name, std::uint32_t id) {
+	for (Entity *e : players) {
+		if (e->Name() == name) {
+			return nullptr;
+		}
+	}
+	Entity *player = AddEntity(id);
+	if (!player) {
+		return nullptr;
+	}
+	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;
+}
+
+Entity &World::AddEntity() {
+	if (entities.empty()) {
+		entities.emplace_back();
+		entities.back().ID(1);
+		return entities.back();
+	}
+	if (entities.back().ID() < std::numeric_limits<std::uint32_t>::max()) {
+		std::uint32_t id = entities.back().ID() + 1;
+		entities.emplace_back();
+		entities.back().ID(id);
+		return entities.back();
+	}
+	std::uint32_t id = 1;
+	auto position = entities.begin();
+	auto end = entities.end();
+	while (position != end && position->ID() == id) {
+		++id;
+		++position;
+	}
+	auto entity = entities.emplace(position);
+	entity->ID(id);
+	return *entity;
+}
+
+Entity *World::AddEntity(std::uint32_t id) {
+	if (entities.empty() || entities.back().ID() < id) {
+		entities.emplace_back();
+		entities.back().ID(id);
+		return &entities.back();
+	}
+
+	auto position = entities.begin();
+	auto end = entities.end();
+	while (position != end && position->ID() < id) {
+		++position;
+	}
+	if (position != end && position->ID() == id) {
+		return nullptr;
+	}
+	auto entity = entities.emplace(position);
+	entity->ID(id);
+	return &*entity;
 }
 
 
@@ -42,6 +118,10 @@ struct Candidate {
 	float dist;
 };
 
+bool CandidateLess(const Candidate &a, const Candidate &b) {
+	return a.dist < b.dist;
+}
+
 std::vector<Candidate> candidates;
 
 }
@@ -63,6 +143,8 @@ bool World::Intersection(
 
 	if (candidates.empty()) return false;
 
+	std::sort(candidates.begin(), candidates.end(), CandidateLess);
+
 	coll.chunk = nullptr;
 	coll.block = -1;
 	coll.depth = std::numeric_limits<float>::infinity();
@@ -126,11 +208,6 @@ bool World::Intersection(const Entity &e, std::vector<WorldCollision> &col) {
 }
 
 
-Chunk &World::PlayerChunk() {
-	return chunks.ForceLoad(player->ChunkCoords());
-}
-
-
 namespace {
 
 std::vector<WorldCollision> col;
@@ -155,7 +232,8 @@ void World::Update(int dt) {
 			++iter;
 		}
 	}
-	chunks.Rebase(player->ChunkCoords());
+	// TODO: make flexible
+	chunks.Rebase(players[0]->ChunkCoords());
 	chunks.Update(dt);
 }
 
@@ -198,7 +276,7 @@ void World::Render(Viewport &viewport) {
 	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);
 	}
 }