diff --git a/Effects/flutter.eff b/Effects/flutter.eff
index 404eda994..8a4c6574c 100644
--- a/Effects/flutter.eff
+++ b/Effects/flutter.eff
@@ -15,11 +15,45 @@
0.0
0.08
+
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- /sim/rendering/shader-effects
+
+
+ 3.0
+ /sim/rendering/shaders/quality-level
+
2.0
@@ -114,7 +148,9 @@
+ Shaders/include_fog.vert
Shaders/flutter.vert
+ Shaders/include_fog.frag
Shaders/default.frag
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index 2a9adf0b7..cfde14342 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -1,128 +1,272 @@
- Effects/model-default
-
-
- white
-
- false
-
- 1
-
-
-
-
-
- /sim/rendering/shader-effects
-
-
- 2.0
-
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ white
+
+ false
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /sim/rendering/shader-effects
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 0
-
-
-
-
-
-
-
-
-
-
-
-
- Shaders/default.vert
- Shaders/default.frag
-
-
- texture
- sampler-2d
- 0
-
-
- colorMode
- int
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
-
-
-
-
-
+ Shaders/default.vert
+ Shaders/include_fog.frag
+
+ Shaders/default.frag
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
+ texture
+ sampler-2d
+ 0
+
+
+ colorMode
+ int
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- modulate
-
-
-
-
-
+
+
diff --git a/Effects/runway.eff b/Effects/runway.eff
index e027a5c02..8d8ca491e 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -1,21 +1,21 @@
- Effects/runway
- Effects/terrain-default
-
-
- Textures.high/Runway/rwy-normalmap.dds
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
+ Effects/runway
+ Effects/terrain-default
+
+
+ Textures.high/Runway/rwy-normalmap.dds
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
cubemap
-
+
Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png
Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png
@@ -25,41 +25,43 @@
Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png
-
-
- Aircraft/Generic/Effects/Rainbow.png
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
-
- Aircraft/Generic/Effects/FresnelLookUp.png
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
-
- Textures.high/Runway/rwy-reflect.png
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
- transparent
- smooth
- 0.01
- 0.01
- 0.01
-
- 0.01
- 1
- 1
- false
+
+
+ Aircraft/Generic/Effects/Rainbow.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Aircraft/Generic/Effects/FresnelLookUp.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Textures.high/Runway/rwy-reflect.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+ transparent
+ smooth
+ 0.01
+ 0.01
+ 0.01
+
+ 0.01
+ 1
+ 1
+ false
+ back
-
-
+
+
+
@@ -80,38 +82,48 @@
-
-
- 6
- 7
-
-
-
-
- /sim/rendering/shader-effects
-
-
- 2.0
-
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
-
-
-
-
- 0
-
-
-
-
-
-
+
+
+ 6
+ 7
+
+
+
+
+ /sim/rendering/shader-effects
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
4
@@ -209,23 +221,27 @@
9
noise
-
-
-
-
+
+
+
+
+
+
+
+
Shaders/include_fog.vert
- Shaders/reflect-bump-spec.vert
+ Shaders/reflect-bump-spec.vert
Shaders/include_fog.frag
- Shaders/runway-reflect-bump-spec.frag
-
- tangent
- 6
-
-
- binormal
- 7
-
-
+ Shaders/runway-reflect-bump-spec.frag
+
+ tangent
+ 6
+
+
+ binormal
+ 7
+
+
BaseTex
@@ -299,83 +315,83 @@
-
- spec_adjust
- float
-
-
-
-
+
+ spec_adjust
+ float
+
+
+
+
-
-
- ambient_correction
- float
-
-
-
-
+
+
+ ambient_correction
+ float
+
+
+
+
-
-
- reflect_map
- float
-
-
-
-
+
+
+ reflect_map
+ float
+
+
+
+
-
-
- normalmap_dds
- float
-
-
-
-
+
+
+ normalmap_dds
+ float
+
+
+
+
-
- visibility
- float
-
-
-
-
-
- avisibility
- float
-
-
-
-
-
- hazeLayerAltitude
- float
-
-
-
-
-
- scattering
- float
-
-
-
-
-
- terminator
- float
-
-
-
-
-
- fogType
- int
-
-
-
-
-
-
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
diff --git a/Effects/skydome.eff b/Effects/skydome.eff
index 5bfcc713b..fb19e2698 100644
--- a/Effects/skydome.eff
+++ b/Effects/skydome.eff
@@ -1,64 +1,146 @@
-
-
- Effects/skydome
-
-
-
-
-
-
-
-
- /sim/rendering/shader-effects
- /sim/rendering/scattering-shader
-
-
- 2.0
-
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
-
-
-
-
- true
- smooth
- back
-
- Shaders/skydome.vert
- Shaders/skydome.frag
-
-
- mK
- float
-
-
-
- rK
- float
-
-
-
- density
- float
-
-
-
-
-
-
-
-
- false
- smooth
- back
-
-
-
-
+
+
+ Effects/skydome
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /sim/rendering/shaders/quality-level
+ /sim/rendering/shaders/skydome
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
+
+
+ true
+ smooth
+ back
+
+ Shaders/skydome.vert
+ Shaders/skydome.frag
+
+
+ mK
+ float
+
+
+
+
+
+ rK
+ float
+
+
+
+
+
+ density
+ float
+
+
+
+
+
+ overcast
+ float
+
+
+
+
+
+ saturation
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ visibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+
+
+
+
+
+ false
+ smooth
+ back
+
+
+
+
\ No newline at end of file
diff --git a/Effects/transition.eff b/Effects/transition.eff
index 62b2e075c..5cb283ddd 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -8,312 +8,380 @@ parameters :
texture[4] -> snow texture you want applied above snow-limit (I recommend using the corespondent winter texture for the base texture that you can find in terrain.winter)
transitions -> transitions number can be set to 1 or 2 (if set to 2 will allow for an intermediate step)
- inverse -> if this is se to 1 will keep the base texture on steep slopes and transition to the texture you want (useful to add some grass patches in rocky areas)
+ inverse -> if this is set to 1 will keep the base texture on steep slopes and transition to the texture you want (useful to add some grass patches in rocky areas)
-->
- Effects/transition
- Effects/terrain-default
-
-
- Textures.high/Terrain/transition1.dds
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
-
- Textures.high/Terrain/transition2.dds
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
-
- Textures.high/Terrain/snow3.dds
- linear-mipmap-linear
- repeat
- repeat
- normalized
-
+ Effects/transition
+ Effects/terrain-default
+
+
+ Textures.high/Terrain/transition1.dds
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Textures.high/Terrain/transition2.dds
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Textures.high/Terrain/snow3.dds
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 2.0
- 0.0
-
+ 2.0
+ 0.0
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- /sim/rendering/transition-shader
- /sim/rendering/shader-effects
-
-
- 2.0
-
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
-
-
+
+
+
+ /sim/rendering/shaders/transition
+ /sim/rendering/shaders/quality-level
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
-
- true
-
-
-
-
-
-
-
-
-
-
-
- ambient-and-diffuse
-
+
+
+
+
+
+
+
+
+
+
+ ambient-and-diffuse
+
-
-
-
+
+
+
-
-
-
+
+
+
- smooth
- back
+ smooth
+ back
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 3
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 4
- noise
-
+
+ 4
+ noise
+
-
- Shaders/transition.vert
- Shaders/transition.frag
-
+
+ Shaders/include_fog.vert
+ Shaders/transition.vert
+ Shaders/include_fog.frag
+ Shaders/transition.frag
+
-
- BaseTex
- sampler-2d
- 0
-
+
+ BaseTex
+ sampler-2d
+ 0
+
-
- SecondTex
- sampler-2d
- 1
-
+
+ SecondTex
+ sampler-2d
+ 1
+
-
- ThirdTex
- sampler-2d
- 2
-
+
+ ThirdTex
+ sampler-2d
+ 2
+
-
- SnowTex
- sampler-2d
- 3
-
+
+ SnowTex
+ sampler-2d
+ 3
+
-
- NoiseTex
- sampler-3d
- 4
-
+
+ NoiseTex
+ sampler-3d
+ 4
+
-
- RainNorm
- float
-
-
-
-
+
+ RainNorm
+ float
+
+
+
+
-
- SnowLevel
- float
-
-
-
-
+
+ SnowLevel
+ float
+
+
+
+
-
- Transitions
- float
-
-
-
-
+
+ Transitions
+ float
+
+
+
+
-
- InverseSlope
- float
-
-
-
-
+
+ InverseSlope
+ float
+
+
+
+
-
- CloudCover0
- float
-
-
-
-
+
+ CloudCover0
+ float
+
+
+
+
-
- CloudCover1
- float
-
-
-
-
+
+ CloudCover1
+ float
+
+
+
+
-
- CloudCover2
- float
-
-
-
-
+
+ CloudCover2
+ float
+
+
+
+
-
- CloudCover3
- float
-
-
-
-
+
+ CloudCover3
+ float
+
+
+
+
-
- CloudCover4
- float
-
-
-
-
-
-
+
+ CloudCover4
+ float
+
+
+
+
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
+
diff --git a/Effects/tree.eff b/Effects/tree.eff
index 9acc2a19a..e06c5e908 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -12,87 +12,205 @@
Note: no sorting needed! -->
- Effects/tree
-
-
-
-
-
-
-
- /sim/rendering/random-vegetation
-
- 1.0
-
-
-
-
-
- true
-
- 1.0 1.0 1.0 1.0
- 1.0 1.0 1.0 1.0
- off
-
-
- gequal
- 0.33
-
-
- 0
- 2d
-
- clamp
- clamp
-
-
- Shaders/tree.vert
- Shaders/tree.frag
-
-
- baseTexture
- sampler-2d
- 0
-
-
-
- true
-
- 1.0 1.0 1.0 1.0
- 1.0 1.0 1.0 1.0
- off
-
-
- 2
- RenderBin
-
-
- less
- 0.33
-
-
- src-alpha
- one-minus-src-alpha
-
-
- false
-
-
- 0
- 2d
-
- clamp
- clamp
-
-
- Shaders/tree.vert
- Shaders/tree.frag
-
-
- baseTexture
- sampler-2d
- 0
-
-
-
+ Effects/tree
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ /sim/rendering/random-vegetation
+
+ 1.0
+
+
+
+
+
+ true
+
+ 1.0 1.0 1.0 1.0
+ 1.0 1.0 1.0 1.0
+ off
+
+
+ gequal
+ 0.33
+
+
+ 0
+ 2d
+
+
+
+ clamp
+ clamp
+
+
+
+ Shaders/tree.vert
+ Shaders/include_fog.frag
+ Shaders/tree.frag
+
+
+ baseTexture
+ sampler-2d
+ 0
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
+
+ true
+
+ 1.0 1.0 1.0 1.0
+ 1.0 1.0 1.0 1.0
+ off
+
+
+ 2
+
+ RenderBin
+
+
+ less
+ 0.33
+
+
+ src-alpha
+ one-minus-src-alpha
+
+
+ false
+
+
+ 0
+ 2d
+
+
+
+ clamp
+ clamp
+
+
+ Shaders/include_fog.vert
+ Shaders/tree.vert
+ Shaders/include_fog.frag
+ Shaders/tree.frag
+
+
+ baseTexture
+ sampler-2d
+ 0
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
+
diff --git a/Effects/water.eff b/Effects/water.eff
index 4a6b3d289..64b0628f0 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -13,8 +13,8 @@
+
Textures/Water/waves-ver10-nm.dds
-
linear-mipmap-linear
repeat
repeat
@@ -23,8 +23,9 @@
- Textures/Water/waves-ver10-dudv.dds
+
+ Textures/Water/water_sine_nmap.dds
linear-mipmap-linear
repeat
repeat
@@ -46,6 +47,7 @@
Textures/Water/perlin-noise-nm.dds
+
linear-mipmap-linear
repeat
repeat
@@ -60,44 +62,80 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- /sim/rendering/water-shader
- /sim/rendering/shader-effects
+ /sim/rendering/shaders/water
- 2.0
- /sim/rendering/quality-level
+ 4.0
+ /sim/rendering/shaders/water
@@ -251,9 +289,15 @@
+
+ 9
+ noise
+
+ Shaders/include_fog.vert
Shaders/water.vert
- Shaders/water.frag
+ Shaders/include_fog.frag
+ Shaders/water_sine.frag
water_reflection
@@ -295,35 +339,35 @@
CloudCover0
float
-
+
CloudCover1
float
-
+
CloudCover2
float
-
+
CloudCover3
float
-
+
CloudCover4
float
-
+
@@ -362,13 +406,109 @@
+
+ WaveFreq
+ float
+
+
+
+
+
+ WaveAmp
+ float
+
+
+
+
+
+ WaveSharp
+ float
+
+
+
+
+
+ WaveAngle
+ float
+
+
+
+
+
+ WaveFactor
+ float
+
+
+
+
+
+ WaveDAngle
+ float
+
+
+
+
+
+
+ Noise
+ sampler-3d
+ 9
+
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
- /sim/rendering/water-shader
- /sim/rendering/shader-effects
+ /sim/rendering/shaders/water
+
+ 2.0
+ /sim/rendering/shaders/water
+
2.0
@@ -415,17 +555,323 @@
0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 9
noise
- Shaders/water-orig.vert
- Shaders/water-orig.frag
+ Shaders/include_fog.vert
+ Shaders/water.vert
+ Shaders/include_fog.frag
+ Shaders/water.frag
- texture
- sampler-3d
+ water_reflection
+ sampler-2d
0
+
+ water_normalmap
+ sampler-2d
+ 2
+
+
+ water_dudvmap
+ sampler-2d
+ 3
+
+
+ water_reflection_grey
+ sampler-2d
+ 4
+
+
+ sea_foam
+ sampler-2d
+ 5
+
+
+ perlin_normalmap
+ sampler-2d
+ 6
+
+
+ saturation
+ float
+
+
+
+
+
+
+ CloudCover0
+ float
+
+
+
+
+
+ CloudCover1
+ float
+
+
+
+
+
+ CloudCover2
+ float
+
+
+
+
+
+ CloudCover3
+ float
+
+
+
+
+
+ CloudCover4
+ float
+
+
+
+
+
+ Status
+ int
+
+
+
+
+
+
+ Overcast
+ float
+
+
+
+
+
+ WindE
+ float
+
+
+
+
+
+ WindN
+ float
+
+
+
+
+
+ WindFrom
+ float
+
+
+
+
+
+ WaveFreq
+ float
+
+
+
+
+
+ WaveAmp
+ float
+
+
+
+
+
+ WaveSharp
+ float
+
+
+
+
+
+ WaveAngle
+ float
+
+
+
+
+
+ WaveFactor
+ float
+
+
+
+
+
+ WaveDAngle
+ float
+
+
+
+
+
+
+ Noise
+ sampler-3d
+ 9
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+