X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FClientConnection.hpp;h=075fdcec190655e3aff8534b40a359c36db8e70e;hb=ae5a7e7d8517fac406a88e9bf98fd3d5bb1728b9;hp=7fb797bea1d89870034ffcb4ef23803f83b69def;hpb=8507332e2d0c54aec4045fb6f0021bdc3bd57750;p=blank.git

diff --git a/src/net/ClientConnection.hpp b/src/net/ClientConnection.hpp
index 7fb797b..075fdce 100644
--- a/src/net/ClientConnection.hpp
+++ b/src/net/ClientConnection.hpp
@@ -1,17 +1,21 @@
 #ifndef BLANK_NET_CLIENTCONNECTION_HPP_
 #define BLANK_NET_CLIENTCONNECTION_HPP_
 
+#include "ChunkTransmitter.hpp"
 #include "Connection.hpp"
 #include "ConnectionHandler.hpp"
+#include "Server.hpp"
 #include "../app/IntervalTimer.hpp"
+#include "../world/EntityState.hpp"
+#include "../world/Player.hpp"
 
+#include <deque>
 #include <list>
 #include <SDL_net.h>
 
 
 namespace blank {
 
-class Entity;
 class Server;
 
 class ClientConnection
@@ -28,11 +32,23 @@ public:
 	Connection &GetConnection() noexcept { return conn; }
 	bool Disconnected() const noexcept { return conn.Closed(); }
 
-	void AttachPlayer(Entity &);
+	/// prepare a packet of given type
+	template<class Type>
+	Type Prepare() const noexcept {
+		return Packet::Make<Type>(server.GetPacket());
+	}
+	/// send the previously prepared packet
+	std::uint16_t Send();
+	/// send the previously prepared packet of non-default length
+	std::uint16_t Send(std::size_t len);
+
+	void AttachPlayer(const Player &);
 	void DetachPlayer();
-	bool HasPlayer() const noexcept { return player; }
-	Entity &Player() noexcept { return *player; }
-	const Entity &Player() const noexcept { return *player; }
+	bool HasPlayer() const noexcept { return player.entity; }
+	Entity &PlayerEntity() noexcept { return *player.entity; }
+	const Entity &PlayerEntity() const noexcept { return *player.entity; }
+	ChunkIndex &PlayerChunks() noexcept { return *player.chunks; }
+	const ChunkIndex &PlayerChunks() const noexcept { return *player.chunks; }
 
 private:
 	struct SpawnStatus {
@@ -64,15 +80,23 @@ private:
 
 	void CheckPlayerFix();
 
+	void CheckChunkQueue();
+
 private:
 	Server &server;
 	Connection conn;
-	Entity *player;
+	Player player;
 	std::list<SpawnStatus> spawns;
 	unsigned int confirm_wait;
+
+	EntityState player_update_state;
 	std::uint16_t player_update_pack;
 	IntervalTimer player_update_timer;
 
+	ChunkTransmitter transmitter;
+	std::deque<glm::ivec3> chunk_queue;
+	glm::ivec3 old_base;
+
 };
 
 }