[tiled] r718 - in branches/adam/src/tiled: core io mapeditor mapeditor/util/cutter

[tiled-svn at biggeruniverse.com]

Author: aturk
Date: 2007-01-09 05:16:31 -0600 (Tue, 09 Jan 2007)
New Revision: 718

Modified:
   branches/adam/src/tiled/core/Map.java
   branches/adam/src/tiled/core/TileLayer.java
   branches/adam/src/tiled/io/ImageHelper.java
   branches/adam/src/tiled/mapeditor/MapEditor.java
   branches/adam/src/tiled/mapeditor/util/cutter/BasicTileCutter.java
Log:
Hopefully speed up map scrolling in the editor

Modified: branches/adam/src/tiled/core/Map.java
===================================================================
--- branches/adam/src/tiled/core/Map.java	2007-01-08 23:13:07 UTC (rev 717)
+++ branches/adam/src/tiled/core/Map.java	2007-01-09 11:16:31 UTC (rev 718)
@@ -12,6 +12,7 @@
 
 package tiled.core;
 
+import java.awt.Dimension;
 import java.util.*;
 
 import tiled.mapeditor.Resources;
@@ -40,7 +41,7 @@
     private Vector tilesets;
     private LinkedList objects;
 
-    private int tileWidth, tileHeight;
+    private Dimension tileDimensions;
     private int orientation = MDO_ORTHO;
     private final List mapChangeListeners = new LinkedList();
     private Properties properties;
@@ -57,6 +58,7 @@
         tilesets = new Vector();
         specialLayers = new Vector();
         objects = new LinkedList();
+        tileDimensions = new Dimension();
     }
 
     /**
@@ -175,7 +177,7 @@
             return;
         }
 
-        Tile t = tileset.getTile(0);
+        /*Tile t = tileset.getTile(0);
 
         if (t != null) {
             int tw = t.getWidth();
@@ -186,7 +188,7 @@
                     tileHeight = th;
                 }
             }
-        }
+        }*/
 
         tilesets.add(tileset);
         fireTilesetAdded(tileset);
@@ -325,7 +327,7 @@
      * @param width
      */
     public void setTileWidth(int width) {
-        tileWidth = width;
+        tileDimensions.width = width;
         fireMapChanged();
     }
 
@@ -335,7 +337,7 @@
      * @param height
      */
     public void setTileHeight(int height) {
-        tileHeight = height;
+        tileDimensions.height = height;
         fireMapChanged();
     }
 
@@ -415,7 +417,7 @@
      * @return the default tile width
      */
     public int getTileWidth() {
-        return tileWidth;
+        return tileDimensions.width;
     }
 
     /**
@@ -424,7 +426,7 @@
      * @return the default tile height
      */
     public int getTileHeight() {
-        return tileHeight;
+        return tileDimensions.height;
     }
 
     /**
@@ -447,7 +449,7 @@
      * @return int The maximum tile height
      */
     public int getTileHeightMax() {
-        int maxHeight = tileHeight;
+        int maxHeight = tileDimensions.height;
         Iterator itr = tilesets.iterator();
 
         while (itr.hasNext()) {
@@ -499,7 +501,7 @@
      */
     public String toString() {
         return "Map[" + bounds.width + "x" + bounds.height + "x" +
-            getTotalLayers() + "][" + tileWidth + "x" +
-            tileHeight + "]";
+            getTotalLayers() + "][" + tileDimensions.width + "x" +
+            tileDimensions.height + "]";
     }
 }

Modified: branches/adam/src/tiled/core/TileLayer.java
===================================================================
--- branches/adam/src/tiled/core/TileLayer.java	2007-01-08 23:13:07 UTC (rev 717)
+++ branches/adam/src/tiled/core/TileLayer.java	2007-01-09 11:16:31 UTC (rev 718)
@@ -100,6 +100,10 @@
         return new Dimension(tileDimensions);
     }
     
+    public void setTileSize(Dimension d) {
+        tileDimensions = new Dimension(d);
+    }
+    
     /**
      * Rotates the layer by the given Euler angle.
      *

Modified: branches/adam/src/tiled/io/ImageHelper.java
===================================================================
--- branches/adam/src/tiled/io/ImageHelper.java	2007-01-08 23:13:07 UTC (rev 717)
+++ branches/adam/src/tiled/io/ImageHelper.java	2007-01-09 11:16:31 UTC (rev 718)
@@ -64,7 +64,7 @@
      * @see java.awt.Toolkit#createImage(byte[] imagedata)
      */
     static public Image bytesToImage(byte[] imageData) throws IOException {
-        return ImageIO.read(new ByteArrayInputStream(imageData));
+        return ImageIO.read(new ByteArrayInputStream(imageData)).getScaledInstance(-1, -1, Image.SCALE_DEFAULT);
     }
 
     /**

Modified: branches/adam/src/tiled/mapeditor/MapEditor.java
===================================================================
--- branches/adam/src/tiled/mapeditor/MapEditor.java	2007-01-08 23:13:07 UTC (rev 717)
+++ branches/adam/src/tiled/mapeditor/MapEditor.java	2007-01-09 11:16:31 UTC (rev 718)
@@ -1726,7 +1726,7 @@
 
     private void pour(TileLayer layer, int x, int y,
             Tile newTile, Tile oldTile) {
-        if (newTile == oldTile || layer.getLocked()) return;
+        if (newTile == oldTile || !layer.canEdit()) return;
 
         Rectangle area;
         TileLayer before = (TileLayer) createLayerCopy(layer);

Modified: branches/adam/src/tiled/mapeditor/util/cutter/BasicTileCutter.java
===================================================================
--- branches/adam/src/tiled/mapeditor/util/cutter/BasicTileCutter.java	2007-01-08 23:13:07 UTC (rev 717)
+++ branches/adam/src/tiled/mapeditor/util/cutter/BasicTileCutter.java	2007-01-09 11:16:31 UTC (rev 718)
@@ -61,7 +61,7 @@
                 nextY += tileHeight + tileSpacing;
             }
 
-            return tile;
+            return tile.getScaledInstance(-1, -1, Image.SCALE_DEFAULT);
         }
 
         return null;