- started overlays

- started symbol layer
- move renderer and generator out of view package
  - hopefully the last big refactoring for a while...
- improve perspective, plane should be more far away to decrease foreshortening

src/org/oscim/renderer/MapTile.java

@@ -0,0 +1,143 @@
+/*
+ * Copyright 2012 Hannes Janetzek
+ *
+ * This program is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.oscim.renderer;
+
+import org.oscim.generator.JobTile;
+import org.oscim.renderer.layer.Layers;
+
+class MapTile extends JobTile {
+
+	/**
+	 * VBO layout: - 16 bytes fill coordinates, n bytes polygon vertices, m
+	 * bytes lines vertices
+	 */
+	BufferObject vbo;
+
+	TextTexture texture;
+
+	/**
+	 * Tile data set by TileGenerator:
+	 */
+	TextItem labels;
+	Layers layers;
+
+	/**
+	 * tile has new data to upload to gl
+	 */
+	boolean newData;
+
+	/**
+	 * tile is loaded and ready for drawing.
+	 */
+	boolean isReady;
+
+	/**
+	 * tile is in view region.
+	 */
+	boolean isVisible;
+
+	/**
+	 * pointer to access relatives in QuadTree
+	 */
+	QuadTree rel;
+
+	int lastDraw = 0;
+
+	// keep track which tiles are locked as proxy for this tile
+	final static int PROXY_PARENT = 16;
+	final static int PROXY_GRAMPA = 32;
+	final static int PROXY_HOLDER = 64;
+	// 1-8: children
+	byte proxies;
+
+	// counting the tiles that use this tile as proxy
+	byte refs;
+	byte locked;
+
+	// used when this tile sits in fo another tile.
+	// e.g. x:-1,y:0,z:1 for x:1,y:0
+	MapTile holder;
+
+	MapTile(int tileX, int tileY, byte zoomLevel) {
+		super(tileX, tileY, zoomLevel);
+	}
+
+	boolean isActive() {
+		return isLoading || newData || isReady;
+	}
+
+	boolean isLocked() {
+		return locked > 0 || refs > 0;
+	}
+
+	void lock() {
+		if (holder != null)
+			return;
+
+		locked++;
+
+		if (locked > 1 || isReady || newData)
+			return;
+
+		MapTile p = rel.parent.tile;
+
+		if (p != null && (p.isReady || p.newData || p.isLoading)) {
+			proxies |= PROXY_PARENT;
+			p.refs++;
+		}
+
+		p = rel.parent.parent.tile;
+		if (p != null && (p.isReady || p.newData || p.isLoading)) {
+			proxies |= PROXY_GRAMPA;
+			p.refs++;
+		}
+
+		for (int j = 0; j < 4; j++) {
+			if (rel.child[j] != null) {
+				p = rel.child[j].tile;
+				if (p != null && (p.isReady || p.newData || p.isLoading)) {
+					proxies |= (1 << j);
+					p.refs++;
+				}
+			}
+		}
+	}
+
+	void unlock() {
+		if (holder != null)
+			return;
+
+		locked--;
+
+		if (locked > 0 || proxies == 0)
+			return;
+
+		if ((proxies & (1 << 4)) != 0) {
+			MapTile p = rel.parent.tile;
+			p.refs--;
+		}
+		if ((proxies & (1 << 5)) != 0) {
+			MapTile p = rel.parent.parent.tile;
+			p.refs--;
+		}
+
+		for (int i = 0; i < 4; i++) {
+			if ((proxies & (1 << i)) != 0) {
+				rel.child[i].tile.refs--;
+			}
+		}
+		proxies = 0;
+	}
+}