X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=e4fb968ddfbb8014004a2b7a6a7647be53b2c2a5;hb=04531ab5fc3d82ba5b5d456bcc277fe6499e1150;hp=a35f76a5d8b80733c421741af14b299419c132cf;hpb=cf5ce8220483bb062740eeaedde6474928fd5e0e;p=blank.git

diff --git a/src/world/world.cpp b/src/world/world.cpp
index a35f76a..e4fb968 100644
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -1,5 +1,6 @@
 #include "Entity.hpp"
 #include "EntityState.hpp"
+#include "Player.hpp"
 #include "World.hpp"
 
 #include "ChunkIndex.hpp"
@@ -124,12 +125,39 @@ glm::mat4 EntityState::Transform(const glm::ivec3 &reference) const noexcept {
 }
 
 
+Player::Player(Entity &e, ChunkIndex &c)
+: entity(e)
+, chunks(c)
+, inv_slot(0) {
+
+}
+
+Player::~Player() {
+
+}
+
+bool Player::SuitableSpawn(BlockLookup &spawn_block) const noexcept {
+	if (!spawn_block || spawn_block.GetType().collide_block) {
+		return false;
+	}
+
+	BlockLookup head_block(spawn_block.Next(Block::FACE_UP));
+	if (!head_block || head_block.GetType().collide_block) {
+		return false;
+	}
+
+	return true;
+}
+
+void Player::Update(int dt) {
+	chunks.Rebase(entity.ChunkCoords());
+}
+
+
 World::World(const BlockTypeRegistry &types, const Config &config)
 : config(config)
 , block_type(types)
 , chunks(types)
-// TODO: set spawn base and extent from config
-, spawn_index(chunks.MakeIndex(Chunk::Pos(0, 0, 0), 3))
 , players()
 , entities()
 , light_direction(config.light_direction)
@@ -138,45 +166,41 @@ World::World(const BlockTypeRegistry &types, const Config &config)
 }
 
 World::~World() {
-	chunks.UnregisterIndex(spawn_index);
+
 }
 
 
-Player World::AddPlayer(const std::string &name) {
+Player *World::AddPlayer(const std::string &name) {
 	for (Player &p : players) {
-		if (p.entity->Name() == name) {
-			return { nullptr, nullptr };
+		if (p.Name() == name) {
+			return nullptr;
 		}
 	}
 	Entity &entity = AddEntity();
 	entity.Name(name);
-	// TODO: load from save file here
 	entity.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
 	entity.WorldCollidable(true);
-	entity.Position(config.spawn);
-	ChunkIndex *index = &chunks.MakeIndex(entity.ChunkCoords(), 6);
-	players.emplace_back(&entity, index);
-	return players.back();
+	ChunkIndex &index = chunks.MakeIndex(entity.ChunkCoords(), 6);
+	players.emplace_back(entity, index);
+	return &players.back();
 }
 
-Player World::AddPlayer(const std::string &name, std::uint32_t id) {
+Player *World::AddPlayer(const std::string &name, std::uint32_t id) {
 	for (Player &p : players) {
-		if (p.entity->Name() == name) {
-			return { nullptr, nullptr };
+		if (p.Name() == name) {
+			return nullptr;
 		}
 	}
 	Entity *entity = AddEntity(id);
 	if (!entity) {
-		return { nullptr, nullptr };
+		return nullptr;
 	}
 	entity->Name(name);
-	// TODO: load from save file here
 	entity->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
 	entity->WorldCollidable(true);
-	entity->Position(config.spawn);
-	ChunkIndex *index = &chunks.MakeIndex(entity->ChunkCoords(), 6);
-	players.emplace_back(entity, index);
-	return players.back();
+	ChunkIndex &index = chunks.MakeIndex(entity->ChunkCoords(), 6);
+	players.emplace_back(*entity, index);
+	return &players.back();
 }
 
 Entity &World::AddEntity() {
@@ -359,7 +383,7 @@ void World::Update(int dt) {
 		}
 	}
 	for (Player &player : players) {
-		player.chunks->Rebase(player.entity->ChunkCoords());
+		player.Update(dt);
 	}
 	for (auto iter = entities.begin(), end = entities.end(); iter != end;) {
 		if (iter->CanRemove()) {
@@ -405,8 +429,8 @@ void World::Resolve(Entity &e, std::vector<WorldCollision> &col) {
 World::EntityHandle World::RemoveEntity(EntityHandle &eh) {
 	// check for player
 	for (auto player = players.begin(), end = players.end(); player != end;) {
-		if (player->entity == &*eh) {
-			chunks.UnregisterIndex(*player->chunks);
+		if (&player->GetEntity() == &*eh) {
+			chunks.UnregisterIndex(player->GetChunks());
 			player = players.erase(player);
 			end = players.end();
 		} else {
@@ -423,7 +447,7 @@ void World::Render(Viewport &viewport) {
 	entity_prog.SetFogDensity(fog_density);
 
 	for (Entity &entity : entities) {
-		entity.Render(entity.Transform(players[0].entity->ChunkCoords()), entity_prog);
+		entity.Render(entity.Transform(players.front().GetEntity().ChunkCoords()), entity_prog);
 	}
 }