X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fnet%2FPacket.hpp;h=7b9b69e447289efbd2831503f5e3ea2689ce64e4;hb=7e782291e0ce39eb2d4e8c1df28f682c313e6f8d;hp=af2f8727e3383669042365d2085c2f4c9a178083;hpb=4e3d9c23940c4511623b5bf328cbbe42641c4b30;p=blank.git

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index af2f872..7b9b69e 100644
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -5,11 +5,14 @@
 #include <ostream>
 #include <string>
 #include <SDL_net.h>
+#include <glm/glm.hpp>
 
 
 namespace blank {
 
+class Block;
 class Entity;
+class EntityState;
 
 struct Packet {
 
@@ -21,12 +24,20 @@ struct Packet {
 		std::uint16_t seq;
 		std::uint16_t ack;
 		std::uint32_t hist;
+
+		// 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); }
 	};
 
 	struct Header {
 		std::uint32_t tag;
 		TControl ctrl;
 		std::uint8_t type;
+		std::uint8_t reserved1;
+		std::uint8_t reserved2;
+		std::uint8_t reserved3;
 	} header;
 
 	static constexpr std::size_t MAX_PAYLOAD_LEN = 500 - sizeof(Header);
@@ -45,6 +56,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>
@@ -73,7 +96,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;
 	};
@@ -83,6 +106,118 @@ struct Packet {
 		static constexpr std::size_t MAX_LEN = 0;
 	};
 
+	struct PlayerUpdate : public Payload {
+		static constexpr std::uint8_t TYPE = 4;
+		static constexpr std::size_t MAX_LEN = 76;
+
+		void WritePredictedState(const EntityState &) noexcept;
+		void ReadPredictedState(EntityState &) const noexcept;
+		void WriteMovement(const glm::vec3 &) noexcept;
+		void ReadMovement(glm::vec3 &) const noexcept;
+		void WritePitch(float) noexcept;
+		void ReadPitch(float &) const noexcept;
+		void WriteYaw(float) noexcept;
+		void ReadYaw(float &) const noexcept;
+		void WriteActions(std::uint8_t) noexcept;
+		void ReadActions(std::uint8_t &) const noexcept;
+		void WriteSlot(std::uint8_t) noexcept;
+		void ReadSlot(std::uint8_t &) const noexcept;
+	};
+
+	struct SpawnEntity : public Payload {
+		static constexpr std::uint8_t TYPE = 5;
+		static constexpr std::size_t MAX_LEN = 132;
+
+		void WriteEntity(const Entity &) noexcept;
+		void ReadEntityID(std::uint32_t &) const noexcept;
+		void ReadSkeletonID(std::uint32_t &) const noexcept;
+		void ReadEntity(Entity &) const noexcept;
+	};
+
+	struct DespawnEntity : public Payload {
+		static constexpr std::uint8_t TYPE = 6;
+		static constexpr std::size_t MAX_LEN = 4;
+
+		void WriteEntityID(std::uint32_t) noexcept;
+		void ReadEntityID(std::uint32_t &) const noexcept;
+	};
+
+	struct EntityUpdate : public Payload {
+		static constexpr std::uint8_t TYPE = 7;
+		static constexpr std::size_t MAX_LEN = 480;
+
+		static constexpr std::uint32_t MAX_ENTITIES = 7;
+		static constexpr std::size_t GetSize(std::uint32_t num) noexcept {
+			return 4 + (num * 68);
+		}
+
+		void WriteEntityCount(std::uint32_t) noexcept;
+		void ReadEntityCount(std::uint32_t &) const noexcept;
+
+		void WriteEntity(const Entity &, std::uint32_t) noexcept;
+		void ReadEntityID(std::uint32_t &, 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;
+	};
+
+	struct BlockUpdate : public Payload {
+		static constexpr std::uint8_t TYPE = 11;
+		static constexpr std::size_t MAX_LEN = 484;
+
+		static constexpr std::uint32_t MAX_BLOCKS = 78;
+		static constexpr std::size_t GetSize(std::uint32_t num) noexcept {
+			return 16 + (num * 6);
+		}
+
+		void WriteChunkCoords(const glm::ivec3 &) noexcept;
+		void ReadChunkCoords(glm::ivec3 &) const noexcept;
+		void WriteBlockCount(std::uint32_t) noexcept;
+		void ReadBlockCount(std::uint32_t &) const noexcept;
+
+		void WriteIndex(std::uint16_t, std::uint32_t) noexcept;
+		void ReadIndex(std::uint16_t &, std::uint32_t) const noexcept;
+		void WriteBlock(const Block &, std::uint32_t) noexcept;
+		void ReadBlock(Block &, std::uint32_t) const noexcept;
+	};
+
 
 	template<class PayloadType>
 	PayloadType As() {