refactor: rename render 'layers' to 'buckets'

- the name I was looking for for a long time :)
  also less confusion with map layers
- move renderer.elements -> renderer.bucket
- rename RenderBuckets functions
- rename BucketRenderer.layers -> buckets

vtm-playground/src/org/oscim/test/HairLineTest.java

@@ -6,12 +6,12 @@ import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.MapRenderer;
-import org.oscim.renderer.elements.HairLineLayer;
-import org.oscim.renderer.elements.LineLayer;
-import org.oscim.renderer.elements.PolygonLayer;
+import org.oscim.renderer.bucket.HairLineBucket;
+import org.oscim.renderer.bucket.LineBucket;
+import org.oscim.renderer.bucket.PolygonBucket;
 import org.oscim.theme.styles.AreaStyle;
 import org.oscim.theme.styles.LineStyle;
 import org.oscim.theme.styles.LineStyle.LineBuilder;
@@ -31,24 +31,24 @@ public class HairLineTest extends GdxMap {
 		return in;
 	}
 
-	static class Renderer extends ElementRenderer {
+	static class Renderer extends BucketRenderer {
 		boolean init;
 		LineBuilder l = new LineStyle.LineBuilder()
 		    .color(Color.WHITE)
 		    .width(1.5f)
 		    .cap(Cap.ROUND);
 
-		HairLineLayer ll = layers.addHairLineLayer(1, l.build());
+		HairLineBucket ll = buckets.addHairLineBucket(1, l.build());
 
 		//LineLayer ll = layers.addLineLayer(1, new LineStyle(Color.fade(Color.CYAN, 0.6f), 2.5f));
 		LineStyle style = new LineStyle(Color.fade(Color.MAGENTA, 0.6f), 2.5f);
 
-		HairLineLayer l1 = layers.addHairLineLayer(2, style);
+		HairLineBucket l1 = buckets.addHairLineBucket(2, style);
 
 		//style = new LineStyle(Color.fade(Color.LTGRAY, 0.8f), 1.5f);
-		LineLayer l2 = layers.addLineLayer(3, style);
+		LineBucket l2 = buckets.addLineBucket(3, style);
 
-		PolygonLayer pl = layers.addPolygonLayer(4, new AreaStyle.AreaBuilder()
+		PolygonBucket pl = buckets.addPolygonBucket(4, new AreaStyle.AreaBuilder()
 		    .color(Color.BLUE)
 		    //.outline(Color.CYAN, 1)
 		    .build());

vtm-playground/src/org/oscim/test/LineRenderTest.java

@@ -6,11 +6,11 @@ import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.MapRenderer;
-import org.oscim.renderer.elements.LineLayer;
-import org.oscim.renderer.elements.LineTexLayer;
+import org.oscim.renderer.bucket.LineBucket;
+import org.oscim.renderer.bucket.LineTexBucket;
 import org.oscim.theme.styles.LineStyle;
 
 import com.badlogic.gdx.Input;
@@ -75,10 +75,10 @@ public class LineRenderTest extends GdxMap {
 		LineStyle outline2 = new LineStyle(0, null, Color.RED, 2.0f, Cap.ROUND, false, 0,
 		                                   0, 0, 0, 0, true);
 
-		LineLayer ol = l.layers.addLineLayer(0, outline);
-		LineLayer ol2 = l.layers.addLineLayer(5, outline2);
+		LineBucket ol = l.buckets.addLineBucket(0, outline);
+		LineBucket ol2 = l.buckets.addLineBucket(5, outline2);
 
-		LineLayer ll = l.layers.addLineLayer(10, line1);
+		LineBucket ll = l.buckets.addLineBucket(10, line1);
 		ll.addLine(g.translate(0, -20));
 		ll.addLine(g.translate(0, 10.5f));
 		addCircle(-200, -200, 100, ll);
@@ -86,7 +86,7 @@ public class LineRenderTest extends GdxMap {
 		if (addOutline)
 			ol.addOutline(ll);
 
-		ll = l.layers.addLineLayer(20, line2);
+		ll = l.buckets.addLineBucket(20, line2);
 		ll.addLine(g.translate(0, 10.5f));
 		ll.addLine(g.translate(0, 10.5f));
 		addCircle(200, -200, 100, ll);
@@ -94,7 +94,7 @@ public class LineRenderTest extends GdxMap {
 		if (addOutline)
 			ol.addOutline(ll);
 
-		LineTexLayer lt = l.layers.getLineTexLayer(30);
+		LineTexBucket lt = l.buckets.getLineTexBucket(30);
 		lt.line = line3;
 		lt.addLine(g.translate(0, 10.5f));
 		lt.addLine(g.translate(0, 10.5f));
@@ -103,7 +103,7 @@ public class LineRenderTest extends GdxMap {
 		// if (addOutline)
 		// ol2.addOutline(ll);
 
-		ll = l.layers.addLineLayer(40, line4);
+		ll = l.buckets.addLineBucket(40, line4);
 		ll.addLine(g.translate(0, 10.5f));
 		ll.addLine(g.translate(0, 10.5f));
 		addCircle(-200, 200, 100, ll);
@@ -112,7 +112,7 @@ public class LineRenderTest extends GdxMap {
 			ol2.addOutline(ll);
 	}
 
-	void addCircle(float cx, float cy, float radius, LineLayer ll) {
+	void addCircle(float cx, float cy, float radius, LineBucket ll) {
 		GeometryBuffer g = mGeom;
 
 		g.clear();
@@ -128,7 +128,7 @@ public class LineRenderTest extends GdxMap {
 		}
 	}
 
-	void addCircle(float cx, float cy, float radius, LineTexLayer ll) {
+	void addCircle(float cx, float cy, float radius, LineTexBucket ll) {
 		GeometryBuffer g = mGeom;
 
 		g.clear();
@@ -173,14 +173,14 @@ public class LineRenderTest extends GdxMap {
 		return true;
 	}
 
-	class LineTest extends ElementRenderer {
+	class LineTest extends BucketRenderer {
 
 		public LineTest() {
 			mMapPosition.scale = 0;
 		}
 
 		public synchronized void clear() {
-			layers.clear();
+			buckets.clear();
 			setReady(false);
 		}
 

vtm-playground/src/org/oscim/test/LineTest.java

@@ -5,10 +5,10 @@ import org.oscim.core.GeometryBuffer;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.MapRenderer;
-import org.oscim.renderer.elements.LineLayer;
+import org.oscim.renderer.bucket.LineBucket;
 import org.oscim.theme.styles.LineStyle;
 
 import com.badlogic.gdx.Gdx;
@@ -38,10 +38,10 @@ public class LineTest extends GdxMap {
 
 	@Override
 	protected void createLayers() {
-		mMap.layers().add(new GenericLayer(mMap, new ElementRenderer() {
+		mMap.layers().add(new GenericLayer(mMap, new BucketRenderer() {
 			boolean init;
 
-			LineLayer ll = layers.addLineLayer(0,
+			LineBucket ll = buckets.addLineBucket(0,
 			                                   new LineStyle(Color.fade(Color.CYAN, 0.5f), 1.5f));
 
 			GeometryBuffer g = new GeometryBuffer(10, 1);
@@ -79,8 +79,8 @@ public class LineTest extends GdxMap {
 					// compile();
 				}
 
-				layers.clear();
-				layers.setBaseLayers(ll);
+				buckets.clear();
+				buckets.setBaseBuckets(ll);
 				g.clear();
 				for (int i = 0; i < 60; i++) {
 					g.startLine();

vtm-playground/src/org/oscim/test/SpriteManager.java

@@ -20,8 +20,8 @@ import org.oscim.backend.CanvasAdapter;
 import org.oscim.backend.canvas.Canvas;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureAtlas.Rect;
-import org.oscim.renderer.elements.TextureItem;
-import org.oscim.renderer.elements.TextureItem.TexturePool;
+import org.oscim.renderer.bucket.TextureItem;
+import org.oscim.renderer.bucket.TextureItem.TexturePool;
 import org.oscim.utils.pool.Inlist;
 
 /**

vtm-playground/src/org/oscim/test/gdx/poi3d/Poi3DLayer.java

@@ -16,8 +16,8 @@ import org.oscim.layers.tile.TileSet;
 import org.oscim.layers.tile.vector.VectorTileLayer;
 import org.oscim.layers.tile.vector.VectorTileLayer.TileLoaderProcessHook;
 import org.oscim.map.Map;
-import org.oscim.renderer.elements.ElementLayers;
-import org.oscim.renderer.elements.SymbolItem;
+import org.oscim.renderer.bucket.RenderBuckets;
+import org.oscim.renderer.bucket.SymbolItem;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +59,7 @@ public class Poi3DLayer extends Layer implements Map.UpdateListener {
 		tileLayer.addHook(new TileLoaderProcessHook() {
 
 			@Override
-			public boolean process(MapTile tile, ElementLayers layers, MapElement element) {
+			public boolean process(MapTile tile, RenderBuckets buckets, MapElement element) {
 
 				if (!element.tags.contains(TREE_TAG))
 					return false;

vtm-playground/src/org/oscim/test/renderer/AtlasTest.java

@@ -7,14 +7,14 @@ import org.oscim.backend.canvas.Paint.Cap;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
 import org.oscim.renderer.atlas.TextureAtlas;
 import org.oscim.renderer.atlas.TextureAtlas.Rect;
 import org.oscim.renderer.atlas.TextureAtlas.Slot;
-import org.oscim.renderer.elements.LineLayer;
-import org.oscim.renderer.elements.TextItem;
-import org.oscim.renderer.elements.TextLayer;
+import org.oscim.renderer.bucket.LineBucket;
+import org.oscim.renderer.bucket.TextBucket;
+import org.oscim.renderer.bucket.TextItem;
 import org.oscim.theme.styles.LineStyle;
 import org.oscim.theme.styles.TextStyle;
 import org.oscim.theme.styles.TextStyle.TextBuilder;
@@ -34,7 +34,7 @@ public class AtlasTest extends GdxMap {
 		GdxMapApp.run(new AtlasTest(), null, 400);
 	}
 
-	static class AtlasRenderLayer extends ElementRenderer {
+	static class AtlasRenderLayer extends BucketRenderer {
 
 		Logger log = LoggerFactory.getLogger(AtlasRenderLayer.class);
 
@@ -42,21 +42,21 @@ public class AtlasTest extends GdxMap {
 
 			TextureAtlas mAtlas = TextureAtlas.create(2048, 2048, 1);
 
-			LineLayer ll = layers.getLineLayer(0);
+			LineBucket ll = buckets.getLineBucket(0);
 			ll.line = new LineStyle(Color.BLUE, 3, Cap.BUTT);
 			ll.scale = 1f;
 
-			LineLayer ll2 = layers.getLineLayer(1);
+			LineBucket ll2 = buckets.getLineBucket(1);
 			ll2.line = new LineStyle(Color.RED, 3, Cap.BUTT);
 			ll2.scale = 1f;
 
-			LineLayer ll3 = layers.getLineLayer(2);
+			LineBucket ll3 = buckets.getLineBucket(2);
 			ll3.line = new LineStyle(Color.GREEN, 3, Cap.BUTT);
 			ll3.scale = 1f;
 
-			TextLayer tl = new TextLayer();
+			TextBucket tl = new TextBucket();
 			TextStyle t = new TextBuilder().setFontSize(20).setColor(Color.BLACK).build();
-			layers.setTextureLayers(tl);
+			buckets.setTextureBuckets(tl);
 
 			float[] points = new float[10];
 

vtm-playground/src/org/oscim/test/renderer/BezierTest.java

@@ -8,9 +8,9 @@ import org.oscim.core.Point;
 import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
-import org.oscim.renderer.elements.LineLayer;
+import org.oscim.renderer.bucket.LineBucket;
 import org.oscim.theme.styles.LineStyle;
 import org.oscim.utils.geom.BezierPath;
 
@@ -26,7 +26,7 @@ public class BezierTest extends GdxMap {
 		GdxMapApp.run(new BezierTest(), null, 400);
 	}
 
-	static class BezierPathLayer extends ElementRenderer {
+	static class BezierPathLayer extends BucketRenderer {
 
 		public BezierPathLayer() {
 			mMapPosition.scale = 0;
@@ -42,7 +42,7 @@ public class BezierTest extends GdxMap {
 				// System.out.println(pts[i]);
 				g.addPoint(pts[i]);
 			}
-			LineLayer ll = layers.addLineLayer(0, new LineStyle(Color.BLUE, 2f));
+			LineBucket ll = buckets.addLineBucket(0, new LineStyle(Color.BLUE, 2f));
 			ll.addLine(g);
 
 			List<Point> ctrl = BezierPath.cubicSplineControlPoints(pts, 0.1f);
@@ -64,13 +64,13 @@ public class BezierTest extends GdxMap {
 				}
 				p0 = p3;
 			}
-			ll = layers.addLineLayer(1, new LineStyle(Color.CYAN, 2f));
+			ll = buckets.addLineBucket(1, new LineStyle(Color.CYAN, 2f));
 			ll.addLine(g);
 
 		}
 
 		public synchronized void clear() {
-			layers.clear();
+			buckets.clear();
 			setReady(false);
 		}
 

vtm-playground/src/org/oscim/test/renderer/HexagonRenderTest.java

@@ -8,7 +8,7 @@ import org.oscim.gdx.GdxMap;
 import org.oscim.gdx.GdxMapApp;
 import org.oscim.layers.GenericLayer;
 import org.oscim.renderer.BufferObject;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLShader;
 import org.oscim.renderer.GLState;
 import org.oscim.renderer.GLUtils;
@@ -35,7 +35,7 @@ public class HexagonRenderTest extends GdxMap {
 	 * based on chapter 2 from:
 	 * https://github.com/dalinaum/opengl-es-book-samples/tree/master/Android */
 
-	static class HexagonRenderer extends ElementRenderer {
+	static class HexagonRenderer extends BucketRenderer {
 
 		private int mProgramObject;
 		private int hVertexPosition;

vtm-playground/src/org/oscim/test/renderer/SymbolRenderLayer.java

@@ -17,17 +17,17 @@
 package org.oscim.test.renderer;
 
 import org.oscim.backend.CanvasAdapter;
-import org.oscim.renderer.ElementRenderer;
+import org.oscim.renderer.BucketRenderer;
 import org.oscim.renderer.GLViewport;
-import org.oscim.renderer.elements.SymbolItem;
-import org.oscim.renderer.elements.SymbolLayer;
+import org.oscim.renderer.bucket.SymbolBucket;
+import org.oscim.renderer.bucket.SymbolItem;
 
-public class SymbolRenderLayer extends ElementRenderer {
+public class SymbolRenderLayer extends BucketRenderer {
 	boolean initialize = true;
 
 	public SymbolRenderLayer() {
-		SymbolLayer l = new SymbolLayer();
-		layers.setTextureLayers(l);
+		SymbolBucket l = new SymbolBucket();
+		buckets.setTextureBuckets(l);
 
 		SymbolItem it = SymbolItem.pool.get();
 		it.billboard = false;