Fix TMW WLK exporter to work with multiple layers.

jaxad0127 · jaxad0127 · commit cb309c3c32c7 · 2008-11-04T12:17:07.000Z
The main functionality of the plugin has been moved to another class to ease use by other programs.
diff --git a/plugins/tmw/src/tiled/plugins/tmw/TMWServerMapWriter.java b/plugins/tmw/src/tiled/plugins/tmw/TMWServerMapWriter.java
@@ -56,34 +56,7 @@ public void writeTileset(TileSet set, String filename) throws Exception {
     }
 
     public void writeMap(Map map, OutputStream out) throws Exception {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
-        MapLayer layer = map.getLayer(3);
-        if (layer != null && layer instanceof TileLayer) {
-            int width = layer.getWidth();
-            int height = layer.getHeight();
-
-            // Write width and height
-            out.write(width       & FIRST_BYTE);
-            out.write(width >> 8  & FIRST_BYTE);
-            out.write(height      & FIRST_BYTE);
-            out.write(height >> 8 & FIRST_BYTE);
-
-            for (int y = 0; y < height; y++) {
-                for (int x= 0; x < width; x++) {
-                    Tile tile = ((TileLayer) layer).getTileAt(x, y);
-                    if (tile != null && tile.getId() > 0) {
-                        out.write(1);
-                    } else {
-                        out.write(0);
-                    }
-                }
-            }
-
-            baos.writeTo(out);
-        } else {
-            throw new Exception("No collision layer 4 found!");
-        }
+        WLKWriter.writeMap(map, out);
     }
 
     public void writeTileset(TileSet set, OutputStream out) throws Exception {
diff --git a/plugins/tmw/src/tiled/plugins/tmw/WLKWriter.java b/plugins/tmw/src/tiled/plugins/tmw/WLKWriter.java
@@ -0,0 +1,72 @@
+/*
+ *  The Mana World Plugin for Tiled, (c) 2004-2006
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Adam Turk <aturk@biggeruniverse.com>
+ *  Bjorn Lindeijer <bjorn@lindeijer.nl>
+ */
+
+package tiled.plugins.tmw;
+
+import java.io.*;
+
+import tiled.core.*;
+
+/**
+ * The WLK file writer. The format is very simple:
+ *
+ * <pre>
+ *  short (width)
+ *  short (height)
+ *  char[] (data)
+ * </pre>
+ *
+ * @version $Id$
+ */
+public class WLKWriter
+{
+    private static final int FIRST_BYTE = 0x000000FF;
+
+    public static void writeMap(Map map, OutputStream out) throws Exception {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
+        MapLayer layer = null;
+
+        // Get the last "collision" layer
+        for (MapLayer mapLayer : map) {
+            if (mapLayer.getName().equalsIgnoreCase("collision")) {
+                layer = mapLayer;
+            }
+        }
+
+        if (layer != null && layer instanceof TileLayer) {
+            int width = layer.getWidth();
+            int height = layer.getHeight();
+
+            // Write width and height
+            out.write(width       & FIRST_BYTE);
+            out.write(width >> 8  & FIRST_BYTE);
+            out.write(height      & FIRST_BYTE);
+            out.write(height >> 8 & FIRST_BYTE);
+
+            for (int y = 0; y < height; y++) {
+                for (int x= 0; x < width; x++) {
+                    Tile tile = ((TileLayer) layer).getTileAt(x, y);
+                    if (tile != null && tile.getId() > 0) {
+                        out.write(1);
+                    } else {
+                        out.write(0);
+                    }
+                }
+            }
+
+            baos.writeTo(out);
+        } else {
+            throw new Exception("No collision layer found!");
+        }
+    }
+}
diff --git a/src/tiled/core/MultilayerPlane.java b/src/tiled/core/MultilayerPlane.java
@@ -13,15 +13,13 @@
 package tiled.core;
 
 import java.awt.Rectangle;
-import java.util.Collection;
-import java.util.ListIterator;
-import java.util.Vector;
+import java.util.*;
 
 /**
  * MultilayerPlane makes up the core functionality of both Maps and Brushes.
  * This class handles the order of layers as a group.
  */
-public class MultilayerPlane
+public class MultilayerPlane implements Iterable<MapLayer>
 {
     private Vector<MapLayer> layers;
     protected Rectangle bounds;          //in tiles
@@ -285,4 +283,8 @@ public void resize(int width, int height, int dx, int dy) {
     public boolean inBounds(int x, int y) {
         return x >= 0 && y >= 0 && x < bounds.width && y < bounds.height;
     }
+
+    public Iterator<MapLayer> iterator() {
+        return layers.iterator();
+    }
 }
