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

one single light direction from north

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-12 16:42:46 +01:00
parent 3414915622
commit dabfe680a9
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,8 +226,10 @@ public class ExtrusionOverlay extends RenderOverlay {
GLES20.glUseProgram(extrusionProgram[shaderMode]); GLES20.glUseProgram(extrusionProgram[shaderMode]);
GLState.enableVertexArrays(uExtVertexPosition, -1); GLState.enableVertexArrays(uExtVertexPosition, -1);
GLES20.glEnable(GLES20.GL_CULL_FACE); if (pos.scale < 2) {
GLES20.glCullFace(GLES20.GL_FRONT); GLES20.glEnable(GLES20.GL_CULL_FACE);
GLES20.glCullFace(GLES20.GL_FRONT);
}
GLES20.glDepthFunc(GLES20.GL_LESS); GLES20.glDepthFunc(GLES20.GL_LESS);
GLES20.glColorMask(false, false, false, false); GLES20.glColorMask(false, false, false, false);
GLES20.glUniform1i(uExtMode, 0); GLES20.glUniform1i(uExtMode, 0);
@ -306,7 +308,8 @@ public class ExtrusionOverlay extends RenderOverlay {
tiles[i] = null; tiles[i] = null;
} }
GLES20.glDisable(GLES20.GL_CULL_FACE); if (pos.scale < 2)
GLES20.glDisable(GLES20.GL_CULL_FACE);
GLES20.glBindBuffer(GLES20.GL_ELEMENT_ARRAY_BUFFER, 0); GLES20.glBindBuffer(GLES20.GL_ELEMENT_ARRAY_BUFFER, 0);
} }
@ -331,7 +334,7 @@ public class ExtrusionOverlay extends RenderOverlay {
private final float _g = 0xe8; private final float _g = 0xe8;
private final float _b = 0xe6; private final float _b = 0xe6;
private final float _o = 55; private final float _o = 55;
private final float _s = -10; private final float _s = 20;
private final float _l = 16; private final float _l = 16;
private float mAlpha = 1; private float mAlpha = 1;
private final float[] mColor = { private final float[] mColor = {
@ -415,16 +418,18 @@ public class ExtrusionOverlay extends RenderOverlay {
+ " if (u_mode == 1){" + " if (u_mode == 1){"
// sides 1 - use 0xff00 // sides 1 - use 0xff00
// scale direction to -0.5<>0.5 // scale direction to -0.5<>0.5
+ " float dir = abs(a_light.y / ff - 0.5);" //+ " float dir = abs(a_light.y / ff - 0.5);"
+ " float dir = a_light.y / ff;"
+ " float z = (0.98 + gl_Position.z * 0.02);" + " float z = (0.98 + gl_Position.z * 0.02);"
+ " color = u_color[1];" + " color = u_color[1];"
+ " color.rgb *= (0.7 + dir * 0.4) * z;" + " color.rgb *= (0.8 + dir * 0.2) * z;"
+ " } else if (u_mode == 2){" + " } else if (u_mode == 2){"
// sides 2 - use 0x00ff // sides 2 - use 0x00ff
+ " float dir = abs(a_light.x / ff - 0.5);" //+ " float dir = abs(a_light.x / ff - 0.5);"
+ " float dir = a_light.x / ff;"
+ " float z = (0.95 + gl_Position.z * 0.05);" + " float z = (0.95 + gl_Position.z * 0.05);"
+ " color = u_color[2] * z;" + " color = u_color[2] * z;"
+ " color.rgb *= (0.7 + dir * 0.4) * z;" + " color.rgb *= (0.8 + dir * 0.2) * z;"
+ " } else {" + " } else {"
// outline // outline
+ " float z = (0.8 - gl_Position.z * 0.2);" + " float z = (0.8 - gl_Position.z * 0.2);"