Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix issue with shadow color of rendering

Browse source
This commit is contained in:
Victor Shcherb 2012-01-04 23:35:14 +01:00
parent 7c3ff2d5cb
commit 89975f6754
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DataExtractionOSM/src/net/osmand/render/default.render.xml
View file

@ -21,9 +21,9 @@
<renderingAttribute name="shadowRendering">
<!-- next line corrects for shadowColor appearing very dark with solid shadow in day view -->
<filter minzoom="14" nightMode="false" attrIntValue="3" shadowColor="#969696"/>
<filter minzoom="14" attrIntValue="3" shadowColor="#464646"/>
<filter minzoom="9" maxzoom="13" attrIntValue="1" shadowColor="#464646"/>
<filter attrIntValue="0"/>
<filter minzoom="14" attrIntValue="3" shadowColor="#464646"/>
<filter minzoom="9" maxzoom="13" attrIntValue="1" shadowColor="#464646"/>
<filter attrIntValue="0"/>
</renderingAttribute>
<renderingAttribute name="defaultColor">

1
OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java
View file

@ -508,6 +508,7 @@ public class MapRenderRepositories {
renderingReq.setIntFilter(renderingReq.ALL.R_MINZOOM, requestedBox.getZoom());
if(renderingReq.searchRenderingAttribute(RenderingRuleStorageProperties.A_SHADOW_RENDERING)) {
currentRenderingContext.shadowRenderingMode = renderingReq.getIntPropertyValue(renderingReq.ALL.R_ATTR_INT_VALUE);
currentRenderingContext.shadowRenderingColor = renderingReq.getIntPropertyValue(renderingReq.ALL.R_SHADOW_COLOR);
}
currentRenderingContext.leftX = (float) requestedBox.getLeftTileX();
currentRenderingContext.topY = (float) requestedBox.getTopTileY();

7
OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java
View file

@ -126,6 +126,7 @@ public class OsmandRenderer {
// be aware field is using in C++
int shadowRenderingMode = ShadowRenderingMode.BLUR_SHADOW.value;
int shadowRenderingColor = 0xff969696;
// not expect any shadow
int shadowLevelMin = 256;
@ -639,6 +640,9 @@ public class OsmandRenderer {
// do not check shadow color here
if(rc.shadowRenderingMode == 1) {
int shadowColor = req.getIntPropertyValue(req.ALL.R_SHADOW_COLOR);
if(shadowColor == 0) {
shadowColor = rc.shadowRenderingColor;
}
int shadowLayer = req.getIntPropertyValue(req.ALL.R_SHADOW_RADIUS);
if (shadowColor == 0) {
shadowLayer = 0;
@ -767,6 +771,9 @@ public class OsmandRenderer {
if(drawOnlyShadow) {
int shadowColor = render.getIntPropertyValue(render.ALL.R_SHADOW_COLOR);
int shadowRadius = render.getIntPropertyValue(render.ALL.R_SHADOW_RADIUS);
if(shadowColor == 0) {
shadowColor = rc.shadowRenderingColor;
}
drawPolylineShadow(canvas, rc, path, shadowColor, shadowRadius);
} else {
canvas.drawPath(path, paint);