fly/fgdata
1
0
Fork 0
Code Activity

WS30i: Initial coastlines

Browse source
This commit is contained in:
Stuart Buchanan 2021-05-03 15:47:13 +01:00
parent b0430822b4
commit c87798c610
5 changed files with 79 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Effects/ws30water.eff
View file

@ -994,9 +994,9 @@
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/include_fog.frag</fragment-shader> <fragment-shader>Shaders/include_fog.frag</fragment-shader>
<fragment-shader>Shaders/water_sine.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-high.frag</fragment-shader>
</program> </program>
<uniform> <uniform>
<name>water_reflection</name> <name>water_reflection</name>
@ -1384,16 +1384,16 @@
<use>texture[6]/wrap-s</use> <use>texture[6]/wrap-s</use>
</wrap-s> </wrap-s>
<wrap-t> <wrap-t>
<use>texture[6]/wrap-t</use> <use>texture[6]/wrap-t</use>
</wrap-t> </wrap-t>
<internal-format> <internal-format>
<use>texture[6]/internal-format</use> <use>texture[6]/internal-format</use>
</internal-format> </internal-format>
</texture-unit> </texture-unit>
<program> <program>
<vertex-shader>Shaders/water.vert</vertex-shader> <vertex-shader>Shaders/water-ALS.vert</vertex-shader>
<fragment-shader>Shaders/include_fog.frag</fragment-shader> <fragment-shader>Shaders/include_fog.frag</fragment-shader>
<fragment-shader>Shaders/water.frag</fragment-shader> <fragment-shader>Shaders/water-ALS-base.frag</fragment-shader>
</program> </program>
<uniform> <uniform>
<name>water_reflection</name> <name>water_reflection</name>

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

@ -42,6 +42,32 @@
<effect>Effects/ws30water</effect> <effect>Effects/ws30water</effect>
</material> </material>
<material n="3002">
<name>ws30coastline</name>
<effect>Effects/ws30water</effect>
<texture>Terrain/coastline.png</texture>
<xsize>2000</xsize>
<ysize>2000</ysize>
<diffuse>
<r>0.93</r>
<g>0.95</g>
<b>0.93</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.1</r>
<g>0.12</g>
<b>0.1</b>
<a>1.0</a>
</specular>
<shininess>1.2</shininess>
<solid>1</solid>
<friction-factor>0.7</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.15</bumpiness>
<load-resistance>1e30</load-resistance>
</material>
<!-- Signage --> <!-- Signage -->

BIN
Textures/Terrain/coastline.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 159 KiB

2
defaults.xml
View file

@ -119,6 +119,8 @@ Started September 2000 by David Megginson, david@megginson.com
<line-features-lod-level type="int" userarchive="y">5</line-features-lod-level> <line-features-lod-level type="int" userarchive="y">5</line-features-lod-level>
<area-features-lod-level type="int" userarchive="y">5</area-features-lod-level> <area-features-lod-level type="int" userarchive="y">5</area-features-lod-level>
<vegetation-lod-level type="int" userarchive="y">6</vegetation-lod-level> <vegetation-lod-level type="int" userarchive="y">6</vegetation-lod-level>
<coastline-lod-level type="int" userarchive="y">3</coastline-lod-level>
<coastline-width type="float" userarchive="y">80.0</coastline-width>
<lod-level n="0"> <lod-level n="0">
<area-features-min-width>10000</area-features-min-width> <area-features-min-width>10000</area-features-min-width>
<line-features-min-width>9999.9</line-features-min-width> <line-features-min-width>9999.9</line-features-min-width>

46
gui/dialogs/static-lod.xml
View file

@ -825,6 +825,52 @@
<live>true</live> <live>true</live>
<property>/sim/rendering/static-lod/area-features-lod-level</property> <property>/sim/rendering/static-lod/area-features-lod-level</property>
</text> </text>
<text>
<row>4</row>
<col>0</col>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<label>Detailed coastline minimum LOD</label>
</text>
<slider>
<row>4</row>
<col>1</col>
<name>coast-lod</name>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<min>0.0</min>
<max>6.0</max>
<step>1.0</step>
<fraction>0.17</fraction>
<property>/sim/rendering/static-lod/coastline-lod-level</property>
<binding>
<command>dialog-apply</command>
<object-name>coast-lod</object-name>
</binding>
</slider>
<text>
<row>4</row>
<col>2</col>
<label>1</label>
<enable>
<equals>
<property>/scenery/use-vpb</property>
<value>true</value>
</equals>
</enable>
<format>%d</format>
<live>true</live>
<property>/sim/rendering/static-lod/coastline-lod-level</property>
</text>
</group> </group>
</group> </group>