xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: rename render 'layers' to 'buckets'

Browse Source 
- 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
This commit is contained in:
Hannes Janetzek
2014-09-04 20:14:57 +02:00
parent b4a567884f
commit f6d85ce8bd
64 changed files with 595 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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];

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

@@ -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);
}

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

@@ -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;

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

@@ -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;