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

Render themes: revert tessellation in water areas except sea #224

Browse Source
This commit is contained in:
Emux 2019-12-11 10:12:33 +02:00
parent f7acfd9017
commit 892ea92580
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtm-themes/resources/assets/vtm/default.xml
View File

@ -106,7 +106,7 @@
<!--water--> <!--water-->
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> --> <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="assets:textures/water.png" --> <!-- src="assets:textures/water.png" -->
<style-area fade="-1" fill="#99badf" id="water" mesh="true" /> <style-area fade="-1" fill="#99badf" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -168,7 +168,7 @@
<!--###### ASSIGNMENT ######--> <!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea"> <m e="way" k="natural" v="issea|sea">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
<m e="way" k="natural" v="nosea"> <m e="way" k="natural" v="nosea">

4
vtm-themes/resources/assets/vtm/newtron.xml
View File

@ -74,7 +74,7 @@
<style-area fade="15" fill="#ee404040" id="building" /> <style-area fade="15" fill="#ee404040" id="building" />
<!--water--> <!--water-->
<style-area fill="#001223" id="water" mesh="true" /> <style-area fill="#001223" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -122,7 +122,7 @@
<!--###### ASSIGNMENT ######--> <!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea"> <m e="way" k="natural" v="issea|sea">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
<m e="way" k="natural" v="nosea"> <m e="way" k="natural" v="nosea">

4
vtm-themes/resources/assets/vtm/openmaptiles.xml
View File

@ -102,7 +102,7 @@
<!--water--> <!--water-->
<!--<style-area id="water" fill="#97b7e5" afc5e3 /> --> <!--<style-area id="water" fill="#97b7e5" afc5e3 /> -->
<!-- src="assets:textures/water.png" --> <!-- src="assets:textures/water.png" -->
<style-area fade="-1" fill="#99badf" id="water" mesh="true" /> <style-area fade="-1" fill="#99badf" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -356,7 +356,7 @@
<m k="layer" v="water"> <m k="layer" v="water">
<m k="class"> <m k="class">
<m v="ocean|lake|river"> <m v="ocean|lake|river">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
</m> </m>
</m> </m>

4
vtm-themes/resources/assets/vtm/osmagray.xml
View File

@ -41,7 +41,7 @@
<!--###### AREA styles ######--> <!--###### AREA styles ######-->
<!--water--> <!--water-->
<style-area fill="#d0d0d0" id="water" mesh="true" /> <style-area fill="#d0d0d0" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -56,7 +56,7 @@
<!--###### ASSIGNMENT ######--> <!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea"> <m e="way" k="natural" v="issea|sea">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
<m e="way" k="natural" v="nosea"> <m e="way" k="natural" v="nosea">

4
vtm-themes/resources/assets/vtm/osmarender.xml
View File

@ -41,7 +41,7 @@
<!--###### AREA styles ######--> <!--###### AREA styles ######-->
<!--water--> <!--water-->
<style-area fill="#b5d6f1" id="water" mesh="true" /> <style-area fill="#b5d6f1" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -56,7 +56,7 @@
<!--###### ASSIGNMENT ######--> <!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea"> <m e="way" k="natural" v="issea|sea">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
<m e="way" k="natural" v="nosea"> <m e="way" k="natural" v="nosea">

4
vtm-themes/resources/assets/vtm/tronrender.xml
View File

@ -73,7 +73,7 @@
<style-area fade="15" fill="#ee606060" id="building" /> <style-area fade="15" fill="#ee606060" id="building" />
<!--water--> <!--water-->
<style-area fill="#001223" id="water" mesh="true" /> <style-area fill="#001223" id="water" />
<!--###### LINE styles ######--> <!--###### LINE styles ######-->
@ -122,7 +122,7 @@
<!--###### ASSIGNMENT ######--> <!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea"> <m e="way" k="natural" v="issea|sea">
<area use="water" /> <area mesh="true" use="water" />
</m> </m>
<m e="way" k="natural" v="nosea"> <m e="way" k="natural" v="nosea">

4
vtm/src/org/oscim/renderer/bucket/MeshBucket.java
View File

@ -1,6 +1,6 @@
/* /*
* Copyright 2013 Hannes Janetzek * Copyright 2013 Hannes Janetzek
* Copyright 2017 devemux86 * Copyright 2017-2019 devemux86
* *
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
@ -102,7 +102,7 @@ public class MeshBucket extends RenderBucket {
} }
if (!tess.tesselate()) { if (!tess.tesselate()) {
tess.dispose(); tess.dispose();
log.debug("error in tessellation {}", numPoints); log.error("error in tessellation {}", numPoints);
return; return;
} }