[tiled] r588 - in branches/bjorn: . src/tiled/io/xml src/tiled/mapeditor/selection src/tiled/view
svn@biggeruniverse.com
svn at biggeruniverse.com
Thu Feb 23 13:34:06 PST 2006
Author: bjorn
Date: 2006-02-23 15:34:06 -0600 (Thu, 23 Feb 2006)
New Revision: 588
Modified:
branches/bjorn/SUGGESTIONS
branches/bjorn/src/tiled/io/xml/XMLMapWriter.java
branches/bjorn/src/tiled/mapeditor/selection/SelectionLayer.java
branches/bjorn/src/tiled/view/HexMapView.java
branches/bjorn/src/tiled/view/IsoMapView.java
branches/bjorn/src/tiled/view/MapView.java
branches/bjorn/src/tiled/view/ObliqueMapView.java
branches/bjorn/src/tiled/view/OrthoMapView.java
branches/bjorn/src/tiled/view/ShiftedMapView.java
Log:
Some small changes, mostly adding short documentation to MapView constructors.
Modified: branches/bjorn/SUGGESTIONS
===================================================================
--- branches/bjorn/SUGGESTIONS 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/SUGGESTIONS 2006-02-23 21:34:06 UTC (rev 588)
@@ -160,10 +160,14 @@
Date: 18/02/06
Summary: Removing of stupid features.
State: Discussed and partly in progress.
-Problems: * Get rid of #getNullTile in favour of actually using null.
+Problems: * Get rid of #getNullTile in favour of actually using null. - DONE
* Dump the whole tile image checksumming stuff in favour of
straightforward code and behaviour.
* Do not support embedding of tilesets or tile images and neither
multiple external individual tile images in a single tileset.
* Remove option for XML-based layer data storage.
* Do not support tile image rotation or flipping.
+ * Rename HexMapView to HexagonalMapView, IsoMapView to
+ IsometricMapView and OrthoMapView to OrthographicMapView.
+ * Remove the zoom argument from all the MapView drawing methods
+ and get rid of the SmoothZoomer.
\ No newline at end of file
Modified: branches/bjorn/src/tiled/io/xml/XMLMapWriter.java
===================================================================
--- branches/bjorn/src/tiled/io/xml/XMLMapWriter.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/io/xml/XMLMapWriter.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -184,7 +184,7 @@
}
} catch (XMLWriterException e) {
e.printStackTrace();
- }
+ }
}
private static void writeTileset(TileSet set, XMLWriter w, String wp)
Modified: branches/bjorn/src/tiled/mapeditor/selection/SelectionLayer.java
===================================================================
--- branches/bjorn/src/tiled/mapeditor/selection/SelectionLayer.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/mapeditor/selection/SelectionLayer.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -5,7 +5,7 @@
* 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 at biggeruniverse.com>
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
Modified: branches/bjorn/src/tiled/view/HexMapView.java
===================================================================
--- branches/bjorn/src/tiled/view/HexMapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/HexMapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -20,7 +20,6 @@
import tiled.core.*;
import tiled.mapeditor.selection.SelectionLayer;
-
/**
* A View for displaying Hex based maps.
* The Hexs are layed out horizontally (i.e. the pointy sides are on the sides
@@ -55,8 +54,13 @@
{
private static final double HEX_SLOPE = Math.tan(Math.toRadians(60));
- public HexMapView(Map m) {
- super(m);
+ /**
+ * Creates a new hexagonal map view that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ public HexMapView(Map map) {
+ super(map);
}
public int getScrollableBlockIncrement(Rectangle visibleRect,
Modified: branches/bjorn/src/tiled/view/IsoMapView.java
===================================================================
--- branches/bjorn/src/tiled/view/IsoMapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/IsoMapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -5,7 +5,7 @@
* 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 at biggeruniverse.com>
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
@@ -26,8 +26,13 @@
*/
public class IsoMapView extends MapView
{
- public IsoMapView(Map m) {
- super(m);
+ /**
+ * Creates a new isometric map view that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ public IsoMapView(Map map) {
+ super(map);
}
public int getScrollableBlockIncrement(Rectangle visibleRect,
Modified: branches/bjorn/src/tiled/view/MapView.java
===================================================================
--- branches/bjorn/src/tiled/view/MapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/MapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -51,9 +51,13 @@
private static final Color DEFAULT_BACKGROUND_COLOR = new Color(64, 64, 64);
private static final Color DEFAULT_GRID_COLOR = Color.black;
-
- public MapView(Map m) {
- myMap = m;
+ /**
+ * Creates a new <code>MapView</code> that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ protected MapView(Map map) {
+ myMap = map;
setSize(getPreferredSize());
}
Modified: branches/bjorn/src/tiled/view/ObliqueMapView.java
===================================================================
--- branches/bjorn/src/tiled/view/ObliqueMapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/ObliqueMapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -5,11 +5,11 @@
* 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 at biggeruniverse.com>
* Bjorn Lindeijer <b.lindeijer at xs4all.nl>
*/
-
+
package tiled.view;
import java.awt.Dimension;
@@ -23,8 +23,13 @@
public class ObliqueMapView extends MapView
{
- public ObliqueMapView(Map m) {
- super(m);
+ /**
+ * Creates a new oblique map view that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ public ObliqueMapView(Map map) {
+ super(map);
}
public int getScrollableBlockIncrement(
Modified: branches/bjorn/src/tiled/view/OrthoMapView.java
===================================================================
--- branches/bjorn/src/tiled/view/OrthoMapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/OrthoMapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -34,8 +34,13 @@
*/
public class OrthoMapView extends MapView
{
- public OrthoMapView(Map m) {
- super(m);
+ /**
+ * Creates a new orthographic map view that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ public OrthoMapView(Map map) {
+ super(map);
}
public int getScrollableBlockIncrement(Rectangle visibleRect,
Modified: branches/bjorn/src/tiled/view/ShiftedMapView.java
===================================================================
--- branches/bjorn/src/tiled/view/ShiftedMapView.java 2006-02-23 20:58:10 UTC (rev 587)
+++ branches/bjorn/src/tiled/view/ShiftedMapView.java 2006-02-23 21:34:06 UTC (rev 588)
@@ -27,8 +27,13 @@
private int horSide; // Length of horizontal sides
private int verSide; // Length of vertical sides
- public ShiftedMapView(Map m) {
- super(m);
+ /**
+ * Creates a new shifted map view that displays the specified map.
+ *
+ * @param map the map to be displayed by this map view
+ */
+ public ShiftedMapView(Map map) {
+ super(map);
horSide = 16;
verSide = 0;
More information about the tiled-commit
mailing list