[tiled] r716 - branches/adam/src/tiled/view

[tiled-svn at biggeruniverse.com]

Author: aturk
Date: 2007-01-07 12:56:38 -0600 (Sun, 07 Jan 2007)
New Revision: 716

Modified:
   branches/adam/src/tiled/view/HexMapView.java
   branches/adam/src/tiled/view/IsoMapView.java
   branches/adam/src/tiled/view/OrthoMapView.java
Log:
Wow, now it works

Modified: branches/adam/src/tiled/view/HexMapView.java
===================================================================
--- branches/adam/src/tiled/view/HexMapView.java	2007-01-07 18:24:40 UTC (rev 715)
+++ branches/adam/src/tiled/view/HexMapView.java	2007-01-07 18:56:38 UTC (rev 716)
@@ -154,16 +154,22 @@
     }
 
     private Dimension getTileSize() {
+        Dimension d = new Dimension(
+                (int)(map.getTileWidth() * zoom),
+                (int)(map.getTileHeight() * zoom));
+        
         if(currentLayer instanceof TileLayer) {
-            Dimension d = ((TileLayer)currentLayer).getTileSize();
+            d = ((TileLayer)currentLayer).getTileSize();
             d.height *= zoom;
             d.width *= zoom;
-            return d;
-        } else {
-            return new Dimension(
-                (int)(map.getTileWidth() * zoom),
-                (int)(map.getTileHeight() * zoom));
+            if(d.height == 0 || d.width == 0) {
+               d = new Dimension(
+                        (int)(map.getTileWidth() * zoom),
+                        (int)(map.getTileHeight() * zoom));
+            }
         }
+        
+        return d;
     }
 
     protected void paintGrid(Graphics2D g2d, TileLayer layer) {

Modified: branches/adam/src/tiled/view/IsoMapView.java
===================================================================
--- branches/adam/src/tiled/view/IsoMapView.java	2007-01-07 18:24:40 UTC (rev 715)
+++ branches/adam/src/tiled/view/IsoMapView.java	2007-01-07 18:56:38 UTC (rev 716)
@@ -295,16 +295,22 @@
     }
 
     protected Dimension getTileSize() {
+        Dimension d = new Dimension(
+                (int)(map.getTileWidth() * zoom),
+                (int)(map.getTileHeight() * zoom));
+        
         if(currentLayer instanceof TileLayer) {
-            Dimension d = ((TileLayer)currentLayer).getTileSize();
+            d = ((TileLayer)currentLayer).getTileSize();
             d.height *= zoom;
             d.width *= zoom;
-            return d;
-        } else {
-            return new Dimension(
-                (int)(map.getTileWidth() * zoom),
-                (int)(map.getTileHeight() * zoom));
+            if(d.height == 0 || d.width == 0) {
+               d = new Dimension(
+                        (int)(map.getTileWidth() * zoom),
+                        (int)(map.getTileHeight() * zoom));
+            }
         }
+        
+        return d;
     }
 
     protected double getTileRatio() {

Modified: branches/adam/src/tiled/view/OrthoMapView.java
===================================================================
--- branches/adam/src/tiled/view/OrthoMapView.java	2007-01-07 18:24:40 UTC (rev 715)
+++ branches/adam/src/tiled/view/OrthoMapView.java	2007-01-07 18:56:38 UTC (rev 716)
@@ -267,16 +267,22 @@
     }
 
     protected Dimension getTileSize() {
+        Dimension d = new Dimension(
+                (int)(map.getTileWidth() * zoom),
+                (int)(map.getTileHeight() * zoom));
+        
         if(currentLayer instanceof TileLayer) {
-            Dimension d = ((TileLayer)currentLayer).getTileSize();
+            d = ((TileLayer)currentLayer).getTileSize();
             d.height *= zoom;
             d.width *= zoom;
-            return d;
-        } else {
-            return new Dimension(
-                (int)(map.getTileWidth() * zoom),
-                (int)(map.getTileHeight() * zoom));
+            if(d.height == 0 || d.width == 0) {
+               d = new Dimension(
+                        (int)(map.getTileWidth() * zoom),
+                        (int)(map.getTileHeight() * zoom));
+            }
         }
+        
+        return d;
     }
 
     protected Polygon createGridPolygon(int tx, int ty, int border) {