From 6c971211b8bcb90ac3a858249c71dd327fb549a9 Mon Sep 17 00:00:00 2001
From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Mon, 12 Dec 2011 17:04:36 +0100
Subject: [PATCH] Quality slider overwrites custom shader settings. All effects
 now listen to the new sim/rendering/shaders/<foo> properties.

---
 Effects/bowwave.eff           |  6 ++---
 Effects/bumpspec.eff          |  2 +-
 Effects/flutter.eff           |  8 ++-----
 Effects/landmass.eff          |  8 +++----
 Effects/lightmap.eff          |  4 ++--
 Effects/model-combined.eff    |  3 +--
 Effects/model-default.eff     |  4 ++--
 Effects/rain-layer.eff        |  2 +-
 Effects/reflect-bump-spec.eff |  4 ++--
 Effects/reflect.eff           |  2 +-
 Effects/runway.eff            |  4 ++--
 Effects/skydome.eff           |  1 -
 Effects/terrain-default.eff   |  4 ++--
 Effects/test.eff              |  2 +-
 Effects/transition.eff        |  3 +--
 Effects/tree.eff              |  3 +--
 Effects/urban.eff             |  6 ++---
 Effects/water-inland.eff      | 10 ++++-----
 Effects/water.eff             |  2 +-
 gui/dialogs/rendering.xml     | 42 ++++++++++++++++++++++++++++++-----
 gui/dialogs/shaders.xml       | 38 ++++++++++++++++++++++++++-----
 preferences.xml               |  5 +++--
 22 files changed, 104 insertions(+), 59 deletions(-)

diff --git a/Effects/bowwave.eff b/Effects/bowwave.eff
index f97084b11..ecd7db865 100644
--- a/Effects/bowwave.eff
+++ b/Effects/bowwave.eff
@@ -109,7 +109,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 	</parameters>
@@ -117,10 +117,9 @@
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/water</property>
-				<!--<property>/sim/rendering/shader-effects</property>-->
 				<less-equal>
 					<value type="float">2.0</value>
-					<float-property>/sim/rendering/shaders/quality-level</float-property>
+					<float-property>/sim/rendering/shaders/water</float-property>
 				</less-equal>
 				<or>
 					<less-equal>
@@ -492,7 +491,6 @@
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/water</property>
-				<property>/sim/rendering/shaders/quality-level</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/bumpspec.eff b/Effects/bumpspec.eff
index a74aeb326..032f5e816 100644
--- a/Effects/bumpspec.eff
+++ b/Effects/bumpspec.eff
@@ -37,7 +37,7 @@ in Aircraft/A320/Models/Effects/a320_bumpspec.eff ( or whatever, private to the
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/model</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/flutter.eff b/Effects/flutter.eff
index 8a4c6574c..138d8ba4e 100644
--- a/Effects/flutter.eff
+++ b/Effects/flutter.eff
@@ -41,7 +41,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 
@@ -49,11 +49,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
-				<!--<property>/sim/rendering/shader-effects</property>-->
-				<less-equal>
-					<value type="float">3.0</value>
-					<float-property>/sim/rendering/shaders/quality-level</float-property>
-				</less-equal>
+				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index 0e62aff13..4170f36fc 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -16,7 +16,7 @@
 		<depth-factor type="float">0.01</depth-factor>
 		<canopy-height type="float">15.0</canopy-height>
 		<quality-level>
-			<use>/sim/rendering/shaders/quality-level</use>
+			<use>/sim/rendering/shaders/landmass</use>
 		</quality-level>
 	</parameters>
 
@@ -37,7 +37,7 @@
 		<use>/environment/terminator-relative-position-m</use>
 	</terminator>
 	<fogtype>
-		<use>/sim/rendering/scattering-shader</use>
+		<use>/sim/rendering/shaders/skydome</use>
 	</fogtype>
 	<!-- 	END fog include -->
 
@@ -50,8 +50,8 @@
 			<and>
 				<property>/sim/rendering/shaders/landmass</property>
 				<less-equal>
-					<value type="float">4.5</value>
-					<float-property>/sim/rendering/shaders/quality-level</float-property>
+					<value type="float">4.0</value>
+					<float-property>/sim/rendering/shaders/landmass</float-property>
 				</less-equal>
 				<or>
 					<less-equal>
diff --git a/Effects/lightmap.eff b/Effects/lightmap.eff
index 43e510c91..1e2535394 100644
--- a/Effects/lightmap.eff
+++ b/Effects/lightmap.eff
@@ -9,13 +9,13 @@
     <material>
       <color-mode-uniform>1</color-mode-uniform> <!-- DIFFUSE -->
     </material>
-    <condition><use>/sim/rendering/shader-effects</use></condition>
+    <condition><use>/sim/rendering/shader/generic</use></condition>
     <factor>1</factor>
   </parameters>
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/shaders/generic</property>
         <or>
           <less-equal>
             <value type="float">2.0</value>
diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff
index a18654d0b..b32c33525 100644
--- a/Effects/model-combined.eff
+++ b/Effects/model-combined.eff
@@ -133,7 +133,7 @@ please see Docs/README.model-combined.eff for documentation
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 <!-- 		END fog include -->
 	</parameters>
@@ -147,7 +147,6 @@ please see Docs/README.model-combined.eff for documentation
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/model</property>
-				<property>/sim/rendering/shaders/quality-level</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/model-default.eff b/Effects/model-default.eff
index cfde14342..33db40101 100644
--- a/Effects/model-default.eff
+++ b/Effects/model-default.eff
@@ -28,14 +28,14 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 		END fog include -->
 	</parameters>
 	<technique n="10">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/rain-layer.eff b/Effects/rain-layer.eff
index c524e4ebc..f0296c360 100644
--- a/Effects/rain-layer.eff
+++ b/Effects/rain-layer.eff
@@ -8,7 +8,7 @@
   <technique n="10">
     <predicate>
       <and>
-        <property>/sim/rendering/shader-effects</property>
+        <property>/sim/rendering/clouds3d-enable</property>
         <less-equal>
           <value type="float">1.0</value>
           <shader-language/>
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
index e062b0f12..706a20730 100644
--- a/Effects/reflect-bump-spec.eff
+++ b/Effects/reflect-bump-spec.eff
@@ -123,7 +123,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 	</parameters>
 
@@ -135,7 +135,7 @@ EXAMPLES: You can find examples of both usages in the Hunter and Lightning model
 	<technique n="9">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/model</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/reflect.eff b/Effects/reflect.eff
index 7b0104774..819cc3ebe 100644
--- a/Effects/reflect.eff
+++ b/Effects/reflect.eff
@@ -114,7 +114,7 @@
 
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/model</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/runway.eff b/Effects/runway.eff
index d2ce52e57..8433eb4ab 100644
--- a/Effects/runway.eff
+++ b/Effects/runway.eff
@@ -78,7 +78,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 		END fog include -->
 	</parameters>
@@ -89,7 +89,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/generic</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/skydome.eff b/Effects/skydome.eff
index fb19e2698..849af3f32 100644
--- a/Effects/skydome.eff
+++ b/Effects/skydome.eff
@@ -36,7 +36,6 @@
 	<technique n="8">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shaders/quality-level</property>
 				<property>/sim/rendering/shaders/skydome</property>
 				<or>
 					<less-equal>
diff --git a/Effects/terrain-default.eff b/Effects/terrain-default.eff
index 3a0f5e909..223c6e7b0 100644
--- a/Effects/terrain-default.eff
+++ b/Effects/terrain-default.eff
@@ -51,7 +51,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 	</parameters>
 	<!-- put techniques at a "high" index to allow derived effects to
@@ -59,7 +59,7 @@
 	<technique n="10">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/generic</property>
 
 				<or>
 					<less-equal>
diff --git a/Effects/test.eff b/Effects/test.eff
index b6d87eeb3..e153a2445 100644
--- a/Effects/test.eff
+++ b/Effects/test.eff
@@ -8,7 +8,7 @@
 	<technique n="10">
 		<predicate>
 			<and>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/generic</property>
 				<less-equal>
 					<value type="float">1.0</value>
 					<shader-language/>
diff --git a/Effects/transition.eff b/Effects/transition.eff
index 6cee5ae55..5ee37bfee 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -80,7 +80,7 @@ parameters :
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 	</parameters>
@@ -94,7 +94,6 @@ parameters :
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/transition</property>
-				<property>/sim/rendering/shaders/quality-level</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/tree.eff b/Effects/tree.eff
index e06c5e908..4307175ea 100644
--- a/Effects/tree.eff
+++ b/Effects/tree.eff
@@ -33,14 +33,13 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 	</parameters>
 	<technique n="10">
 		<predicate>
 			<and>
-				<!--<property>/sim/rendering/shader-effects</property>-->
 				<property>/sim/rendering/random-vegetation</property>
 				<less-equal>
 					<value type="float">1.0</value>
diff --git a/Effects/urban.eff b/Effects/urban.eff
index 1a0123d5d..611178d41 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -29,7 +29,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 
@@ -43,7 +43,6 @@
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/urban</property>
-				<property>/sim/rendering/shaders/quality-level</property>
 				<less-equal>
 					<value type="float">4.0</value>
 					<float-property>/sim/rendering/shaders/urban</float-property>
@@ -288,10 +287,9 @@
 		<predicate>
 			<and>
 				<property>/sim/rendering/shaders/urban</property>
-				<!--<property>/sim/rendering/shader-effects</property>-->
 				<less-equal>
 					<value type="float">2.0</value>
-					<float-property>/sim/rendering/shaders/quality-level</float-property>
+					<float-property>/sim/rendering/shaders/urban</float-property>
 				</less-equal>
 				<or>
 					<less-equal>
diff --git a/Effects/water-inland.eff b/Effects/water-inland.eff
index 999c90dca..57f266baa 100644
--- a/Effects/water-inland.eff
+++ b/Effects/water-inland.eff
@@ -66,18 +66,17 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 	</parameters>
 	<technique n="8">
 		<predicate>
 			<and>
-				<property>/sim/rendering/water-shader</property>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/water</property>
 				<less-equal>
 					<value type="float">2.0</value>
-					<float-property>/sim/rendering/quality-level</float-property>
+					<float-property>/sim/rendering/shaders/water</float-property>
 				</less-equal>
 				<or>
 					<less-equal>
@@ -310,8 +309,7 @@
 	<technique n="9">
 		<predicate>
 			<and>
-				<property>/sim/rendering/water-shader</property>
-				<property>/sim/rendering/shader-effects</property>
+				<property>/sim/rendering/shaders/water</property>
 				<or>
 					<less-equal>
 						<value type="float">2.0</value>
diff --git a/Effects/water.eff b/Effects/water.eff
index 64b0628f0..d58e282e9 100644
--- a/Effects/water.eff
+++ b/Effects/water.eff
@@ -125,7 +125,7 @@
 			<use>/environment/terminator-relative-position-m</use>
 		</terminator>
 		<fogtype>
-			<use>/sim/rendering/scattering-shader</use>
+			<use>/sim/rendering/shaders/skydome</use>
 		</fogtype>
 		<!-- 	END fog include -->
 	</parameters>
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 461992151..c524c8edc 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -171,7 +171,7 @@
 
 			<checkbox>
 				<halign>left</halign>
-				<label>Random objects (triggers scenery reload)</label>
+				<label>Random objects</label>
 				<name>random-objects</name>
 				<property>/sim/rendering/random-objects</property>
 				<binding>
@@ -341,7 +341,22 @@
 					<stretch>true</stretch>
 				</hrule>
 			</group>
-
+			
+			<group>
+				<layout>vbox</layout>
+				<padding>4</padding>
+				<text>
+					<padding>0</padding>
+					<label>This slider overrides custom settings as set in</label>
+					<halign>left</halign>
+				</text>
+				<text>
+					<padding>0</padding>
+					<label>the (advanced) Shader Options dialog.</label>
+					<halign>left</halign>
+				</text>
+			</group>
+			
 			<group>
 				<layout>hbox</layout>
 
@@ -375,9 +390,6 @@
 				<layout>hbox</layout>
 				<button>
 					<legend>Shader Options</legend>
-					<enable>
-						<property>/sim/rendering/shaders/quality-level</property>
-					</enable>
 					<binding>
 						<command>dialog-show</command>
 						<dialog-name>shaders</dialog-name>
@@ -399,7 +411,6 @@
 							<green>0.6</green>
 							<blue>0.6</blue>
 						</color>
-
 					</text>
 					<text>
 						<visible>
@@ -604,6 +615,25 @@
 	<nasal>
 		<open>
 			gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets"));
+			
+			# overwrite custom shader settings on quality-slider input
+			_setlistener("/sim/rendering/shaders/quality-level", func {
+				var qualityLevel = getprop("/sim/rendering/shaders/quality-level");
+				setprop("/sim/rendering/shaders/landmass",qualityLevel);
+				setprop("/sim/rendering/shaders/urban",qualityLevel);
+				setprop("/sim/rendering/shaders/water",qualityLevel);
+				if (qualityLevel >= 1.0){
+					qualityLevel = 1.0;
+				}
+				else {
+					qualityLevel = 0.0;
+				}
+				setprop("/sim/rendering/shaders/contrails",qualityLevel);
+				setprop("/sim/rendering/shaders/crop",qualityLevel);
+				setprop("/sim/rendering/shaders/generic",qualityLevel);
+				setprop("/sim/rendering/shaders/model",qualityLevel);
+				setprop("/sim/rendering/shaders/transition",qualityLevel);
+			});
 		</open>
 	</nasal>
 </PropertyList>
diff --git a/gui/dialogs/shaders.xml b/gui/dialogs/shaders.xml
index 75a4c462f..60910fecb 100644
--- a/gui/dialogs/shaders.xml
+++ b/gui/dialogs/shaders.xml
@@ -52,6 +52,14 @@
 			<layout>vbox</layout>
 			<halign>left</halign>
 
+			<text>
+				<halign>left</halign>
+				<label>Generic</label>
+				<enable>
+					<property>/sim/rendering/shaders/generic</property>
+				</enable>
+			</text>
+			
 			<text>
 				<halign>left</halign>
 				<label>Crop</label>
@@ -108,18 +116,32 @@
 				</enable>
 			</text>
 
-
 		</group>
 
 		<group>
 			<layout>vbox</layout>
 
+			<slider>
+				<name>generic</name>
+				<min>0.0</min>
+				<max>1.0</max>
+				<step>1.0</step>
+				<fraction>0.5</fraction>
+				<live>true</live>
+				<property>/sim/rendering/shaders/generic</property>
+				<binding>
+					<command>dialog-apply</command>
+					<object-name>generic</object-name>
+				</binding>
+			</slider>
+			
 			<slider>
 				<name>crop</name>
 				<min>0.0</min>
 				<max>1.0</max>
 				<step>1.0</step>
 				<fraction>0.5</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/crop</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -130,9 +152,10 @@
 			<slider>
 				<name>landmass</name>
 				<min>0.0</min>
-				<max>1.0</max>
+				<max>5.0</max>
 				<step>1.0</step>
-				<fraction>0.5</fraction>
+				<fraction>0.17</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/landmass</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -146,6 +169,7 @@
 				<max>1.0</max>
 				<step>1.0</step>
 				<fraction>0.5</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/contrails</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -159,6 +183,7 @@
 				<max>1.0</max>
 				<step>1.0</step>
 				<fraction>0.5</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/transition</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -169,9 +194,10 @@
 			<slider>
 				<name>model</name>
 				<min>0.0</min>
-				<max>1.0</max>
+				<max>3.0</max>
 				<step>1.0</step>
-				<fraction>0.5</fraction>
+				<fraction>0.25</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/model</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -185,6 +211,7 @@
 				<max>5.0</max>
 				<step>1.0</step>
 				<fraction>0.17</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/urban</property>
 				<binding>
 					<command>dialog-apply</command>
@@ -198,6 +225,7 @@
 				<max>5.0</max>
 				<step>1.0</step>
 				<fraction>0.17</fraction>
+				<live>true</live>
 				<property>/sim/rendering/shaders/water</property>
 				<binding>
 					<command>dialog-apply</command>
diff --git a/preferences.xml b/preferences.xml
index ffb68620e..67c557594 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -68,10 +68,11 @@ Started September 2000 by David Megginson, david@megginson.com
 			<realism type="int">5</realism>
 			<filtering type="int">8</filtering>
 			<shaders>
-				<model type="float" userarchive="y">1.0</model>
-				<crop type="float" userarchive="y">1.0</crop>
+				<generic type="float" userarchive="y">1.0</generic>
 				<landmass type="float" userarchive="y">1.0</landmass>
+				<model type="float" userarchive="y">1.0</model>
 				<contrails type="float" userarchive="y">1.0</contrails>
+				<crop type="float" userarchive="y">1.0</crop>
 				<skydome type="bool" userarchive="y">false</skydome>
 				<transition type="float" userarchive="y">1.0</transition>
 				<urban type="float" userarchive="y">1.0</urban>