From 580f199d1f2b4553fd456b7b7df5a8ffac248ae0 Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sun, 4 Aug 2013 10:49:29 -0400
Subject: [PATCH] change some Tile serialization methods to work with the new
 TileRawDataContainer interface instead

---
 ...ileChunkSerializer.java => TileDataSerializer.java} | 10 +++++-----
 .../gdx/tilemap3d/serialization/TileMapLoader.java     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename src/com/blarg/gdx/tilemap3d/serialization/{TileChunkSerializer.java => TileDataSerializer.java} (82%)

diff --git a/src/com/blarg/gdx/tilemap3d/serialization/TileChunkSerializer.java b/src/com/blarg/gdx/tilemap3d/serialization/TileDataSerializer.java
similarity index 82%
rename from src/com/blarg/gdx/tilemap3d/serialization/TileChunkSerializer.java
rename to src/com/blarg/gdx/tilemap3d/serialization/TileDataSerializer.java
index bdcff13..080b16c 100644
--- a/src/com/blarg/gdx/tilemap3d/serialization/TileChunkSerializer.java
+++ b/src/com/blarg/gdx/tilemap3d/serialization/TileDataSerializer.java
@@ -1,20 +1,20 @@
 package com.blarg.gdx.tilemap3d.serialization;
 
 import com.blarg.gdx.tilemap3d.Tile;
-import com.blarg.gdx.tilemap3d.TileChunk;
+import com.blarg.gdx.tilemap3d.TileRawDataContainer;
 
 import java.nio.ByteBuffer;
 
-public class TileChunkSerializer {
+public class TileDataSerializer {
 	public static final int TILE_SIZE_BYTES = 17;  // TODO: is there some kind of java sizeof() type thing?
 
-	public static void serialize(TileChunk chunk, ByteBuffer buffer) {
-		Tile[] tiles = chunk.getData();
+	public static void serialize(TileRawDataContainer tileData, ByteBuffer buffer) {
+		Tile[] tiles = tileData.getData();
 		for (int i = 0; i < tiles.length; ++i)
 			serialize(tiles[i], buffer);
 	}
 
-	public static void deserialize(ByteBuffer buffer, TileChunk out) {
+	public static void deserialize(ByteBuffer buffer, TileRawDataContainer out) {
 		Tile[] tiles = out.getData();
 		for (int i = 0; i < tiles.length; ++i)
 			deserialize(buffer, tiles[i]);
diff --git a/src/com/blarg/gdx/tilemap3d/serialization/TileMapLoader.java b/src/com/blarg/gdx/tilemap3d/serialization/TileMapLoader.java
index 0235d1d..b35f2d7 100644
--- a/src/com/blarg/gdx/tilemap3d/serialization/TileMapLoader.java
+++ b/src/com/blarg/gdx/tilemap3d/serialization/TileMapLoader.java
@@ -59,7 +59,7 @@ public class TileMapLoader {
 			byte[] chunkBytes = Base64Coder.decode(encodedChunk);
 			ByteBuffer buffer = ByteBuffer.wrap(chunkBytes);
 
-			TileChunkSerializer.deserialize(buffer, outputChunk);
+			TileDataSerializer.deserialize(buffer, outputChunk);
 		}
 
 		return tileMap;
@@ -81,7 +81,7 @@ public class TileMapLoader {
 		jsonMap.lightingMode = null;
 
 		// each serialized chunk will be the same size in bytes (same number of tiles in each)
-		int chunkSizeInBytes = tileMap.getChunks()[0].getData().length * TileChunkSerializer.TILE_SIZE_BYTES;
+		int chunkSizeInBytes = tileMap.getChunks()[0].getData().length * TileDataSerializer.TILE_SIZE_BYTES;
 
 		jsonMap.chunks = new ArrayList<String>(tileMap.getChunks().length);
 		for (int i = 0; i < tileMap.getChunks().length; ++i) {
@@ -90,7 +90,7 @@ public class TileMapLoader {
 			byte[] chunkBytes = new byte[chunkSizeInBytes];
 			ByteBuffer buffer = ByteBuffer.wrap(chunkBytes);
 
-			TileChunkSerializer.serialize(chunk, buffer);
+			TileDataSerializer.serialize(chunk, buffer);
 
 			jsonMap.chunks.add(new String(Base64Coder.encode(chunkBytes)));
 		}