@@ -23,13 +23,21 @@

  */

 package im.bci.tmxloader;

+import java.io.*;

+import java.nio.*;

+import java.util.zip.*;

+

+import javax.xml.bind.DatatypeConverter;

+

 /**

  *

  * @author devnewton

+ * @author Casper Faergemand (shorttail at gmail dot com)

  */

 public class TmxData {

     private String encoding;

+    private String compression;

     private String data;

     public String getEncoding() {

@@ -40,6 +48,14 @@ public class TmxData {

         this.encoding = encoding;

     }

+    public String getCompression() {

+        return compression;

+    }

+

+    public void setCompression(String compression) {

+        this.compression = compression;

+    }

+

     public String getData() {

         return data;

     }

@@ -51,9 +67,49 @@ public class TmxData {

     public void decodeTo(int width, int height, int[][] data) {

         if ("csv".equals(encoding)) {

             decodeCsvTo(width, height, data);

+        } else if ("base64".equals(encoding)) {

+            decodeBase64To(width, height, data);

+        } else {

+            throw new RuntimeException("Unsupported tiled layer data encoding: " + encoding);

+        }

+    }

+

+    private void decodeBase64To(int width, int height, int[][] gidArray) {

+        byte[] decodedRaw = DatatypeConverter.parseBase64Binary(getData());

+        if (compression == null) {

+            // Do nothing.

+        } else if ("gzip".equals(compression)) {

+            try {

+                ByteArrayInputStream bais = new ByteArrayInputStream(decodedRaw);

+                GZIPInputStream gis = new GZIPInputStream(bais);

+                DataInputStream dis = new DataInputStream(gis);

+                byte[] uncompressedRaw = new byte[height * width * 4];

+                dis.readFully(uncompressedRaw);

+                decodedRaw = uncompressedRaw;

+            } catch (IOException e) {

+                throw new RuntimeException("Gzip decompression failed.", e);

+            }

+        } else if ("zlib".equals(compression)) {

+            try {

+                Inflater inflater = new Inflater();

+                inflater.setInput(decodedRaw);

+                byte[] uncompressedRaw = new byte[height * width * 4];

+                inflater.inflate(uncompressedRaw);

+                decodedRaw = uncompressedRaw;

+            } catch (DataFormatException e) {

+                throw new RuntimeException("Zlib decompression failed.", e);

+            }

         } else {

-            throw new RuntimeException(

-                    "Unsupported tiled layer data encoding: " + encoding);

+            throw new RuntimeException("Unsupported compression: " + getCompression());

+        }

+        IntBuffer buffer = ByteBuffer.wrap(decodedRaw).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();

+        int[] decodedInts = new int[buffer.remaining()];

+        buffer.get(decodedInts);

+        int i = 0;

+        for (int y = 0; y < height; y++) {

+            for (int x = 0; x < width; x++) {

+                gidArray[x][y] = decodedInts[i++];

+            }

         }

     }

@@ -218,6 +218,8 @@ public class TmxLoader {

     private TmxData parseData(XmlTag xmlData) {

         TmxData data = new TmxData();

         data.setEncoding(xmlData.attributes.get("encoding"));

+        data.setCompression(xmlData.attributes.get("compression"));

+        System.out.println(xmlData.attributes);

         data.setData(xmlData.content);

         return data;

     }

@@ -38,12 +38,23 @@ import org.junit.Assert;

 /**

  *

  * @author devnewton

+ * @author Casper Faergemand (shorttail at gmail dot com)

  */

 public class TestTmxLoader {

     @Test

     public void simpleTmx() throws IOException {

-        final File mapFile = new File("test-data/desert.tmx");

+        File mapFileCSV = new File("test-data/desert.tmx");

+        testFile(mapFileCSV);

+        File mapFileBase64 = new File("test-data/desert_base64_uncompressed.tmx");

+        testFile(mapFileBase64);

+        File mapFileBase64Gzip = new File("test-data/desert_base64_gzip.tmx");

+        testFile(mapFileBase64Gzip);

+        File mapFileBase64Zlib = new File("test-data/desert_base64_zlib.tmx");

+        testFile(mapFileBase64Zlib);

+    }

+

+    private void testFile(File mapFile) throws IOException {

         final File mapParentDir = mapFile.getParentFile().getCanonicalFile();

         TmxLoader loader = new TmxLoader();

         TmxMap map = new TmxMap();

@@ -58,10 +69,14 @@ public class TestTmxLoader {

                 tilesetParentDir = mapParentDir;

             }

             if (null != tileset.getImage()) {

-                tileset.getImage().setSource(convertRelativeToAbsolutePath(tilesetParentDir, tileset.getImage().getSource()));

+                tileset.getImage().setSource(

+                        convertRelativeToAbsolutePath(tilesetParentDir, tileset.getImage().getSource()));

             }

             for (TmxTile tile : tileset.getTiles()) {

-                tile.getFrame().getImage().setSource(convertRelativeToAbsolutePath(tilesetParentDir, tile.getFrame().getImage().getSource()));

+                tile.getFrame()

+                        .getImage()

+                        .setSource(

+                                convertRelativeToAbsolutePath(tilesetParentDir, tile.getFrame().getImage().getSource()));

             }

         }

         loader.decode(map);

@@ -71,13 +86,16 @@ public class TestTmxLoader {

         Assert.assertEquals(32, map.getTilewidth());

         Assert.assertEquals(32, map.getTileheight());

         Assert.assertEquals(1, map.getLayers().size());

+        // Test that the map was actually decoded. Tile at 0,0 has id 29.

+        Assert.assertEquals(29, map.getLayers().get(0).getTileAt(0, 0).getTile().getId());

+

     }

-    

+

     private String convertRelativeToAbsolutePath(File parentDir, String relativePath) throws IOException {

-        if(new File(relativePath).isAbsolute()) {

+        if (new File(relativePath).isAbsolute()) {

             return relativePath;

         }

-        return new File(parentDir, relativePath).getCanonicalPath();        

+        return new File(parentDir, relativePath).getCanonicalPath();

     }

     private String loadText(File f) throws IOException {