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

Render themes: use tessellation in water areas, fix #224

Browse Source
This commit is contained in:
Emux 2018-05-11 14:24:16 +03:00
parent 12cb34146c
commit 92937667d8
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
7 changed files with 20 additions and 19 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

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

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

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

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

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

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

@ -38,7 +38,9 @@
<!--###### AREA styles ######-->
<!--no styles-->
<!--water-->
<style-area fill="#d0d0d0" id="water" mesh="true" />
<!--###### LINE styles ######-->
@ -53,7 +55,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
<area fill="#d0d0d0" mesh="true" />
<area use="water" />
</m>
<m e="way" k="natural" v="nosea">
@ -311,7 +313,7 @@
<m k="natural" v="water">
<area fill="#d0d0d0" />
<area use="water" />
<caption area-size="0.4" fill="#3b3b3b" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>

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

@ -38,7 +38,9 @@
<!--###### AREA styles ######-->
<!--no styles-->
<!--water-->
<style-area fill="#b5d6f1" id="water" mesh="true" />
<!--###### LINE styles ######-->
@ -53,7 +55,7 @@
<!--###### ASSIGNMENT ######-->
<m e="way" k="natural" v="issea|sea">
<area fill="#b5d6f1" mesh="true" />
<area use="water" />
</m>
<m e="way" k="natural" v="nosea">
@ -311,7 +313,7 @@
<m k="natural" v="water">
<area fill="#b5d6f1" />
<area use="water" />
<caption area-size="0.4" fill="#404000" k="name" size="16" stroke="#aaffffff"
stroke-width="2.0" />
</m>

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

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

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

@ -101,7 +101,7 @@ public class MeshBucket extends RenderBucket {
}
if (!tess.tesselate()) {
tess.dispose();
log.error("error in tessellation {}", numPoints);
log.debug("error in tessellation {}", numPoints);
return;
}