X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fserver%2Fnet.cpp;h=6ceb186644d3a9f7d5d24526d3cfb2376492db8c;hb=dbd214ac278019c20c883cbb76456b0b0fddc063;hp=16aa1cb004733865337976e72c51c78da6382e87;hpb=5178dd1e226d45db7ae61e3d7d6866dc4254d9ae;p=blank.git

diff --git a/src/server/net.cpp b/src/server/net.cpp
index 16aa1cb..6ceb186 100644
--- a/src/server/net.cpp
+++ b/src/server/net.cpp
@@ -4,11 +4,12 @@
 
 #include "../app/init.hpp"
 #include "../io/WorldSave.hpp"
-#include "../model/CompositeModel.hpp"
+#include "../model/Model.hpp"
 #include "../world/ChunkIndex.hpp"
 #include "../world/Entity.hpp"
 #include "../world/World.hpp"
 
+#include <algorithm>
 #include <iostream>
 #include <zlib.h>
 #include <glm/gtx/io.hpp>
@@ -352,6 +353,23 @@ void ClientConnection::CheckPlayerFix() {
 	}
 }
 
+namespace {
+
+struct QueueCompare {
+	explicit QueueCompare(const glm::ivec3 &base)
+	: base(base) { }
+	bool operator ()(const glm::ivec3 &left, const glm::ivec3 &right) const noexcept {
+		const glm::ivec3 ld(left - base);
+		const glm::ivec3 rd(right - base);
+		return
+			ld.x * ld.x + ld.y * ld.y + ld.z * ld.z <
+			rd.x * rd.x + rd.y * rd.y + rd.z * rd.z;
+	}
+	const glm::ivec3 &base;
+};
+
+}
+
 void ClientConnection::CheckChunkQueue() {
 	if (PlayerChunks().Base() != old_base) {
 		Chunk::Pos begin = PlayerChunks().CoordsBegin();
@@ -366,6 +384,7 @@ void ClientConnection::CheckChunkQueue() {
 			}
 		}
 		old_base = PlayerChunks().Base();
+		sort(chunk_queue.begin(), chunk_queue.end(), QueueCompare(old_base));
 	}
 	if (transmitter.Transmitting()) {
 		transmitter.Transmit();
@@ -395,11 +414,6 @@ void ClientConnection::AttachPlayer(Player &player) {
 	DetachPlayer();
 	input.reset(new DirectInput(server.GetWorld(), player, server));
 	PlayerEntity().Ref();
-	if (server.GetWorldSave().Exists(player)) {
-		server.GetWorldSave().Read(player);
-	} else {
-		// TODO: spawn
-	}
 
 	old_base = PlayerChunks().Base();
 	Chunk::Pos begin = PlayerChunks().CoordsBegin();
@@ -411,6 +425,8 @@ void ClientConnection::AttachPlayer(Player &player) {
 			}
 		}
 	}
+	sort(chunk_queue.begin(), chunk_queue.end(), QueueCompare(old_base));
+	// TODO: should the server do this?
 	if (HasPlayerModel()) {
 		GetPlayerModel().Instantiate(PlayerEntity().GetModel());
 	}
@@ -430,7 +446,7 @@ void ClientConnection::DetachPlayer() {
 	old_actions = 0;
 }
 
-void ClientConnection::SetPlayerModel(const CompositeModel &m) noexcept {
+void ClientConnection::SetPlayerModel(const Model &m) noexcept {
 	player_model = &m;
 	if (HasPlayer()) {
 		m.Instantiate(PlayerEntity().GetModel());
@@ -441,7 +457,7 @@ bool ClientConnection::HasPlayerModel() const noexcept {
 	return player_model;
 }
 
-const CompositeModel &ClientConnection::GetPlayerModel() const noexcept {
+const Model &ClientConnection::GetPlayerModel() const noexcept {
 	return *player_model;
 }
 
@@ -489,7 +505,7 @@ void ClientConnection::On(const Packet::Login &pack) {
 	string name;
 	pack.ReadPlayerName(name);
 
-	Player *new_player = server.GetWorld().AddPlayer(name);
+	Player *new_player = server.JoinPlayer(name);
 
 	if (new_player) {
 		// success!
@@ -566,12 +582,30 @@ bool ClientConnection::ChunkInRange(const glm::ivec3 &pos) const noexcept {
 	return HasPlayer() && PlayerChunks().InRange(pos);
 }
 
+void ClientConnection::On(const Packet::Message &pack) {
+	uint8_t type;
+	uint32_t ref;
+	string msg;
+	pack.ReadType(type);
+	pack.ReadReferral(ref);
+	pack.ReadMessage(msg);
+
+	if (type == 1 && HasPlayer()) {
+		server.DistributeMessage(1, PlayerEntity().ID(), msg);
+	}
+}
+
 
-Server::Server(const Config::Network &conf, World &world, const WorldSave &save)
+Server::Server(
+	const Config::Network &conf,
+	World &world,
+	const World::Config &wc,
+	const WorldSave &save)
 : serv_sock(nullptr)
 , serv_pack{ -1, nullptr, 0 }
 , clients()
 , world(world)
+, spawn_index(world.Chunks().MakeIndex(wc.spawn, 3))
 , save(save)
 , player_model(nullptr) {
 	serv_sock = SDLNet_UDP_Open(conf.port);
@@ -584,6 +618,7 @@ Server::Server(const Config::Network &conf, World &world, const WorldSave &save)
 }
 
 Server::~Server() {
+	world.Chunks().UnregisterIndex(spawn_index);
 	delete[] serv_pack.data;
 	SDLNet_UDP_Close(serv_sock);
 }
@@ -640,7 +675,7 @@ void Server::Update(int dt) {
 	}
 }
 
-void Server::SetPlayerModel(const CompositeModel &m) noexcept {
+void Server::SetPlayerModel(const Model &m) noexcept {
 	player_model = &m;
 	for (ClientConnection &client : clients) {
 		client.SetPlayerModel(m);
@@ -651,10 +686,26 @@ bool Server::HasPlayerModel() const noexcept {
 	return player_model;
 }
 
-const CompositeModel &Server::GetPlayerModel() const noexcept {
+const Model &Server::GetPlayerModel() const noexcept {
 	return *player_model;
 }
 
+Player *Server::JoinPlayer(const string &name) {
+	if (spawn_index.MissingChunks() > 0) {
+		return nullptr;
+	}
+	Player *player = world.AddPlayer(name);
+	if (!player) {
+		return nullptr;
+	}
+	if (save.Exists(*player)) {
+		save.Read(*player);
+	} else {
+		// TODO: spawn
+	}
+	return player;
+}
+
 void Server::SetBlock(Chunk &chunk, int index, const Block &block) {
 	chunk.SetBlock(index, block);
 	// TODO: batch chunk changes
@@ -671,5 +722,20 @@ void Server::SetBlock(Chunk &chunk, int index, const Block &block) {
 	}
 }
 
+void Server::DistributeMessage(uint8_t type, uint32_t ref, const string &msg) {
+	auto pack = Packet::Make<Packet::Message>(serv_pack);
+	pack.WriteType(type);
+	pack.WriteReferral(ref);
+	pack.WriteMessage(msg);
+	serv_pack.len = sizeof(Packet::Header) + Packet::Message::GetSize(msg);
+	SendAll();
+}
+
+void Server::SendAll() {
+	for (ClientConnection &client : clients) {
+		client.GetConnection().Send(serv_pack, serv_sock);
+	}
+}
+
 }
 }