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

move near plane back, fixes clipping issue with most large buildings

Browse Source
This commit is contained in:
Hannes Janetzek
2013-01-12 13:37:34 +01:00
parent c462793b99
commit b8287f9ecf
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/org/oscim/renderer/overlays/ExtrusionOverlay.java
View File

@@ -412,22 +412,24 @@ public class ExtrusionOverlay extends RenderOverlay {
+ " color = u_color[0];"
+ " else {"
// decrease contrast with distance
+ " float z = (0.9 + gl_Position.z * 0.1);"
+ " if (u_mode == 1){"
// sides 1 - use 0xff00
// scale direction to -0.5<>0.5
+ " float dir = abs(a_light.y / ff - 0.5);"
+ " color = u_color[1] * z;"
+ " float z = (0.98 + gl_Position.z * 0.02);"
+ " color = u_color[1];"
+ " color.rgb *= (0.7 + dir * 0.4) * z;"
+ " } else if (u_mode == 2){"
// sides 2 - use 0x00ff
+ " float dir = abs(a_light.x / ff - 0.5);"
+ " float z = (0.95 + gl_Position.z * 0.05);"
+ " color = u_color[2] * z;"
+ " color.rgb *= (0.7 + dir * 0.4) * z;"
+ " } else"
+ " } else {"
// outline
+ " float z = (0.8 - gl_Position.z * 0.2);"
+ " color = u_color[3] * z;"
+ "}}"
+ "}}}"
};
final static String extrusionFragmentShader = ""
@@ -437,16 +439,16 @@ public class ExtrusionOverlay extends RenderOverlay {
+ " gl_FragColor = color;"
+ "}";
// final static String extrusionFragmentShader = ""
// + "precision highp float;"
// + "uniform vec4 u_color;"
// + "varying float z;"
// + "void main() {"
// + "if (z < 0.0)"
// + " gl_FragColor = vec4(z * -1.0, 0.0, 0.0, 1.0);"
// + "else"
// + " gl_FragColor = vec4(0.0, 0.0, z, 1.0);"
// + "}";
final static String extrusionFragmentShaderZ = ""
+ "precision highp float;"
+ "uniform vec4 u_color;"
+ "varying float z;"
+ "void main() {"
+ "if (z < 0.0)"
+ " gl_FragColor = vec4(z * -1.0, 0.0, 0.0, 1.0);"
+ "else"
+ " gl_FragColor = vec4(0.0, 0.0, z, 1.0);"
+ "}";
public void setAlpha(float a) {
mAlpha = a;