Improved runway shoulder to greenspace transitions
This commit is contained in:
parent
17d792d9c3
commit
6b67f6938b
6 changed files with 68 additions and 2 deletions
|
@ -77,6 +77,7 @@
|
||||||
<lichen_cover_factor><use>/environment/surface/lichen-cover-factor</use></lichen_cover_factor>
|
<lichen_cover_factor><use>/environment/surface/lichen-cover-factor</use></lichen_cover_factor>
|
||||||
<snow_thickness_factor><use>/environment/surface/snow-thickness-factor</use></snow_thickness_factor>
|
<snow_thickness_factor><use>/environment/surface/snow-thickness-factor</use></snow_thickness_factor>
|
||||||
<wetness><use>/environment/surface/wetness</use></wetness>
|
<wetness><use>/environment/surface/wetness</use></wetness>
|
||||||
|
<uvstretch>1.0</uvstretch>
|
||||||
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
|
<fogtype><use>/sim/rendering/shaders/skydome</use></fogtype>
|
||||||
<fogstructure><use>/environment/fog-structure</use></fogstructure>
|
<fogstructure><use>/environment/fog-structure</use></fogstructure>
|
||||||
<cloud_self_shading><use>/environment/cloud-self-shading</use></cloud_self_shading>
|
<cloud_self_shading><use>/environment/cloud-self-shading</use></cloud_self_shading>
|
||||||
|
@ -247,6 +248,11 @@
|
||||||
<type>float</type>
|
<type>float</type>
|
||||||
<value><use>moonlight</use></value>
|
<value><use>moonlight</use></value>
|
||||||
</uniform>
|
</uniform>
|
||||||
|
<uniform>
|
||||||
|
<name>uvstretch</name>
|
||||||
|
<type>float</type>
|
||||||
|
<value><use>uvstretch</use></value>
|
||||||
|
</uniform>
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>cloudpos1_x</name>
|
<name>cloudpos1_x</name>
|
||||||
<type>float</type>
|
<type>float</type>
|
||||||
|
|
|
@ -54,14 +54,73 @@
|
||||||
<wrapu>false</wrapu>
|
<wrapu>false</wrapu>
|
||||||
</material>
|
</material>
|
||||||
|
|
||||||
|
<material include="Materials/base/runway_effect.xml">
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<greater-than>
|
||||||
|
<property>position/longitude-deg</property>
|
||||||
|
<value>-124.0</value>
|
||||||
|
</greater-than>
|
||||||
|
<less-than>
|
||||||
|
<property>position/longitude-deg</property>
|
||||||
|
<value>-104.0</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>position/latitude-deg</property>
|
||||||
|
<value>32.0</value>
|
||||||
|
</greater-than>
|
||||||
|
<less-than>
|
||||||
|
<property>position/latitude-deg</property>
|
||||||
|
<value>42.0</value>
|
||||||
|
</less-than>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
<name>pa_shoulder</name>
|
||||||
|
<texture>Runway/pa_shoulder2.png</texture>
|
||||||
|
<parameters>
|
||||||
|
<uvstretch>8.0</uvstretch>
|
||||||
|
</parameters>
|
||||||
|
</material>
|
||||||
|
|
||||||
<material include="Materials/base/runway_effect.xml">
|
<material include="Materials/base/runway_effect.xml">
|
||||||
<name>pa_shoulder</name>
|
<name>pa_shoulder</name>
|
||||||
<texture>Runway/pa_shoulder.png</texture>
|
<texture>Runway/pa_shoulder.png</texture>
|
||||||
</material>
|
</material>
|
||||||
|
|
||||||
|
<material include="Materials/base/runway_effect.xml">
|
||||||
|
<condition>
|
||||||
|
<and>
|
||||||
|
<greater-than>
|
||||||
|
<property>position/longitude-deg</property>
|
||||||
|
<value>-124.0</value>
|
||||||
|
</greater-than>
|
||||||
|
<less-than>
|
||||||
|
<property>position/longitude-deg</property>
|
||||||
|
<value>-104.0</value>
|
||||||
|
</less-than>
|
||||||
|
<greater-than>
|
||||||
|
<property>position/latitude-deg</property>
|
||||||
|
<value>32.0</value>
|
||||||
|
</greater-than>
|
||||||
|
<less-than>
|
||||||
|
<property>position/latitude-deg</property>
|
||||||
|
<value>42.0</value>
|
||||||
|
</less-than>
|
||||||
|
</and>
|
||||||
|
</condition>
|
||||||
|
<name>pa_shoulder_f</name>
|
||||||
|
<texture>Runway/pa_shoulder_f2.png</texture>
|
||||||
|
<parameters>
|
||||||
|
<uvstretch>8.0</uvstretch>
|
||||||
|
</parameters>
|
||||||
|
</material>
|
||||||
|
|
||||||
<material include="Materials/base/runway_effect.xml">
|
<material include="Materials/base/runway_effect.xml">
|
||||||
<name>pa_shoulder_f</name>
|
<name>pa_shoulder_f</name>
|
||||||
<texture>Runway/pa_shoulder_f.png</texture>
|
<texture>Runway/pa_shoulder_f1.png</texture>
|
||||||
|
<parameters>
|
||||||
|
<uvstretch>8.0</uvstretch>
|
||||||
|
</parameters>
|
||||||
</material>
|
</material>
|
||||||
|
|
||||||
<material include="Materials/base/runway_effect.xml">
|
<material include="Materials/base/runway_effect.xml">
|
||||||
|
|
|
@ -30,6 +30,7 @@ uniform float wetness;
|
||||||
uniform float fogstructure;
|
uniform float fogstructure;
|
||||||
uniform float snow_thickness_factor;
|
uniform float snow_thickness_factor;
|
||||||
uniform float cloud_self_shading;
|
uniform float cloud_self_shading;
|
||||||
|
uniform float uvstretch;
|
||||||
|
|
||||||
uniform int quality_level;
|
uniform int quality_level;
|
||||||
uniform int tquality_level;
|
uniform int tquality_level;
|
||||||
|
@ -202,7 +203,7 @@ float noise_2000m = Noise2D(rawPos.xy, 2000.0);
|
||||||
|
|
||||||
// get the texels
|
// get the texels
|
||||||
|
|
||||||
texel = texture2D(texture, gl_TexCoord[0].st);
|
texel = texture2D(texture, vec2 (gl_TexCoord[0].s, gl_TexCoord[0].t * uvstretch));
|
||||||
vec4 nmap = texture2D(NormalTex, gl_TexCoord[0].st * 8.0);
|
vec4 nmap = texture2D(NormalTex, gl_TexCoord[0].st * 8.0);
|
||||||
vec3 N = nmap.rgb * 2.0 - 1.0;
|
vec3 N = nmap.rgb * 2.0 - 1.0;
|
||||||
|
|
||||||
|
|
BIN
Textures/Runway/pa_shoulder2.png
Normal file
BIN
Textures/Runway/pa_shoulder2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 133 KiB |
BIN
Textures/Runway/pa_shoulder_f1.png
Normal file
BIN
Textures/Runway/pa_shoulder_f1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 44 KiB |
BIN
Textures/Runway/pa_shoulder_f2.png
Normal file
BIN
Textures/Runway/pa_shoulder_f2.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 37 KiB |
Loading…
Add table
Reference in a new issue