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

MapGenerator -> TileGenerator

Browse Source
This commit is contained in:
Hannes Janetzek 2012-09-18 15:48:45 +02:00
parent d3f8f7ceef
commit e54e6e1c46
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/oscim/view/renderer/GLRenderer.java
View File

@ -580,12 +580,12 @@ public class GLRenderer implements GLSurfaceView.Renderer {
int z = mapPosition.zoomLevel; int z = mapPosition.zoomLevel;
float s = mapPosition.scale; 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); float scale = (float) Math.pow(1.4, zoomLevelDiff);
if (scale < 1) if (scale < 1)
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); TextRenderer.beginDraw(FloatMath.sqrt(s) / scale, mRotTMatrix);
else else
TextRenderer.beginDraw(s, mRotTMatrix); TextRenderer.beginDraw(s, mRotTMatrix);

4
src/org/oscim/view/renderer/LineRenderer.java
View File

@ -130,7 +130,7 @@ class LineRenderer {
blur = true; blur = true;
} }
if (zoom > MapGenerator.STROKE_MAX_ZOOM_LEVEL) if (zoom > TileGenerator.STROKE_MAX_ZOOM_LEVEL)
GLES20.glUniform1f(hLineWidth, GLES20.glUniform1f(hLineWidth,
(l.width + o.width) / (scale * z)); (l.width + o.width) / (scale * z));
else else
@ -146,7 +146,7 @@ class LineRenderer {
blur = true; 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 // invert scaling of extrusion vectors so that line width stays the same
GLES20.glUniform1f(hLineWidth, (l.width / (scale * z))); GLES20.glUniform1f(hLineWidth, (l.width / (scale * z)));
} else { } else {