4 files changed, 226 insertions, 2 deletions

diff --git a/source/Protocol/ChunkDataSerializer.cpp b/source/Protocol/ChunkDataSerializer.cpp
new file mode 100644
index 000000000..7af07f331
--- /dev/null
+++ b/source/Protocol/ChunkDataSerializer.cpp
@@ -0,0 +1,176 @@
+

+// ChunkDataSerializer.cpp

+

+// Implements the cChunkDataSerializer class representing the object that can:

+//  - serialize chunk data to different protocol versions

+//  - cache such serialized data for multiple clients

+

+#include "Globals.h"

+#include "ChunkDataSerializer.h"

+#include "zlib.h"

+

+

+

+

+cChunkDataSerializer::cChunkDataSerializer(

+	const cChunkDef::BlockTypes   & a_BlockTypes,

+	const cChunkDef::BlockNibbles & a_BlockMetas,

+	const cChunkDef::BlockNibbles & a_BlockLight,

+	const cChunkDef::BlockNibbles & a_BlockSkyLight,

+	const unsigned char *           a_BiomeData

+) :

+	m_BlockTypes(a_BlockTypes),

+	m_BlockMetas(a_BlockMetas),

+	m_BlockLight(a_BlockLight),

+	m_BlockSkyLight(a_BlockSkyLight),

+	m_BiomeData(a_BiomeData)

+{

+}

+

+

+

+

+const AString & cChunkDataSerializer::Serialize(int a_Version)

+{

+	Serializations::const_iterator itr = m_Serializations.find(a_Version);

+	if (itr != m_Serializations.end())

+	{

+		return itr->second;

+	}

+	

+	AString data;

+	switch (a_Version)

+	{

+		case RELEASE_1_2_5: Serialize29(data); break;

+		case RELEASE_1_3_2: Serialize39(data); break;

+		// TODO: Other protocol versions may serialize the data differently; implement here

+		

+		default:

+		{

+			LOGERROR("cChunkDataSerializer::Serialize(): Unknown version: %d", a_Version);

+			ASSERT(!"Unknown chunk data serialization version");

+			break;

+		}

+	}

+	m_Serializations[a_Version] = data;

+	return m_Serializations[a_Version];

+}

+

+

+

+

+

+void cChunkDataSerializer::Serialize29(AString & a_Data)

+{

+	// TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib *can* stream)

+

+	const int BiomeDataSize    = cChunkDef::Width * cChunkDef::Width;

+	const int MetadataOffset   = sizeof(m_BlockTypes);

+	const int BlockLightOffset = MetadataOffset   + sizeof(m_BlockMetas);

+	const int SkyLightOffset   = BlockLightOffset + sizeof(m_BlockLight);

+	const int BiomeOffset      = SkyLightOffset   + sizeof(m_BlockSkyLight);

+	const int DataSize         = BiomeOffset      + BiomeDataSize;

+	

+	// Temporary buffer for the composed data:

+	char AllData [DataSize];

+

+	memcpy(AllData, m_BlockTypes, sizeof(m_BlockTypes));

+	memcpy(AllData + MetadataOffset,   m_BlockMetas,    sizeof(m_BlockMetas));

+	memcpy(AllData + BlockLightOffset, m_BlockLight,    sizeof(m_BlockLight));

+	memcpy(AllData + SkyLightOffset,   m_BlockSkyLight, sizeof(m_BlockSkyLight));

+	memcpy(AllData + BiomeOffset,      m_BiomeData,     BiomeDataSize);

+

+	// Compress the data:

+	// In order not to use allocation, use a fixed-size buffer, with the size

+	// that uses the same calculation as compressBound():

+	const uLongf CompressedMaxSize = DataSize + (DataSize >> 12) + (DataSize >> 14) + (DataSize >> 25) + 16;

+	char CompressedBlockData[CompressedMaxSize];

+

+	uLongf CompressedSize = compressBound(DataSize);

+	

+	// Run-time check that our compile-time guess about CompressedMaxSize was enough:

+	ASSERT(CompressedSize <= CompressedMaxSize);

+	

+	compress2((Bytef*)CompressedBlockData, &CompressedSize, (const Bytef*)AllData, sizeof(AllData), Z_DEFAULT_COMPRESSION);

+

+	// Now put all those data into a_Data:

+	

+	// "Ground-up continuous", or rather, "biome data present" flag:

+	a_Data.push_back('\x01');

+	

+	// Two bitmaps; we're aways sending the full chunk with no additional data, so the bitmaps are 0xffff and 0, respectively

+	// Also, no endian flipping is needed because of the const values

+	unsigned short BitMap1 = 0xffff;

+	unsigned short BitMap2 = 0;

+	a_Data.append((const char *)&BitMap1, sizeof(short));

+	a_Data.append((const char *)&BitMap2, sizeof(short));

+	

+	Int32 CompressedSizeBE = htonl(CompressedSize);

+	a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));

+	

+	Int32 UnusedInt32 = 0;

+	a_Data.append((const char *)&UnusedInt32,      sizeof(UnusedInt32));

+	

+	a_Data.append(CompressedBlockData, CompressedSize);

+}

+

+

+

+

+

+void cChunkDataSerializer::Serialize39(AString & a_Data)

+{

+	// TODO: Do not copy data and then compress it; rather, compress partial blocks of data (zlib *can* stream)

+

+	const int BiomeDataSize    = cChunkDef::Width * cChunkDef::Width;

+	const int MetadataOffset   = sizeof(m_BlockTypes);

+	const int BlockLightOffset = MetadataOffset   + sizeof(m_BlockMetas);

+	const int SkyLightOffset   = BlockLightOffset + sizeof(m_BlockLight);

+	const int BiomeOffset      = SkyLightOffset   + sizeof(m_BlockSkyLight);

+	const int DataSize         = BiomeOffset      + BiomeDataSize;

+	

+	// Temporary buffer for the composed data:

+	char AllData [DataSize];

+

+	memcpy(AllData, m_BlockTypes, sizeof(m_BlockTypes));

+	memcpy(AllData + MetadataOffset,   m_BlockMetas,    sizeof(m_BlockMetas));

+	memcpy(AllData + BlockLightOffset, m_BlockLight,    sizeof(m_BlockLight));

+	memcpy(AllData + SkyLightOffset,   m_BlockSkyLight, sizeof(m_BlockSkyLight));

+	memcpy(AllData + BiomeOffset,      m_BiomeData,     BiomeDataSize);

+

+	// Compress the data:

+	// In order not to use allocation, use a fixed-size buffer, with the size

+	// that uses the same calculation as compressBound():

+	const uLongf CompressedMaxSize = DataSize + (DataSize >> 12) + (DataSize >> 14) + (DataSize >> 25) + 16;

+	char CompressedBlockData[CompressedMaxSize];

+

+	uLongf CompressedSize = compressBound(DataSize);

+	

+	// Run-time check that our compile-time guess about CompressedMaxSize was enough:

+	ASSERT(CompressedSize <= CompressedMaxSize);

+	

+	compress2((Bytef*)CompressedBlockData, &CompressedSize, (const Bytef*)AllData, sizeof(AllData), Z_DEFAULT_COMPRESSION);

+

+	// Now put all those data into a_Data:

+	

+	// "Ground-up continuous", or rather, "biome data present" flag:

+	a_Data.push_back('\x01');

+	

+	// Two bitmaps; we're aways sending the full chunk with no additional data, so the bitmaps are 0xffff and 0, respectively

+	// Also, no endian flipping is needed because of the const values

+	unsigned short BitMap1 = 0xffff;

+	unsigned short BitMap2 = 0;

+	a_Data.append((const char *)&BitMap1, sizeof(short));

+	a_Data.append((const char *)&BitMap2, sizeof(short));

+	

+	Int32 CompressedSizeBE = htonl(CompressedSize);

+	a_Data.append((const char *)&CompressedSizeBE, sizeof(CompressedSizeBE));

+	

+	// Unlike 29, 39 doesn't have the "unused" int

+	

+	a_Data.append(CompressedBlockData, CompressedSize);

+}

+

+

+

+

diff --git a/source/Protocol/ChunkDataSerializer.h b/source/Protocol/ChunkDataSerializer.h
new file mode 100644
index 000000000..513a232b9
--- /dev/null
+++ b/source/Protocol/ChunkDataSerializer.h
@@ -0,0 +1,48 @@
+

+// ChunkDataSerializer.h

+

+// Interfaces to the cChunkDataSerializer class representing the object that can:

+//  - serialize chunk data to different protocol versions

+//  - cache such serialized data for multiple clients

+

+

+

+

+

+class cChunkDataSerializer

+{

+protected:

+	const cChunkDef::BlockTypes   & m_BlockTypes;

+	const cChunkDef::BlockNibbles & m_BlockMetas;

+	const cChunkDef::BlockNibbles & m_BlockLight;

+	const cChunkDef::BlockNibbles & m_BlockSkyLight;

+	const unsigned char * m_BiomeData;

+	

+	typedef std::map<int, AString> Serializations;

+	

+	Serializations m_Serializations;

+	

+	void Serialize29(AString & a_Data);  // Release 1.2.4 and 1.2.5

+	void Serialize39(AString & a_Data);  // Release 1.3.1 and 1.3.2

+	

+public:

+	enum

+	{

+		RELEASE_1_2_5 = 29,

+		RELEASE_1_3_2 = 39,

+	} ;

+	

+	cChunkDataSerializer(

+		const cChunkDef::BlockTypes   & a_BlockTypes,

+		const cChunkDef::BlockNibbles & a_BlockMetas,

+		const cChunkDef::BlockNibbles & a_BlockLight,

+		const cChunkDef::BlockNibbles & a_BlockSkyLight,

+		const unsigned char *           a_BiomeData

+	);

+

+	const AString & Serialize(int a_Version);  // Returns one of the internal m_Serializations[]

+} ;

+

+

+

+

diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 0a3814f47..67c8f53b3 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -14,7 +14,7 @@ Documentation:
 #include "Protocol125.h"

 

 #include "../cClientHandle.h"

-#include "../ChunkDataSerializer.h"

+#include "ChunkDataSerializer.h"

 #include "../cEntity.h"

 #include "../Mobs/Monster.h"

 #include "../cPickup.h"

diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 0d21ca01f..9e6af0729 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -10,7 +10,7 @@
 #include "../cClientHandle.h"

 #include "../../CryptoPP/randpool.h"

 #include "../cItem.h"

-#include "../ChunkDataSerializer.h"

+#include "ChunkDataSerializer.h"

 #include "../cPlayer.h"

 #include "../Mobs/Monster.h"

 #include "../UI/Window.h"