From e54e6e1c46c62251140f023df05b1636c56d9efe Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Tue, 18 Sep 2012 15:48:45 +0200 Subject: [PATCH] MapGenerator -> TileGenerator --- src/org/oscim/view/renderer/GLRenderer.java | 4 ++-- src/org/oscim/view/renderer/LineRenderer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/oscim/view/renderer/GLRenderer.java b/src/org/oscim/view/renderer/GLRenderer.java index 8ca961f3..330c1e14 100644 --- a/src/org/oscim/view/renderer/GLRenderer.java +++ b/src/org/oscim/view/renderer/GLRenderer.java @@ -580,12 +580,12 @@ public class GLRenderer implements GLSurfaceView.Renderer { int z = mapPosition.zoomLevel; float s = mapPosition.scale; - int zoomLevelDiff = Math.max(z - MapGenerator.STROKE_MAX_ZOOM_LEVEL, 0); + int zoomLevelDiff = Math.max(z - TileGenerator.STROKE_MAX_ZOOM_LEVEL, 0); float scale = (float) Math.pow(1.4, zoomLevelDiff); if (scale < 1) scale = 1; - if (z >= MapGenerator.STROKE_MAX_ZOOM_LEVEL) + if (z >= TileGenerator.STROKE_MAX_ZOOM_LEVEL) TextRenderer.beginDraw(FloatMath.sqrt(s) / scale, mRotTMatrix); else TextRenderer.beginDraw(s, mRotTMatrix); diff --git a/src/org/oscim/view/renderer/LineRenderer.java b/src/org/oscim/view/renderer/LineRenderer.java index f03edde0..b8161bb6 100644 --- a/src/org/oscim/view/renderer/LineRenderer.java +++ b/src/org/oscim/view/renderer/LineRenderer.java @@ -130,7 +130,7 @@ class LineRenderer { blur = true; } - if (zoom > MapGenerator.STROKE_MAX_ZOOM_LEVEL) + if (zoom > TileGenerator.STROKE_MAX_ZOOM_LEVEL) GLES20.glUniform1f(hLineWidth, (l.width + o.width) / (scale * z)); else @@ -146,7 +146,7 @@ class LineRenderer { blur = true; } - if (line.fixed || zoom > MapGenerator.STROKE_MAX_ZOOM_LEVEL) { + if (line.fixed || zoom > TileGenerator.STROKE_MAX_ZOOM_LEVEL) { // invert scaling of extrusion vectors so that line width stays the same GLES20.glUniform1f(hLineWidth, (l.width / (scale * z))); } else {