diff --git a/Aircraft/Generic/Effects/ReflectMaps/null_reflectdirt.png b/Aircraft/Generic/Effects/ReflectMaps/null_reflectdirt.png
new file mode 100644
index 000000000..fcbf0b011
Binary files /dev/null and b/Aircraft/Generic/Effects/ReflectMaps/null_reflectdirt.png differ
diff --git a/Aircraft/Generic/Effects/null_bumpspec.png b/Aircraft/Generic/Effects/null_bumpspec.png
index 8d65741bf..1a4650a8c 100644
Binary files a/Aircraft/Generic/Effects/null_bumpspec.png and b/Aircraft/Generic/Effects/null_bumpspec.png differ
diff --git a/Docs/model-combined.eff/model-combined-bump.eff b/Docs/model-combined.eff/model-combined-bump.eff
index 65f199955..af989740e 100644
--- a/Docs/model-combined.eff/model-combined-bump.eff
+++ b/Docs/model-combined.eff/model-combined-bump.eff
@@ -77,7 +77,7 @@
7
-
+
@@ -91,6 +91,21 @@
+
+
+
+
+
+ tangent
+ 6
+
+
+ binormal
+ 7
+
+
+
+
diff --git a/Effects/model-combined-deferred.eff b/Effects/model-combined-deferred.eff
new file mode 100644
index 000000000..db206c140
--- /dev/null
+++ b/Effects/model-combined-deferred.eff
@@ -0,0 +1,58 @@
+
+
+
+ Effects/model-combined-deferred
+ Effects/model-combined
+
+
+
+
+ /sim/rendering/rembrandt
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+ GL_EXT_gpu_shader4
+ GL_ARB_texture_rg
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ambient-and-diffuse
+
+
+ Shaders/deferred-gbuffer.vert
+ Shaders/deferred-gbuffer.frag
+
+
+
+
\ No newline at end of file
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index efa3be3c6..ebfe63221 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -148,24 +148,27 @@ please see Docs/README.model-combined.eff for documentation
7
-->
-
-
-
- /sim/rendering/shaders/model
-
-
- 2.0
-
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
-
-
+
+
+
+
+ /sim/rendering/rembrandt
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+ GL_EXT_gpu_shader4
+ GL_ARB_texture_rg
+
+
true
@@ -368,8 +371,8 @@ please see Docs/README.model-combined.eff for documentation
Shaders/ubershader.vert
- Shaders/include_fog.frag
- Shaders/ubershader.frag
+ Shaders/include_fog.frag
+ Shaders/ubershader.frag
@@ -750,7 +751,616 @@ please see Docs/README.model-combined.eff for documentation
-
+
+
+
+
+
+
+ /sim/rendering/shaders/model
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1
+ noise
+
+
+
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Shaders/ubershader.vert
+ Shaders/include_fog.frag
+ Shaders/ubershader.frag
+
+
+
+
+ BaseTex
+ sampler-2d
+ 0
+
+
+
+ ReflNoiseTex
+ sampler-3d
+ 1
+
+
+
+ NormalTex
+ sampler-2d
+ 2
+
+
+
+ LightMapTex
+ sampler-2d
+ 3
+
+
+
+ ReflMapTex
+ sampler-2d
+ 4
+
+
+
+ Environment
+ sampler-cube
+ 5
+
+
+
+ ReflFresnelTex
+ sampler-2d
+ 6
+
+
+
+ ReflRainbowTex
+ sampler-2d
+ 7
+
+
+
+
+
+
+
+ nmap_enabled
+ int
+
+
+
+
+
+
+
+ nmap_dds
+ int
+
+
+
+
+
+
+ nmap_tile
+ int
+
+
+
+
+
+
+
+
+ lightmap_enabled
+ int
+
+
+
+
+
+
+ lightmap_multi
+ int
+
+
+
+
+
+
+ lightmap_r_factor
+ float
+
+
+
+
+
+
+ lightmap_r_color
+ float-vec3
+
+
+
+
+
+
+ lightmap_g_factor
+ float
+
+
+
+
+
+
+ lightmap_g_color
+ float-vec3
+
+
+
+
+
+
+ lightmap_b_factor
+ float
+
+
+
+
+
+
+ lightmap_b_color
+ float-vec3
+
+
+
+
+
+
+ lightmap_a_factor
+ float
+
+
+
+
+
+
+ lightmap_a_color
+ float-vec3
+
+
+
+
+
+
+
+ refl_enabled
+ int
+
+
+
+
+
+
+ refl_correction
+ float
+
+
+
+
+
+
+
+ refl_map
+ int
+
+
+
+
+
+
+ refl_dynamic
+ int
+
+
+
+
+
+
+
+ refl_rainbow
+ float
+
+
+
+
+
+
+
+ refl_fresnel
+ float
+
+
+
+
+
+
+
+ refl_noise
+ float
+
+
+
+
+
+
+
+ dirt_enabled
+ int
+
+
+
+
+
+
+ dirt_multi
+ int
+
+
+
+
+
+
+ dirt_r_color
+ float-vec3
+
+
+
+
+
+
+ dirt_r_factor
+ float
+
+
+
+
+
+
+ dirt_g_color
+ float-vec3
+
+
+
+
+
+
+ dirt_g_factor
+ float
+
+
+
+
+
+
+ dirt_b_color
+ float-vec3
+
+
+
+
+
+
+ dirt_b_factor
+ float
+
+
+
+
+
+
+
+ amb_correction
+ float
+
+
+
+
+
+
+ shader_qual
+ int
+
+
+
+
+
+
+ hdg
+ float
+
+
+
+
+
+
+ pitch
+ float
+
+
+
+
+
+
+ roll
+ float
+
+
+
+
+
+
+
+ visibility
+ float
+
+
+
+
+
+ avisibility
+ float
+
+
+
+
+
+ hazeLayerAltitude
+ float
+
+
+
+
+
+ scattering
+ float
+
+
+
+
+
+ terminator
+ float
+
+
+
+
+
+ fogType
+ int
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index dea9819fc..2439562f4 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -34,7 +34,7 @@
-
+
/sim/rendering/shaders/skydome
diff --git a/Textures/Water/water-reflection-grey.png b/Textures/Water/water-reflection-grey.png
index 3f680c05d..28218f9a9 100644
Binary files a/Textures/Water/water-reflection-grey.png and b/Textures/Water/water-reflection-grey.png differ
diff --git a/Textures/Water/water-reflection-inland.png b/Textures/Water/water-reflection-inland.png
index b2b5da678..5578c167a 100644
Binary files a/Textures/Water/water-reflection-inland.png and b/Textures/Water/water-reflection-inland.png differ
diff --git a/Textures/Water/water-reflection.png b/Textures/Water/water-reflection.png
index 719668aa7..1dbfa27e7 100644
Binary files a/Textures/Water/water-reflection.png and b/Textures/Water/water-reflection.png differ