building color

This commit is contained in:
Hannes Janetzek 2013-02-01 12:56:27 +01:00
parent 76a4e529ae
commit 373d45e008
2 changed files with 8 additions and 8 deletions

View File

@ -332,24 +332,24 @@ public class ExtrusionOverlay extends RenderOverlay {
GlUtils.addOffsetM(matrix, delta);
}
private final float _a = 0.8f;
private final float _a = 0.86f;
private final float _r = 0xe9;
private final float _g = 0xe8;
private final float _b = 0xe6;
private final float _o = 55;
private final float _s = 20;
private final float _l = 16;
private final float _l = 10;
private float mAlpha = 1;
private final float[] mColor = {
// roof color
_a * ((_r + _l) / 255),
_a * ((_g + _l) / 255),
_a * ((_r + _l + 3) / 255),
_a * ((_g + _l + 2) / 255),
_a * ((_b + _l) / 255),
_a,
// sligthly differ adjacent side
// faces to improve contrast
_a * ((_r - _s + 1) / 255),
_a * ((_g - _s + 1) / 255),
_a * ((_r - _s) / 255 + 0.01f),
_a * ((_g - _s) / 255 + 0.01f),
_a * ((_b - _s) / 255),
_a,
_a * ((_r - _s) / 255),
@ -430,7 +430,7 @@ public class ExtrusionOverlay extends RenderOverlay {
// sides 2 - use 0x00ff
//+ " 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.98 + gl_Position.z * 0.02);"
+ " color = u_color[2] * z;"
+ " color.rgb *= (0.9 + dir * 0.1) * z;"
+ " } else {"

View File

@ -78,7 +78,7 @@
<style-area name="building" fill="#e9e6e3" fade="15"/>-->
<style-line name="building" stroke="#b7b6b3" width="1.0" fixed="true" cap="butt" fade="15"/>
<!-- <style-area name="building" fill="#eae8e6" fade="15"/>-->
<style-area name="building" fill="#eef7f6f3" fade="15"/>
<style-area name="building" fill="#eef6f4f0" fade="15"/>
<!-- ways -->
<rule e="way" k="*" v="*" >