From ce69dde08a42229d424c9ed2a6da8a49501d3fcc Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Fri, 31 Jan 2014 03:02:12 +0100 Subject: [PATCH] pass non-inverted scale to TextureRenderer --- vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java | 2 +- vtm/src/org/oscim/renderer/ElementRenderer.java | 2 +- vtm/src/org/oscim/renderer/elements/TextureLayer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java index e927e1fe..291845a5 100644 --- a/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java +++ b/vtm/src/org/oscim/layers/tile/vector/labeling/TextRenderer.java @@ -81,7 +81,7 @@ class TextRenderer extends ElementRenderer { layers.vbo.bind(); - float scale = (float) (mMapPosition.scale / pos.scale); + float scale = (float) (pos.scale / mMapPosition.scale); setMatrix(pos, m, false); diff --git a/vtm/src/org/oscim/renderer/ElementRenderer.java b/vtm/src/org/oscim/renderer/ElementRenderer.java index 5867efe6..b8ce4c9f 100644 --- a/vtm/src/org/oscim/renderer/ElementRenderer.java +++ b/vtm/src/org/oscim/renderer/ElementRenderer.java @@ -122,7 +122,7 @@ public abstract class ElementRenderer extends LayerRenderer { continue; } if (l.type == SYMBOL) { - l = TextureLayer.Renderer.draw(l, m, 1 / div); + l = TextureLayer.Renderer.draw(l, m, div); continue; } log.debug("invalid layer {}", l.type); diff --git a/vtm/src/org/oscim/renderer/elements/TextureLayer.java b/vtm/src/org/oscim/renderer/elements/TextureLayer.java index db9ae099..225c71f7 100644 --- a/vtm/src/org/oscim/renderer/elements/TextureLayer.java +++ b/vtm/src/org/oscim/renderer/elements/TextureLayer.java @@ -152,7 +152,7 @@ public abstract class TextureLayer extends RenderElement { TextureLayer tl = (TextureLayer) l; if (tl.fixed) - GL.glUniform1f(hTextureScale, scale); + GL.glUniform1f(hTextureScale, 1 / scale); else GL.glUniform1f(hTextureScale, 1);