X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet%2Fnet.cpp;h=e267855c301ff24bdf9409640724939e635b22af;hb=ca90ec459ca0bd48c1483a45f30496aed61e9c21;hp=e766c76d0b1201892bd1f0393a0d108f9d640b96;hpb=c1da86ebab41895bf49ed747c75ecf722e8c5586;p=blank.git

diff --git a/src/net/net.cpp b/src/net/net.cpp
index e766c76..e267855 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -4,7 +4,7 @@
 #include "Packet.hpp"
 
 #include "../app/init.hpp"
-#include "../model/CompositeModel.hpp"
+#include "../model/Model.hpp"
 #include "../world/Entity.hpp"
 #include "../world/EntityState.hpp"
 
@@ -26,6 +26,9 @@ constexpr size_t Packet::EntityUpdate::MAX_LEN;
 constexpr size_t Packet::PlayerCorrection::MAX_LEN;
 constexpr size_t Packet::ChunkBegin::MAX_LEN;
 constexpr size_t Packet::ChunkData::MAX_LEN;
+constexpr size_t Packet::BlockUpdate::MAX_LEN;
+constexpr size_t Packet::Message::MAX_LEN;
+constexpr size_t Packet::Message::MAX_MESSAGE_LEN;
 
 Connection::Connection(const IPaddress &addr)
 : handler(nullptr)
@@ -211,6 +214,10 @@ const char *Packet::Type2String(uint8_t t) noexcept {
 			return "ChunkBegin";
 		case ChunkData::TYPE:
 			return "ChunkData";
+		case BlockUpdate::TYPE:
+			return "BlockUpdate";
+		case Message::TYPE:
+			return "Message";
 		default:
 			return "Unknown";
 	}
@@ -502,6 +509,66 @@ void Packet::ChunkData::ReadData(uint8_t *d, size_t l) const noexcept {
 	memcpy(d, &data[12], len);
 }
 
+void Packet::BlockUpdate::WriteChunkCoords(const glm::ivec3 &coords) noexcept {
+	Write(coords, 0);
+}
+
+void Packet::BlockUpdate::ReadChunkCoords(glm::ivec3 &coords) const noexcept {
+	Read(coords, 0);
+}
+
+void Packet::BlockUpdate::WriteBlockCount(uint32_t count) noexcept {
+	Write(count, 12);
+}
+
+void Packet::BlockUpdate::ReadBlockCount(uint32_t &count) const noexcept {
+	Read(count, 12);
+}
+
+void Packet::BlockUpdate::WriteIndex(uint16_t index, uint32_t num) noexcept {
+	uint32_t off = GetSize(num);
+	Write(index, off);
+}
+
+void Packet::BlockUpdate::ReadIndex(uint16_t &index, uint32_t num) const noexcept {
+	uint32_t off = GetSize(num);
+	Read(index, off);
+}
+
+void Packet::BlockUpdate::WriteBlock(const Block &block, uint32_t num) noexcept {
+	uint32_t off = GetSize(num) + 2;
+	Write(block, off);
+}
+
+void Packet::BlockUpdate::ReadBlock(Block &block, uint32_t num) const noexcept {
+	uint32_t off = GetSize(num) + 2;
+	Read(block, off);
+}
+
+void Packet::Message::WriteType(uint8_t type) noexcept {
+	Write(type, 0);
+}
+
+void Packet::Message::ReadType(uint8_t &type) const noexcept {
+	Read(type, 0);
+}
+
+void Packet::Message::WriteReferral(uint32_t ref) noexcept {
+	Write(ref, 1);
+}
+
+void Packet::Message::ReadReferral(uint32_t &ref) const noexcept {
+	Read(ref, 1);
+}
+
+void Packet::Message::WriteMessage(const string &msg) noexcept {
+	WriteString(msg, 5, MAX_MESSAGE_LEN);
+}
+
+void Packet::Message::ReadMessage(string &msg) const noexcept {
+	ReadString(msg, 5, MAX_MESSAGE_LEN);
+}
+
 
 void ConnectionHandler::Handle(const UDPpacket &udp_pack) {
 	const Packet &pack = *reinterpret_cast<const Packet *>(udp_pack.data);
@@ -539,6 +606,12 @@ void ConnectionHandler::Handle(const UDPpacket &udp_pack) {
 		case Packet::ChunkData::TYPE:
 			On(Packet::As<Packet::ChunkData>(udp_pack));
 			break;
+		case Packet::BlockUpdate::TYPE:
+			On(Packet::As<Packet::BlockUpdate>(udp_pack));
+			break;
+		case Packet::Message::TYPE:
+			On(Packet::As<Packet::Message>(udp_pack));
+			break;
 		default:
 			// drop unknown or unhandled packets
 			break;