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

pass non-inverted scale to TextureRenderer

Browse Source
This commit is contained in:
Hannes Janetzek 2014-01-31 03:02:12 +01:00
parent c5de7d6051
commit ce69dde08a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java
View File

@ -81,7 +81,7 @@ class TextRenderer extends ElementRenderer {
layers.vbo.bind(); layers.vbo.bind();
float scale = (float) (mMapPosition.scale / pos.scale); float scale = (float) (pos.scale / mMapPosition.scale);
setMatrix(pos, m, false); setMatrix(pos, m, false);

2
vtm/src/org/oscim/renderer/ElementRenderer.java
View File

@ -122,7 +122,7 @@ public abstract class ElementRenderer extends LayerRenderer {
continue; continue;
} }
if (l.type == SYMBOL) { if (l.type == SYMBOL) {
l = TextureLayer.Renderer.draw(l, m, 1 / div); l = TextureLayer.Renderer.draw(l, m, div);
continue; continue;
} }
log.debug("invalid layer {}", l.type); log.debug("invalid layer {}", l.type);

2
vtm/src/org/oscim/renderer/elements/TextureLayer.java
View File

@ -152,7 +152,7 @@ public abstract class TextureLayer extends RenderElement {
TextureLayer tl = (TextureLayer) l; TextureLayer tl = (TextureLayer) l;
if (tl.fixed) if (tl.fixed)
GL.glUniform1f(hTextureScale, scale); GL.glUniform1f(hTextureScale, 1 / scale);
else else
GL.glUniform1f(hTextureScale, 1); GL.glUniform1f(hTextureScale, 1);