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

BuildingLayer: add shadow parameter #575

Browse Source
This commit is contained in:
Emux
2019-02-21 20:12:20 +02:00
parent 7cfbe1c115
commit f348296a8c
5 changed files with 39 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
vtm/src/org/oscim/layers/tile/buildings/BuildingLayer.java
View File

@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016-2018 devemux86
* Copyright 2016-2019 devemux86
* Copyright 2016 Robin Boldt
* Copyright 2017-2019 Gustl22
*
@@ -60,11 +60,6 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook, ZoomLim
*/
public static boolean RAW_DATA = false;
/**
* Use shadow rendering.
*/
public static boolean SHADOW = false;
/**
* Let vanish extrusions / meshes which are covered by others.
* {@link org.oscim.renderer.bucket.RenderBucket#EXTRUSION}: roofs are always translucent.
@@ -95,11 +90,11 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook, ZoomLim
}
public BuildingLayer(Map map, VectorTileLayer tileLayer) {
this(map, tileLayer, false);
this(map, tileLayer, false, false);
}
public BuildingLayer(Map map, VectorTileLayer tileLayer, boolean mesh) {
this(map, tileLayer, MIN_ZOOM, map.viewport().getMaxZoomLevel(), mesh);
public BuildingLayer(Map map, VectorTileLayer tileLayer, boolean mesh, boolean shadow) {
this(map, tileLayer, MIN_ZOOM, map.viewport().getMaxZoomLevel(), mesh, shadow);
}
/**
@@ -108,9 +103,9 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook, ZoomLim
* @param zoomMin The minimum zoom at which the layer appears
* @param zoomMax The maximum zoom at which the layer appears
* @param mesh Declare if using mesh or polygon renderer
* @param shadow Declare if using shadow renderer
*/
public BuildingLayer(Map map, VectorTileLayer tileLayer, int zoomMin, int zoomMax, boolean mesh) {
public BuildingLayer(Map map, VectorTileLayer tileLayer, int zoomMin, int zoomMax, boolean mesh, boolean shadow) {
super(map);
tileLayer.addHook(this);
@@ -119,8 +114,8 @@ public class BuildingLayer extends Layer implements TileLoaderThemeHook, ZoomLim
mZoomLimiter = new ZoomLimiter(tileLayer.getManager(), zoomMin, zoomMax, zoomMin);
mRenderer = mExtrusionRenderer = new BuildingRenderer(tileLayer.tileRenderer(), mZoomLimiter, mesh, TRANSLUCENT);
// TODO Allow SHADOW and POST_AA at same time
if (SHADOW)
// TODO Allow shadow and POST_AA at same time
if (shadow)
mRenderer = new ShadowRenderer(mExtrusionRenderer);
else if (POST_AA)
mRenderer = new OffscreenRenderer(Mode.SSAO_FXAA, mRenderer);

15
vtm/src/org/oscim/layers/tile/buildings/S3DBLayer.java
View File

@@ -1,6 +1,6 @@
/*
* Copyright 2018 Gustl22
* Copyright 2018 devemux86
* Copyright 2018-2019 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -38,7 +38,7 @@ import java.util.Set;
import static org.oscim.renderer.MapRenderer.COORD_SCALE;
/**
* An experimental layer to display S3DB elements.
* A layer to display S3DB elements.
*/
public class S3DBLayer extends BuildingLayer {
@@ -50,7 +50,11 @@ public class S3DBLayer extends BuildingLayer {
private boolean mTransparent = true;
public S3DBLayer(Map map, VectorTileLayer tileLayer) {
this(map, tileLayer, MIN_ZOOM, map.viewport().getMaxZoomLevel());
this(map, tileLayer, false);
}
public S3DBLayer(Map map, VectorTileLayer tileLayer, boolean shadow) {
this(map, tileLayer, MIN_ZOOM, map.viewport().getMaxZoomLevel(), shadow);
}
/**
@@ -58,9 +62,10 @@ public class S3DBLayer extends BuildingLayer {
* @param tileLayer The vector tile layer which contains the tiles and map elements
* @param zoomMin The minimum zoom at which the layer appears
* @param zoomMax The maximum zoom at which the layer appears
* @param shadow Declare if using shadow renderer
*/
public S3DBLayer(Map map, VectorTileLayer tileLayer, int zoomMin, int zoomMax) {
super(map, tileLayer, zoomMin, zoomMax, true);
public S3DBLayer(Map map, VectorTileLayer tileLayer, int zoomMin, int zoomMax, boolean shadow) {
super(map, tileLayer, zoomMin, zoomMax, true, shadow);
}
public boolean isColored() {