From 4c7527915272d05445280cd45137ffafb770edd3 Mon Sep 17 00:00:00 2001 From: Martin Spott Date: Mon, 24 Jan 2011 17:56:29 +0100 Subject: [PATCH 1/6] Add more placeholders for differentiated land cover types. Requires someone to create the corresponding textures to make the best use of upcoming CORINE and custom land cover. Refers to this list: http://wiki.osgeo.org/wiki/LandcoverDB_CS_Detail --- materials.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/materials.xml b/materials.xml index 4d77b60aa..321135430 100644 --- a/materials.xml +++ b/materials.xml @@ -748,6 +748,7 @@ Shared parameters for various materials. DeciduousBroadCover DeciduousForest Bog + Heath Terrain/deciduous1.png Terrain/deciduous2.png Terrain/deciduous4.png @@ -869,6 +870,7 @@ Shared parameters for various materials. ShrubCover ShrubGrassCover ScrubCover + Sclerophyllous Terrain/shrub1.png + + + T.Flight Hotas X + Hotas X + Thrustmaster Hotas X + Thrustmaster T.Flight Hotas X + + + + + + + Joystick: Aileron + + property-scale + /controls/flight/aileron + 1.0 + 1.0 + + + + + Joystick: Elevator + + property-scale + /controls/flight/elevator + -1.0 + 1.0 + + + + + Throttle + + nasal + + + + + + Rudder + + property-scale + /controls/flight/rudder + 1.0 + + + + + + Throttle rocker switch: View Left/Right + 0.05 + + property-scale + /sim/current-view/heading-offset-deg + -180 + 1.2 + + + + + + Hat Switch: View Direction (use mod buttons for different effects) + + true + + property-adjust + /sim/current-view/goal-heading-offset-deg + 5.0 + + + + true + + property-adjust + /sim/current-view/goal-heading-offset-deg + -5.0 + + + + + + Hat Switch: View Elevation (use mod buttons for different effects) + + true + + property-adjust + /sim/current-view/goal-pitch-offset-deg + 5.0 + + + + true + + property-adjust + /sim/current-view/goal-pitch-offset-deg + -5.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gui/dialogs/route-manager.xml b/gui/dialogs/route-manager.xml index ed72e6310..90904b350 100644 --- a/gui/dialogs/route-manager.xml +++ b/gui/dialogs/route-manager.xml @@ -138,7 +138,6 @@ command interface /autopilot/route-manager/input: dest.getNode("runway").clearValue(); } - print("updated runways"); gui.dialog_update("route-manager"); } From bcfc08fe561355b128561130a2494a4c9b044e22 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Mon, 24 Jan 2011 19:59:09 +0100 Subject: [PATCH 4/6] Environment: smoothing light and moderate turbulence a bit --- Environment/environment.xml | 414 +++++++++++++++++++---------------- Environment/interpolator.xml | 34 ++- 2 files changed, 248 insertions(+), 200 deletions(-) diff --git a/Environment/environment.xml b/Environment/environment.xml index 2d773f391..25f43c064 100644 --- a/Environment/environment.xml +++ b/Environment/environment.xml @@ -1,4 +1,4 @@ - + - + - Disabled - METAR weather generation is disabled. Use the above controls to setup your weather. + Disabled + METAR weather generation is disabled. Use the above controls to setup your weather. - Live data - Fetch live weather data for your nearest airport from noaa.gov. You need a working internet connection. - All the controls in this dialog are computed automatically, once a valid METAR is received. + Live data + + Fetch live weather data for your nearest airport from noaa.gov. You need a working internet connection. + All the controls in this dialog are computed automatically, once a valid METAR is received. - Manual input - Enter your favorite METAR weather in the textbox below. A valid METAR syntax is required. + Manual input + Enter your favorite METAR weather in the textbox below. A valid METAR syntax is required. - Fair weather - XXXX 012345Z 15003KT 12SM SCT041 FEW200 20/08 Q1015 NOSIG - A lovely day for trip to your favorite 100$ hamburger airfield + Fair weather + XXXX 012345Z 15003KT 12SM SCT041 FEW200 20/08 Q1015 NOSIG + A lovely day for trip to your favorite 100$ hamburger airfield - Thunderstorm - XXXX 012345Z 15012G25KT 4000 TSRA FEW030CB SCT035TCU 27/24 Q0995 - A hot and damp summer day with thunderstorms developing in the afternoon. - Be prepared for reduction of visibility in showers and strong gusts - near thunderstorms + Thunderstorm + XXXX 012345Z 15012G25KT 4000 TSRA FEW030CB SCT035TCU 27/24 Q0995 + + A hot and damp summer day with thunderstorms developing in the afternoon. + Be prepared for reduction of visibility in showers and strong gusts + near thunderstorms + - Stormy Monday - XXXX 012345Z 28035G50KT 250V300 9999 TSRA SCT022CB BKN030 13/09 Q1005 - You're out for an adventure? Gusty winds blowing from the west - and isolated thunderstorms should be avoided. Fasten your seatbelt! + Stormy Monday + XXXX 012345Z 28035G50KT 250V300 9999 TSRA SCT022CB BKN030 13/09 Q1005 + + You're out for an adventure? Gusty winds blowing from the west + and isolated thunderstorms should be avoided. Fasten your seatbelt! + - Marginal VFR - XXXX 012345Z 23010KT 5000 SHRA SCT012 BKN018 OVC060 15/11 Q1010 - After the storm - limited visibility and some showers. - Go or No-Go? + Marginal VFR + XXXX 012345Z 23010KT 5000 SHRA SCT012 BKN018 OVC060 15/11 Q1010 + + After the storm - limited visibility and some showers. + Go or No-Go? + - CAT I minimum - XXXX 012345Z 15015KT 0800 -RA BKN002 OVC004 08/06 Q0990 - If you just got your IFR rating, this is what you are allowed to do. But can you? + CAT I minimum + XXXX 012345Z 15015KT 0800 -RA BKN002 OVC004 08/06 Q0990 + If you just got your IFR rating, this is what you are allowed to do. But can you? - CAT II minimum - XXXX 012345Z 15010KT 0400 -RA BKN001 OVC002 08/06 Q0990 - With just a 1/4 mile visibility and clouds at 100ft, you don't see much of the runway until - seconds before touchdown. Trust your instruments to stay alive. + CAT II minimum + XXXX 012345Z 15010KT 0400 -RA BKN001 OVC002 08/06 Q0990 + + With just a 1/4 mile visibility and clouds at 100ft, you don't see much of the runway until + seconds before touchdown. Trust your instruments to stay alive. + - CAT IIIb minimum - XXXX 012345Z VRB01KT 0100 -RA FG OVC001 OVC002 02/02 Q0990 - This is expert level. You will barely see the taxiway from the cockpit, even if you are - on ground. Fog and light drizzle, freezing level at 1000ft. + CAT IIIb minimum + XXXX 012345Z VRB01KT 0100 -RA FG OVC001 OVC002 02/02 Q0990 + + This is expert level. You will barely see the taxiway from the cockpit, even if you are + on ground. Fog and light drizzle, freezing level at 1000ft. + - Early morning fog - XXXX 012345Z 00000KT 0800 FG NCD 08/08 A3030 - Fog developed this autumn's morning. Expect good visibility above the layer. - However - getting through it can be a challenge. Stay alive for a 500' climb - and you'll see the sun! + Early morning fog + XXXX 012345Z 00000KT 0800 FG NCD 08/08 A3030 + + Fog developed this autumn's morning. Expect good visibility above the layer. + However - getting through it can be a challenge. Stay alive for a 500' climb + and you'll see the sun! + - Fair weather + Fair weather - 500 + 500 - + - - 0 - 270 - 3 - 16093.44 - 29.92 - 15.0 - 5.0 - - 0.2 - 0.0 - 1.0 - - 0 - 0 - + + 0 + 270 + 3 + 16093.44 + 29.92 + 15.0 + 5.0 + + 0.2 + 0.0 + 1.0 + + 0 + 0 + - - 500 - 280 - 6 - - 1.0 - 0.1 - 1.0 - - 5 - 0.3 - + + 500 + 280 + 6 + + 1.0 + 0.1 + 1.0 + + 5 + 0.3 + - + - + - - 5000 - 300 - 10 - 16093.44 - 29.92 - - 0.5 - 0.05 - 1.0 - - 25 - 1 - + + 5000 + 300 + 10 + 16093.44 + 29.92 + + 0.5 + 0.05 + 1.0 + + 25 + 1 + - - 10000 - 310 - 20 - - 0.0 - 0.0 - 1.0 - - 30 - 1.2 - + + 10000 + 310 + 20 + + 0.0 + 0.0 + 1.0 + + 30 + 1.2 + - - 18000 - 320 - 30 - 35 - 1.3 - + + 18000 + 320 + 30 + 35 + 1.3 + - - 24000 - 330 - 50 - 35 - 1.3 - + + 24000 + 330 + 50 + 35 + 1.3 + - - 30000 - 340 - 70 - 35 - 1.3 - + + 30000 + 340 + 70 + 35 + 1.3 + - + - - clear - -9999 - 600 - 150 - 40000 - - - clear - -9999 - 65 - 25 - 40000 - - - clear - -9999 - 40000 - - - clear - -9999 - 40000 - - - clear - -9999 - 40000 - + + clear + -9999 + 600 + 150 + 40000 + + + clear + -9999 + 65 + 25 + 40000 + + + clear + -9999 + 40000 + + + clear + -9999 + 40000 + + + clear + -9999 + 40000 + @@ -225,67 +238,80 @@ Wait for /environment/metar[10]/valid to become true. --> - /environment/metar[0] - /environment/metar[1] - /environment/metar[2] - /environment/metar[3] - /environment/metar[4] - /environment/metar[5] - /environment/metar[6] - + /environment/metar[0] + + /environment/metar[1] + + /environment/metar[2] + + /environment/metar[3] + + /environment/metar[4] + + /environment/metar[5] + + /environment/metar[6] + + - /environment/metar[10] - /environment/metar[11] - + /environment/metar[10] + /environment/metar[11] + - noaa + noaa - true + true - - true + + true + + + 2 + + - 240 - true - true - true - 30000 - - - -200 - 20000 + 240 + true + true + true + 30000 + + + -200 + 20000 - 500 - 1.0 - overcast - broken - 30 + 500 + 1.0 + overcast + broken + 30 - 2000 - 0.8 - overcast + 2000 + 0.8 + overcast - 2000 - 0.6 - overcast - + 2000 + 0.6 + overcast + - false - false - false - false - false - false - + false + false + false + false + false + false + diff --git a/Environment/interpolator.xml b/Environment/interpolator.xml index 04f942d57..bbe155d67 100644 --- a/Environment/interpolator.xml +++ b/Environment/interpolator.xml @@ -22,7 +22,7 @@ All filters are enabled on /environment/config/enabled=true --> - + EnvironmentInterpolator:temperature-sea-level-degc @@ -35,7 +35,7 @@ noise-spike 0.1667 - + EnvironmentInterpolator:dewpoint-sea-level-degc @@ -48,7 +48,7 @@ noise-spike 0.1667 - +