summaryrefslogtreecommitdiffstats
path: root/source/ChunkDataSerializer.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-31 23:59:57 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-08-31 23:59:57 +0200
commit7824ce9d6352664bd291e57a3084e5c51af5d4a6 (patch)
tree8ba7b1476ec2c807b9ed2f0d7cb224f219dbd57b /source/ChunkDataSerializer.cpp
parentFix for the nightbuild script packing the wrong PDBs (diff)
downloadcuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar.gz
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar.bz2
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar.lz
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar.xz
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.tar.zst
cuberite-7824ce9d6352664bd291e57a3084e5c51af5d4a6.zip
Diffstat (limited to '')
-rw-r--r--source/ChunkDataSerializer.cpp60
1 files changed, 59 insertions, 1 deletions
diff --git a/source/ChunkDataSerializer.cpp b/source/ChunkDataSerializer.cpp
index 1d798beb2..7af07f331 100644
--- a/source/ChunkDataSerializer.cpp
+++ b/source/ChunkDataSerializer.cpp
@@ -42,6 +42,7 @@ const AString & cChunkDataSerializer::Serialize(int a_Version)
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:
@@ -95,7 +96,7 @@ void cChunkDataSerializer::Serialize29(AString & a_Data)
// Now put all those data into a_Data:
// "Ground-up continuous", or rather, "biome data present" flag:
- a_Data.push_back('\xff');
+ 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
@@ -116,3 +117,60 @@ void cChunkDataSerializer::Serialize29(AString & a_Data)
+
+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);
+}
+
+
+
+