Menu
▾
▴
[Arianne-commits] stendhal/tiled/src/tiled/view/old HexMapView.java, 1.7, 1.8 IsoMapView.java, 1.6, 1.7 ShiftedMapView.java, 1.6, 1.7 OrthoMapView.java, 1.6, 1.7 ObliqueMapView.java, 1.6, 1.7 MapView.java, 1.9, 1.10
Update of /cvsroot/arianne/stendhal/tiled/src/tiled/view/old In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12658/tiled/src/tiled/view/old Modified Files: HexMapView.java IsoMapView.java ShiftedMapView.java OrthoMapView.java ObliqueMapView.java MapView.java Log Message: code format sorry booched it a bit yesterday Index: IsoMapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/IsoMapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** IsoMapView.java 19 Jan 2008 11:55:23 -0000 1.6 --- IsoMapView.java 18 Mar 2008 19:30:29 -0000 1.7 *************** *** 18,22 **** package tiled.view.old; ! import java.awt.*; import java.awt.font.FontRenderContext; import java.awt.geom.Rectangle2D; --- 18,28 ---- package tiled.view.old; ! import java.awt.Dimension; ! import java.awt.Font; ! import java.awt.Graphics2D; ! import java.awt.Point; ! import java.awt.Polygon; ! import java.awt.Rectangle; ! import java.awt.RenderingHints; import java.awt.font.FontRenderContext; import java.awt.geom.Rectangle2D; *************** *** 24,28 **** import javax.swing.SwingConstants; ! import tiled.core.*; import tiled.mapeditor.selection.SelectionLayer; --- 30,36 ---- import javax.swing.SwingConstants; ! import tiled.core.Map; ! import tiled.core.Tile; ! import tiled.core.TileLayer; import tiled.mapeditor.selection.SelectionLayer; *************** *** 34,37 **** --- 42,46 ---- } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 43,46 **** --- 52,56 ---- } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 52,55 **** --- 62,66 ---- } + @Override protected void paintLayer(Graphics2D g2d, TileLayer layer, double zoom) { // Turn anti alias on for selection drawing *************** *** 109,112 **** --- 120,124 ---- // } + @Override protected void paintGrid(Graphics2D g2d, double zoom) { Dimension tileSize = getTileSize(zoom); *************** *** 135,138 **** --- 147,151 ---- } + @Override protected void paintCoordinates(Graphics2D g2d, double zoom) { g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON); *************** *** 188,191 **** --- 201,205 ---- } + @Override public void repaintRegion(Rectangle region) { Dimension tileSize = getTileSize(zoom); *************** *** 205,208 **** --- 219,223 ---- } + @Override public Dimension getPreferredSize() { Dimension tileSize = getTileSize(zoom); *************** *** 216,219 **** --- 231,235 ---- * Returns the coordinates of the tile at the given screen coordinates. */ + @Override public Point screenToTileCoords(int x, int y) { Dimension tileSize = getTileSize(zoom); *************** *** 232,235 **** --- 248,252 ---- } + @Override protected Polygon createGridPolygon(int tx, int ty, int border) { Dimension tileSize = getTileSize(zoom); *************** *** 256,259 **** --- 273,277 ---- * Returns the location on the screen of the top corner of a tile. */ + @Override public Point tileToScreenCoords(double x, double y) { Dimension tileSize = getTileSize(zoom); Index: ShiftedMapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/ShiftedMapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ShiftedMapView.java 19 Jan 2008 11:55:22 -0000 1.6 --- ShiftedMapView.java 18 Mar 2008 19:30:29 -0000 1.7 *************** *** 24,29 **** import java.awt.Polygon; import java.awt.Rectangle; import javax.swing.SwingConstants; ! import tiled.core.*; public class ShiftedMapView extends MapView { --- 24,32 ---- import java.awt.Polygon; import java.awt.Rectangle; + import javax.swing.SwingConstants; ! ! import tiled.core.Map; ! import tiled.core.TileLayer; public class ShiftedMapView extends MapView { *************** *** 40,43 **** --- 43,47 ---- } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { int unit = getScrollableUnitIncrement(visibleRect, orientation, direction); *************** *** 50,53 **** --- 54,58 ---- } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 59,62 **** --- 64,68 ---- } + @Override public Dimension getPreferredSize() { Dimension tsize = getTileSize(zoom); *************** *** 70,73 **** --- 76,80 ---- } + @Override protected void paintLayer(Graphics2D g2d, TileLayer layer, double zoom) { } *************** *** 77,80 **** --- 84,88 ---- // } + @Override protected void paintGrid(Graphics2D g2d, double zoom) { // Determine tile size *************** *** 116,125 **** --- 124,136 ---- } + @Override protected void paintCoordinates(Graphics2D g2d, double zoom) { } + @Override public void repaintRegion(Rectangle region) { } + @Override public Point screenToTileCoords(int x, int y) { return new Point(0, 0); *************** *** 130,137 **** --- 141,150 ---- } + @Override protected Polygon createGridPolygon(int tx, int ty, int border) { return new Polygon(); } + @Override public Point tileToScreenCoords(double x, double y) { return new Point(0, 0); Index: HexMapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/HexMapView.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** HexMapView.java 17 Mar 2008 17:27:14 -0000 1.7 --- HexMapView.java 18 Mar 2008 19:30:29 -0000 1.8 *************** *** 18,26 **** package tiled.view.old; ! import java.awt.*; import javax.swing.SwingConstants; ! import tiled.core.*; import tiled.mapeditor.selection.SelectionLayer; --- 18,33 ---- package tiled.view.old; ! import java.awt.Color; ! import java.awt.Dimension; ! import java.awt.Graphics2D; ! import java.awt.Point; ! import java.awt.Polygon; ! import java.awt.Rectangle; import javax.swing.SwingConstants; ! import tiled.core.Map; ! import tiled.core.Tile; ! import tiled.core.TileLayer; import tiled.mapeditor.selection.SelectionLayer; *************** *** 65,68 **** --- 72,76 ---- } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 75,78 **** --- 83,87 ---- } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 84,87 **** --- 93,97 ---- } + @Override public Dimension getPreferredSize() { Dimension tsize = getTileSize(zoom); *************** *** 93,96 **** --- 103,107 ---- } + @Override protected void paintLayer(Graphics2D g2d, TileLayer layer, double zoom) { // Determine area to draw from clipping rectangle *************** *** 145,148 **** --- 156,160 ---- } + @Override protected void paintGrid(Graphics2D g2d, double zoom) { g2d.setColor(Color.black); *************** *** 171,178 **** --- 183,192 ---- } + @Override protected void paintCoordinates(Graphics2D g2d, double zoom) { // TODO: Implement paintCoordinates for HexMapView } + @Override public Point screenToTileCoords(int screenX, int screenY) { // An algorithm copied from the net years ago *************** *** 248,251 **** --- 262,266 ---- } + @Override public void repaintRegion(Rectangle region) { super.repaintRegion(region); *************** *** 269,272 **** --- 284,288 ---- } + @Override protected Polygon createGridPolygon(int tx, int ty, int border) { double centrex; *************** *** 294,297 **** --- 310,314 ---- * @return The point at the centre of the Hex. */ + @Override public Point tileToScreenCoords(double x, double y) { double xx = getWidthBetweenHexCentres() * x; Index: OrthoMapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/OrthoMapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** OrthoMapView.java 19 Jan 2008 11:55:23 -0000 1.6 --- OrthoMapView.java 18 Mar 2008 19:30:29 -0000 1.7 *************** *** 30,34 **** import javax.swing.SwingConstants; ! import tiled.core.*; import tiled.mapeditor.selection.SelectionLayer; --- 30,36 ---- import javax.swing.SwingConstants; ! import tiled.core.Map; ! import tiled.core.Tile; ! import tiled.core.TileLayer; import tiled.mapeditor.selection.SelectionLayer; *************** *** 40,43 **** --- 42,46 ---- } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 50,53 **** --- 53,57 ---- } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { Dimension tsize = getTileSize(zoom); *************** *** 59,62 **** --- 63,67 ---- } + @Override public Dimension getPreferredSize() { Dimension tsize = getTileSize(zoom); *************** *** 66,69 **** --- 71,75 ---- } + @Override protected void paintLayer(Graphics2D g2d, TileLayer layer, double zoom) { // Determine tile size and offset *************** *** 117,120 **** --- 123,127 ---- // } + @Override protected void paintGrid(Graphics2D g2d, double zoom) { // Determine tile size *************** *** 143,146 **** --- 150,154 ---- } + @Override protected void paintCoordinates(Graphics2D g2d, double zoom) { Dimension tsize = getTileSize(zoom); *************** *** 181,184 **** --- 189,193 ---- } + @Override public void repaintRegion(Rectangle region) { Dimension tsize = getTileSize(zoom); *************** *** 200,203 **** --- 209,213 ---- } + @Override public Point screenToTileCoords(int x, int y) { Dimension tsize = getTileSize(zoom); *************** *** 211,214 **** --- 221,225 ---- } + @Override protected Polygon createGridPolygon(int tx, int ty, int border) { Dimension tsize = getTileSize(zoom); *************** *** 223,226 **** --- 234,238 ---- } + @Override public Point tileToScreenCoords(double x, double y) { Dimension tsize = getTileSize(zoom); Index: ObliqueMapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/ObliqueMapView.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ObliqueMapView.java 19 Jan 2008 11:55:23 -0000 1.6 --- ObliqueMapView.java 18 Mar 2008 19:30:29 -0000 1.7 *************** *** 24,28 **** import java.awt.Rectangle; ! import tiled.core.*; public class ObliqueMapView extends MapView { --- 24,29 ---- import java.awt.Rectangle; ! import tiled.core.Map; ! import tiled.core.TileLayer; public class ObliqueMapView extends MapView { *************** *** 33,36 **** --- 34,38 ---- } + @Override public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { // TODO Auto-generated method stub *************** *** 38,41 **** --- 40,44 ---- } + @Override public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { // TODO Auto-generated method stub *************** *** 43,46 **** --- 46,50 ---- } + @Override public Dimension getPreferredSize() { // TODO Auto-generated method stub *************** *** 48,51 **** --- 52,56 ---- } + @Override protected void paintLayer(Graphics2D g2d, TileLayer layer, double zoom) { // TODO Auto-generated method stub *************** *** 56,67 **** --- 61,75 ---- // } + @Override protected void paintGrid(Graphics2D g2d, double zoom) { // TODO: Implement paintGrid for ObliqueMapView } + @Override protected void paintCoordinates(Graphics2D g2d, double zoom) { // TODO: Implement paintCoordinates for ObliqueMapView } + @Override public Point screenToTileCoords(int x, int y) { // TODO Auto-generated method stub *************** *** 69,72 **** --- 77,81 ---- } + @Override protected Polygon createGridPolygon(int tx, int ty, int border) { // TODO Auto-generated method stub *************** *** 74,77 **** --- 83,87 ---- } + @Override public Point tileToScreenCoords(double x, double y) { // TODO Auto-generated method stub Index: MapView.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tiled/src/tiled/view/old/MapView.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MapView.java 17 Mar 2008 17:27:14 -0000 1.9 --- MapView.java 18 Mar 2008 19:30:29 -0000 1.10 *************** *** 18,27 **** package tiled.view.old; ! import java.awt.*; // import java.awt.geom.PathIterator; import java.util.Iterator; ! import javax.swing.Scrollable; import javax.swing.JPanel; ! import tiled.core.*; import tiled.util.TiledConfiguration; --- 18,39 ---- package tiled.view.old; ! import java.awt.AlphaComposite; ! import java.awt.BasicStroke; ! import java.awt.Color; ! import java.awt.Dimension; ! import java.awt.Graphics; ! import java.awt.Graphics2D; ! import java.awt.Point; ! import java.awt.Polygon; ! import java.awt.Rectangle; ! import java.awt.RenderingHints; import java.util.Iterator; ! import javax.swing.JPanel; + import javax.swing.Scrollable; ! import tiled.core.Map; ! import tiled.core.MapLayer; ! import tiled.core.TileLayer; import tiled.util.TiledConfiguration; *************** *** 123,126 **** --- 135,139 ---- // Scrolling + @Override public abstract Dimension getPreferredSize(); *************** *** 182,185 **** --- 195,199 ---- * @see SelectionLayer */ + @Override public void paintComponent(Graphics g) { Graphics2D g2d = (Graphics2D) g.create(); *************** *** 360,363 **** --- 374,378 ---- } + @Override public void run() { long currentTime = System.currentTimeMillis(); |