curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-18 06:24:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

layer seems load, need to write better test-able code

Browse Source
This commit is contained in:
minjaesong
2018-10-05 22:13:55 +09:00
parent 4d538cae89
commit 5641910036
4 changed files with 170 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/serialise/ReadLayerDataZip.kt
View File

@@ -137,12 +137,12 @@ internal object ReadLayerDataZip {
// just in case
if (uncompLen.toLong() != u.uncompressedSize)
throw InternalError("DEFLATE size mismatch -- expected ${u.uncompressedSize}, got $uncompLen")
throw InternalError("Payload $t DEFLATE size mismatch -- expected ${u.uncompressedSize}, got $uncompLen")
// deal with (MSB ++ LSB)
if (t == "TERR" || t == "WALL") {
payloadBytes["${t}_MSB"] = inflatedFile.sliceArray(0 until worldSize.toInt()) // FIXME deflated stream cannot be larger than 2 GB
payloadBytes["${t}_LSb"] = inflatedFile.sliceArray(worldSize.toInt() until inflatedFile.size) // FIXME deflated stream cannot be larger than 2 GB
payloadBytes["${t}_LSB"] = inflatedFile.sliceArray(worldSize.toInt() until uncompLen) // FIXME deflated stream cannot be larger than 2 GB
}
else {
payloadBytes[t] = inflatedFile

17
src/net/torvald/terrarum/serialise/WriteLayerDataZip.kt
View File

@@ -29,8 +29,11 @@ internal object WriteLayerDataZip {
// FIXME output seems legit, but I can't confirm right now !!
// 2400x800 world sizes about 90 kB
// 8192x2048 world sizes about 670 kB
// 2400x800 world size, default comp level: about 90 kB
// 8192x2048 world size, default comp level: about 670 kB
// 2400x800 world size, best comp level: about 75 kB
// 8192x2048 world size, best comp level: about 555 kB
val LAYERS_FILENAME = "world"
@@ -105,7 +108,7 @@ internal object WriteLayerDataZip {
wb(PAYLOAD_HEADER); wb("TERR".toByteArray())
wi48(world.width * world.height * 3L / 2)
deflater = DeflaterOutputStream(outputStream, true)
deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true)
deflater.write(world.terrainArray)
deflater.write(world.layerTerrainLowBits.data)
deflater.finish()
@@ -114,7 +117,7 @@ internal object WriteLayerDataZip {
// WALL payload
wb(PAYLOAD_HEADER); wb("WALL".toByteArray())
wi48(world.width * world.height * 3L / 2)
deflater = DeflaterOutputStream(outputStream, true)
deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true)
deflater.write(world.wallArray)
deflater.write(world.layerWallLowBits.data)
deflater.finish()
@@ -123,7 +126,7 @@ internal object WriteLayerDataZip {
// WIRE payload
wb(PAYLOAD_HEADER); wb("WIRE".toByteArray())
wi48(world.width * world.height.toLong())
deflater = DeflaterOutputStream(outputStream, true)
deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true)
deflater.write(world.wireArray)
deflater.finish()
wb(PAYLOAD_FOOTER)
@@ -132,7 +135,7 @@ internal object WriteLayerDataZip {
wb(PAYLOAD_HEADER); wb("TdMG".toByteArray())
wi48(world.terrainDamages.size.toLong())
deflater = DeflaterOutputStream(outputStream, true)
deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true)
world.terrainDamages.forEach { t, u ->
deflater.write(t.toLittle48())
@@ -146,7 +149,7 @@ internal object WriteLayerDataZip {
wb(PAYLOAD_HEADER); wb("WdMG".toByteArray())
wi48(world.wallDamages.size.toLong())
deflater = DeflaterOutputStream(outputStream, true)
deflater = DeflaterOutputStream(outputStream, Deflater(Deflater.BEST_COMPRESSION), true)
world.wallDamages.forEach { t, u ->
deflater.write(t.toLittle48())