From 426b7f8ae3c493a7a737c7d160c61fb0fe413337 Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sat, 20 Nov 2010 21:21:05 +0100
Subject: [PATCH 1/4] reflect-bump-spec shader improvement by i4dnf

---
 Shaders/reflect-bump-spec.frag | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Shaders/reflect-bump-spec.frag b/Shaders/reflect-bump-spec.frag
index fcc6d3850..859d21e40 100644
--- a/Shaders/reflect-bump-spec.frag
+++ b/Shaders/reflect-bump-spec.frag
@@ -92,9 +92,8 @@ void main (void)
         //float pam = (map.a * -2) + 1; //reverse map
         reflFactor = map.a + transparency_offset;
     } else {
-        // set the reflectivity proportional to shininess with user 
-        // input 
-        reflFactor = (gl_FrontMaterial.shininess / 128) + transparency_offset;
+        // set the reflectivity proportional to shininess with user input 
+        reflFactor = (gl_FrontMaterial.shininess / 128) * ns.a + transparency_offset;
     }
 
     reflFactor = clamp(reflFactor, 0.0, 1.0);

From 52205b6ee48aa0568c55d43872fb358f54e6b3b2 Mon Sep 17 00:00:00 2001
From: Frederic Bouvier <fredfgfs01@free.fr>
Date: Sat, 20 Nov 2010 21:39:05 +0100
Subject: [PATCH 2/4] Increase quality threshold of geometry landmass

---
 Effects/landmass.eff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Effects/landmass.eff b/Effects/landmass.eff
index e2c82b644..89f20e8be 100644
--- a/Effects/landmass.eff
+++ b/Effects/landmass.eff
@@ -25,7 +25,7 @@
         <property>/sim/rendering/landmass-shader</property>
         <property>/sim/rendering/shader-effects</property>
 	<less-equal>
-	  <value type="float">4.0</value>
+	  <value type="float">4.5</value>
 	  <float-property>/sim/rendering/quality-level</float-property>
 	</less-equal>
         <or>

From 1751fdb22ec608ab15f00ba12c9461cc97976720 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Sun, 21 Nov 2010 20:27:05 +0100
Subject: [PATCH 3/4] GlobalWeather: display changing METAR

---
 gui/dialogs/weather.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index f15fa4931..dd713a71c 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1574,7 +1574,7 @@
           }
 
           me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
-          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 0 );
+          me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 1 );
         },
 
         close : func {
@@ -1652,6 +1652,7 @@
           var metar = getprop("environment/metar/data");
           if( metar == nil or metar == "" ) metar = "NIL";
           metar = normalize_string(metar);
+          printlog( "info", "new METAR: " ~ metar );
           setprop( me.base ~ "/metar", metar );
           gui.dialog_update( "weather", "metar" );
         },

From 10ed64e3ee4d2b290d5e445993cbf95bb862fef1 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Sun, 21 Nov 2010 21:20:17 +0100
Subject: [PATCH 4/4] GlobalWeather bugfix: enable editing of METAR

Initialize the METAR textbox to the current METAR on selection
of "Manual input" to have some data to start with. Apply the
data when the METAR textbox looses focus.
---
 gui/dialogs/weather.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index dd713a71c..fd896f971 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1517,6 +1517,16 @@
           <value type="int">1</value>
         </greater-than>>
       </enable>
+      <binding>
+        <command>dialog-apply</command>
+        <object-name>metar</object-name>
+      </binding>
+      <binding>
+        <command>nasal</command>
+        <script>
+          setprop( "/environment/metar/data", getprop( "sim/gui/dialogs/weather-scenario/metar") );
+        </script>
+      </binding>
     </textbox>
 
     <!-- Automatic Weather -->
@@ -1584,7 +1594,7 @@
 
         stateChange : func {
           var scenarioName = getprop( me.base ~ "/source-selection");
-          var metar = nil;
+          var metar = getprop( "environment/metar/data" );
           if( scenarioName == "Disabled" ) {
             setprop( "/environment/params/metar-updates-environment", 0 );
             setprop( "/environment/realwx/enabled", 0 );