X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=09db0dfd1b0ceb4c69d23eae752d58af8f55a10d;hb=38a4cffc0b6aa58e49d24c06aad7bee14cb6515d;hp=76cd966bed681aec73e22f8c9a87276eb1cc4569;hpb=d4c71969df4f6b5e6b750c98268d30ca6784908b;p=blank.git

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index 76cd966..09db0df 100644
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -5,11 +5,13 @@
 #include <ostream>
 #include <string>
 #include <SDL_net.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
 
 class Entity;
+class EntityState;
 
 struct Packet {
 
@@ -25,7 +27,7 @@ struct Packet {
 		// true if this contains an ack for given (remote) seq
 		bool Acks(std::uint16_t) const noexcept;
 		std::uint16_t AckBegin() const noexcept { return ack; }
-		std::uint16_t AckEnd() const noexcept { return ack + std::uint16_t(33); }
+		std::uint16_t AckEnd() const noexcept { return ack - std::uint16_t(33); }
 	};
 
 	struct Header {
@@ -53,6 +55,18 @@ struct Packet {
 		std::size_t length;
 		std::uint8_t *data;
 
+		/// WARNING: do not use these if the data doesn not
+		///          point into a real packet's payload
+		const Packet &GetPacket() const noexcept {
+			return *reinterpret_cast<const Packet *>(data - sizeof(Header));
+		}
+		const Header &GetHeader() const noexcept {
+			return GetPacket().header;
+		}
+		std::uint16_t Seq() const noexcept {
+			return GetHeader().ctrl.seq;
+		}
+
 		template<class T>
 		void Write(const T &, size_t off) noexcept;
 		template<class T>
@@ -81,7 +95,7 @@ struct Packet {
 
 		void WritePlayer(const Entity &) noexcept;
 		void ReadPlayerID(std::uint32_t &) const noexcept;
-		void ReadPlayer(Entity &) const noexcept;
+		void ReadPlayerState(EntityState &) const noexcept;
 		void WriteWorldName(const std::string &) noexcept;
 		void ReadWorldName(std::string &) const noexcept;
 	};
@@ -96,7 +110,7 @@ struct Packet {
 		static constexpr std::size_t MAX_LEN = 64;
 
 		void WritePlayer(const Entity &) noexcept;
-		void ReadPlayer(Entity &) const noexcept;
+		void ReadPlayerState(EntityState &) const noexcept;
 	};
 
 	struct SpawnEntity : public Payload {
@@ -131,7 +145,46 @@ struct Packet {
 
 		void WriteEntity(const Entity &, std::uint32_t) noexcept;
 		void ReadEntityID(std::uint32_t &, std::uint32_t) const noexcept;
-		void ReadEntity(Entity &, std::uint32_t) const noexcept;
+		void ReadEntityState(EntityState &, std::uint32_t) const noexcept;
+	};
+
+	struct PlayerCorrection : public Payload {
+		static constexpr std::uint8_t TYPE = 8;
+		static constexpr std::size_t MAX_LEN = 66;
+
+		void WritePacketSeq(std::uint16_t) noexcept;
+		void ReadPacketSeq(std::uint16_t &) const noexcept;
+		void WritePlayer(const Entity &) noexcept;
+		void ReadPlayerState(EntityState &) const noexcept;
+	};
+
+	struct ChunkBegin : public Payload {
+		static constexpr std::uint8_t TYPE = 9;
+		static constexpr std::size_t MAX_LEN = 24;
+
+		void WriteTransmissionId(std::uint32_t) noexcept;
+		void ReadTransmissionId(std::uint32_t &) const noexcept;
+		void WriteFlags(std::uint32_t) noexcept;
+		void ReadFlags(std::uint32_t &) const noexcept;
+		void WriteChunkCoords(const glm::ivec3 &) noexcept;
+		void ReadChunkCoords(glm::ivec3 &) const noexcept;
+		void WriteDataSize(std::uint32_t) noexcept;
+		void ReadDataSize(std::uint32_t &) const noexcept;
+	};
+
+	struct ChunkData : public Payload {
+		static constexpr std::uint8_t TYPE = 10;
+		static constexpr std::size_t MAX_LEN = MAX_PAYLOAD_LEN;
+		static constexpr std::size_t MAX_DATA_LEN = MAX_LEN - 12;
+
+		void WriteTransmissionId(std::uint32_t) noexcept;
+		void ReadTransmissionId(std::uint32_t &) const noexcept;
+		void WriteDataOffset(std::uint32_t) noexcept;
+		void ReadDataOffset(std::uint32_t &) const noexcept;
+		void WriteDataSize(std::uint32_t) noexcept;
+		void ReadDataSize(std::uint32_t &) const noexcept;
+		void WriteData(const std::uint8_t *, std::size_t len) noexcept;
+		void ReadData(std::uint8_t *, std::size_t maxlen) const noexcept;
 	};