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

enable PolygonLayer pattern textures and repeat (tile_size/texture_width) times

Browse Source
This commit is contained in:
Hannes Janetzek 2013-09-23 01:39:20 +02:00
parent fa28799a5b
commit 425c12593b
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vtm/src/org/oscim/renderer/elements/PolygonLayer.java
View File

@ -31,12 +31,18 @@ import org.oscim.renderer.MapRenderer;
import org.oscim.renderer.MapRenderer.Matrices; import org.oscim.renderer.MapRenderer.Matrices;
import org.oscim.theme.renderinstruction.Area; import org.oscim.theme.renderinstruction.Area;
import org.oscim.utils.FastMath; import org.oscim.utils.FastMath;
import org.oscim.utils.Interpolation;
/**
* Special Renderer for drawing tile polygons
*/
public final class PolygonLayer extends RenderElement { public final class PolygonLayer extends RenderElement {
private static final String TAG = PolygonLayer.class.getName(); private static final String TAG = PolygonLayer.class.getName();
private static final float S = MapRenderer.COORD_SCALE; private static final float S = MapRenderer.COORD_SCALE;
private static final boolean enableTexture = true;
public Area area; public Area area;
PolygonLayer(int layer) { PolygonLayer(int layer) {
@ -115,9 +121,6 @@ public final class PolygonLayer extends RenderElement {
protected void clear() { protected void clear() {
} }
/**
* Special Renderer for drawing tile polygon layers
*/
public static final class Renderer { public static final class Renderer {
private static GL20 GL; private static GL20 GL;
@ -141,8 +144,6 @@ public final class PolygonLayer extends RenderElement {
private static int[] hPolygonColor = new int[numShaders]; private static int[] hPolygonColor = new int[numShaders];
private static int[] hPolygonScale = new int[numShaders]; private static int[] hPolygonScale = new int[numShaders];
private static boolean enableTexture = false;
static boolean init(GL20 gl) { static boolean init(GL20 gl) {
GL = gl; GL = gl;
@ -194,8 +195,12 @@ public final class PolygonLayer extends RenderElement {
if (enableTexture && a.texture != null) { if (enableTexture && a.texture != null) {
shader = texShader; shader = texShader;
setShader(texShader, m); setShader(texShader, m);
GL.glUniform2f(hPolygonScale[1], FastMath.clamp(scale - 1, 0, 1), div); float num = (Tile.SIZE / a.texture.width) >> 1;
float transition = Interpolation.exp5.apply(FastMath.clamp(scale - 1, 0, 1));
GL.glUniform2f(hPolygonScale[1], transition, div / num);
//if (a.texture.alpha);
GLState.blend(true);
a.texture.bind(); a.texture.bind();
} else if (a.fade >= zoom) { } else if (a.fade >= zoom) {