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 @@ /sim/rendering/landmass-shader /sim/rendering/shader-effects - 4.0 + 4.5 /sim/rendering/quality-level 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); diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml index f15fa4931..fd896f971 100644 --- a/gui/dialogs/weather.xml +++ b/gui/dialogs/weather.xml @@ -1517,6 +1517,16 @@ 1 > + + dialog-apply + metar + + + nasal + + @@ -1574,7 +1584,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 { @@ -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 ); @@ -1652,6 +1662,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" ); },