diff --git a/Effects/runway.eff b/Effects/runway.eff index 253dc8b6c..e8dec183f 100644 --- a/Effects/runway.eff +++ b/Effects/runway.eff @@ -77,6 +77,7 @@ /environment/surface/lichen-cover-factor /environment/surface/snow-thickness-factor /environment/surface/wetness + 1.0 /sim/rendering/shaders/skydome /environment/fog-structure /environment/cloud-self-shading @@ -247,6 +248,11 @@ float moonlight + + uvstretch + float + uvstretch + cloudpos1_x float diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml index ff0072f95..b0a4e2b48 100644 --- a/Materials/regions/materials.xml +++ b/Materials/regions/materials.xml @@ -54,14 +54,73 @@ false + + + + + position/longitude-deg + -124.0 + + + position/longitude-deg + -104.0 + + + position/latitude-deg + 32.0 + + + position/latitude-deg + 42.0 + + + + pa_shoulder + Runway/pa_shoulder2.png + + 8.0 + + + pa_shoulder Runway/pa_shoulder.png + + + + + position/longitude-deg + -124.0 + + + position/longitude-deg + -104.0 + + + position/latitude-deg + 32.0 + + + position/latitude-deg + 42.0 + + + + pa_shoulder_f + Runway/pa_shoulder_f2.png + + 8.0 + + + pa_shoulder_f - Runway/pa_shoulder_f.png + Runway/pa_shoulder_f1.png + + 8.0 + diff --git a/Shaders/runway-lightfield.frag b/Shaders/runway-lightfield.frag index 618492988..1d523677e 100644 --- a/Shaders/runway-lightfield.frag +++ b/Shaders/runway-lightfield.frag @@ -30,6 +30,7 @@ uniform float wetness; uniform float fogstructure; uniform float snow_thickness_factor; uniform float cloud_self_shading; +uniform float uvstretch; uniform int quality_level; uniform int tquality_level; @@ -202,7 +203,7 @@ float noise_2000m = Noise2D(rawPos.xy, 2000.0); // 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); vec3 N = nmap.rgb * 2.0 - 1.0; diff --git a/Textures/Runway/pa_shoulder2.png b/Textures/Runway/pa_shoulder2.png new file mode 100644 index 000000000..1951c8746 Binary files /dev/null and b/Textures/Runway/pa_shoulder2.png differ diff --git a/Textures/Runway/pa_shoulder_f1.png b/Textures/Runway/pa_shoulder_f1.png new file mode 100644 index 000000000..aa1a22d93 Binary files /dev/null and b/Textures/Runway/pa_shoulder_f1.png differ diff --git a/Textures/Runway/pa_shoulder_f2.png b/Textures/Runway/pa_shoulder_f2.png new file mode 100644 index 000000000..174235d0b Binary files /dev/null and b/Textures/Runway/pa_shoulder_f2.png differ