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

simplify logic

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-30 12:14:54 +01:00
parent 249478216f
commit 45122270b1
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/oscim/renderer/LineRenderer.java
View File

@ -20,6 +20,7 @@ import static android.opengl.GLES20.glDrawArrays;
import static android.opengl.GLES20.glGetAttribLocation; import static android.opengl.GLES20.glGetAttribLocation;
import static android.opengl.GLES20.glGetUniformLocation; import static android.opengl.GLES20.glGetUniformLocation;
import static android.opengl.GLES20.glUniform1f; import static android.opengl.GLES20.glUniform1f;
import static android.opengl.GLES20.glUniform4fv;
import static android.opengl.GLES20.glUniformMatrix4fv; import static android.opengl.GLES20.glUniformMatrix4fv;
import static android.opengl.GLES20.glVertexAttribPointer; import static android.opengl.GLES20.glVertexAttribPointer;
@ -153,7 +154,6 @@ public final class LineRenderer {
int lineMode = 0; int lineMode = 0;
glUniform1f(uLineMode, lineMode); glUniform1f(uLineMode, lineMode);
float blurScale = pixel;
boolean blur = false; boolean blur = false;
// dont increase scale when max is reached // dont increase scale when max is reached
boolean strokeMaxZoom = zoom > TileGenerator.STROKE_MAX_ZOOM_LEVEL; boolean strokeMaxZoom = zoom > TileGenerator.STROKE_MAX_ZOOM_LEVEL;
@ -164,15 +164,14 @@ public final class LineRenderer {
Line line = ll.line; Line line = ll.line;
float width; float width;
if (line.fade != -1 && line.fade > zoom) if (line.fade < zoom) {
glUniform4fv(uLineColor, 1, line.color, 0);
} else if (line.fade > zoom) {
continue; continue;
} else {
float alpha = 1.0f; float alpha = (scale > 1.2f ? scale : 1.2f) - 1f;
if (line.fade >= zoom)
alpha = (scale > 1.2f ? scale : 1.2f) - alpha;
GlUtils.setColor(uLineColor, line.color, alpha); GlUtils.setColor(uLineColor, line.color, alpha);
}
if (mode == 0 && blur && line.blur == 0) { if (mode == 0 && blur && line.blur == 0) {
glUniform1f(uLineScale, 0); glUniform1f(uLineScale, 0);
@ -196,9 +195,7 @@ public final class LineRenderer {
glUniform1f(uLineWidth, width); glUniform1f(uLineWidth, width);
if (line.blur != 0) { if (line.blur != 0) {
//blurScale = (ll.width + o.width) / s - (line.blur / s); glUniform1f(uLineScale, 1f - (line.blur / s));
blurScale = 1 - (line.blur / s);
glUniform1f(uLineScale, blurScale);
blur = true; blur = true;
} else if (mode == 1) { } else if (mode == 1) {
glUniform1f(uLineScale, pixel / width); glUniform1f(uLineScale, pixel / width);
@ -231,9 +228,7 @@ public final class LineRenderer {
glUniform1f(uLineWidth, width); glUniform1f(uLineWidth, width);
if (line.blur != 0) { if (line.blur != 0) {
//blurScale = (ll.width / lineScale) * line.blur; glUniform1f(uLineScale, line.blur);
blurScale = line.blur;
glUniform1f(uLineScale, blurScale);
blur = true; blur = true;
} else if (mode == 1) { } else if (mode == 1) {
glUniform1f(uLineScale, pixel / width); glUniform1f(uLineScale, pixel / width);