fly/fgdata
1
0
Fork 0
Code Activity

WS30: Workaround for ALS Ultra road effect

Browse source 
The terrain-default Ultra (n=3) technique
fails for the WS30 line feature.  This change
simply disables it ahead of re-implementing the
traffic shader.
This commit is contained in:
Stuart Buchanan 2022-01-11 21:38:38 +00:00
parent ec807de719
commit c7b73ff91b
4 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Effects/ws30-railway.eff Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ws30-railway</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<speed-factor>0.8</speed-factor>
<base-density>0.25</base-density>
</parameters>
<technique n="3">
<!-- Disable the ultra technique as it doesn't work in WS30-->
<predicate n="0">
<and>
<equal>
<value type="float">2.0</value>
<value type="float">1.0</value>
</equal>
</and>
</predicate>
</technique>
</PropertyList>

20
Effects/ws30-road-high.eff Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ws30-road-high</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<speed-factor>1.2</speed-factor>
<base-density>3.0</base-density>
</parameters>
<technique n="3">
<!-- Disable the ultra technique as it doesn't work in WS30-->
<predicate n="0">
<and>
<equal>
<value type="float">2.0</value>
<value type="float">1.0</value>
</equal>
</and>
</predicate>
</technique>
</PropertyList>

20
Effects/ws30-road-mid.eff Normal file
View file

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Effects/ws30-road-mid</name>
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<speed-factor>0.8</speed-factor>
<base-density>0.25</base-density>
</parameters>
<technique n="3">
<!-- Disable the ultra technique as it doesn't work in WS30-->
<predicate n="0">
<and>
<equal>
<value type="float">2.0</value>
<value type="float">1.0</value>
</equal>
</and>
</predicate>
</technique>
</PropertyList>

8
Materials/base/materials-base.xml
View file

@ -635,8 +635,7 @@
<material n="3002"> <material n="3002">
<name>ws30Road</name> <name>ws30Road</name>
<texture>osm2city/roads.png</texture> <texture>osm2city/roads.png</texture>
<effect>Effects/terrain-default</effect> <effect>Effects/ws30-road-mid</effect>
<!-- <effect>Effects/road-mid</effect> -->
<line-feature-tex-x0>0.25</line-feature-tex-x0> <line-feature-tex-x0>0.25</line-feature-tex-x0>
<line-feature-tex-x1>0.375</line-feature-tex-x1> <line-feature-tex-x1>0.375</line-feature-tex-x1>
<line-feature-offset-m>0.75</line-feature-offset-m> <line-feature-offset-m>0.75</line-feature-offset-m>
@ -664,8 +663,7 @@
<material n="3003"> <material n="3003">
<name>ws30Freeway</name> <name>ws30Freeway</name>
<texture>osm2city/roads.png</texture> <texture>osm2city/roads.png</texture>
<effect>Effects/terrain-default</effect> <effect>Effects/ws30-road-high</effect>
<!-- <effect>Effects/road-high</effect> -->
<line-feature-tex-x0>0.625</line-feature-tex-x0> <line-feature-tex-x0>0.625</line-feature-tex-x0>
<line-feature-tex-x1>0.75</line-feature-tex-x1> <line-feature-tex-x1>0.75</line-feature-tex-x1>
<line-feature-offset-m>1.0</line-feature-offset-m> <line-feature-offset-m>1.0</line-feature-offset-m>
@ -727,7 +725,7 @@
<material n="3005"> <material n="3005">
<name>ws30Railway</name> <name>ws30Railway</name>
<texture>osm2city/roads.png</texture> <texture>osm2city/roads.png</texture>
<effect>Effects/terrain-default</effect> <effect>Effects/ws30-railway</effect>
<line-feature-tex-x0>0</line-feature-tex-x0> <line-feature-tex-x0>0</line-feature-tex-x0>
<line-feature-tex-x1>0.125</line-feature-tex-x1> <line-feature-tex-x1>0.125</line-feature-tex-x1>
<line-feature-offset-m>0.5</line-feature-offset-m> <line-feature-offset-m>0.5</line-feature-offset-m>