diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/777-set-common.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/777-set-common.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/777-set-common.xml 2013-05-29 01:07:12.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/777-set-common.xml 2013-06-04 01:06:22.000000000 +0000 @@ -9,7 +9,7 @@ 4 4 - 20130528 + 20130603 yasim 0.1 diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/Nasal/AFDS.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/Nasal/AFDS.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/Nasal/AFDS.nas 2013-05-28 01:08:31.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/Nasal/AFDS.nas 2013-06-04 01:06:22.000000000 +0000 @@ -880,12 +880,12 @@ and me.AP.getValue()) { setprop("/controls/gear/tiller-enabled", 1); - setprop("controls/flight/aileron", 0); # Aileron set neutral } if(getprop("velocities/groundspeed-kt") < 50) { setprop("/controls/gear/tiller-enabled", me.tiller_status); me.AP.setValue(0); # Autopilot off + setprop("controls/flight/aileron", 0); # Aileron set neutral setprop("controls/flight/rudder", 0); # Rudder set neutral if(!me.FD.getValue()) { diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/Systems/777-autopilot.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/Systems/777-autopilot.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/777/Systems/777-autopilot.xml 2013-05-28 01:08:31.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/777/Systems/777-autopilot.xml 2013-06-04 01:06:22.000000000 +0000 @@ -284,7 +284,7 @@ /autopilot/internal/target-roll-deg - 15.0 + 5.0 0.0 instrumentation/afds/settings/bank-min diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/Instruments-3d/kt70/kt70.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/Instruments-3d/kt70/kt70.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/Instruments-3d/kt70/kt70.xml 2013-05-12 12:06:45.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/Instruments-3d/kt70/kt70.xml 2013-06-01 13:07:16.000000000 +0000 @@ -224,13 +224,8 @@ instrumentation/kt-70/inputs/knob-mode nasal diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/before-take-off.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/before-take-off.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/before-take-off.xml 2013-04-28 16:14:39.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/before-take-off.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -12,28 +12,175 @@ instructions for the real Zeppelin NT. --> Before Take Off Check + Envelope Pressure Check (between 300 Pa and 600 Pa) + + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 6.265 + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 12.532 + + + + Static heaviness - Check (between 882 lbs and -441 lbs)x + Check (between 882 lbs and -441 lbs) + + + + fdm/jsbsim/static-condition/net-lift-lbs + -882.0 + + + fdm/jsbsim/static-condition/net-lift-lbs + 441.0 + + + + Center of Gravity Check (between 1344.5 in and 1374.0 in) + + + + fdm/jsbsim/inertia/cg-x-in + 1344.5 + + + fdm/jsbsim/inertia/cg-x-in + 1374.0 + + + + + + Transponder + + + Engine Swivel As needed + + nasal + + + Thrust No thrust (propeller blade angle close to 0) + + + + controls/engines/engine[0]/propeller-pitch + 0.40 + + + controls/engines/engine[0]/propeller-pitch + 0.48 + + + controls/engines/engine[1]/propeller-pitch + 0.40 + + + controls/engines/engine[1]/propeller-pitch + 0.48 + + + controls/engines/engine[2]/propeller-pitch + 0.40 + + + controls/engines/engine[2]/propeller-pitch + 0.48 + + + + + nasal + + + Engine Speed 2600 - 2700 RPM + + + + engines/engine[0]/rpm + 2600.0 + + + engines/engine[0]/rpm + 2700.0 + + + engines/engine[1]/rpm + 2600.0 + + + engines/engine[1]/rpm + 2700.0 + + + engines/engine[2]/rpm + 2600.0 + + + engines/engine[2]/rpm + 2700.0 + + + + + nasal + + + + + + Mast truck + Unmasted + + + fdm/jsbsim/mooring/moored + fdm/jsbsim/mooring/wire-connected + + + + nasal + + + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/cruise.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/cruise.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/cruise.xml 2013-04-28 16:14:39.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/cruise.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -12,28 +12,124 @@ instructions for the real Zeppelin NT. --> Cruise Check + Envelope Pressure Check (between 300 Pa and 600 Pa) + + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 6.265 + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 12.532 + + + + Static heaviness Check (between 1102 lbs and -441 lbs) + + + + fdm/jsbsim/static-condition/net-lift-lbs + -1102.0 + + + fdm/jsbsim/static-condition/net-lift-lbs + 441.0 + + + + Center of Gravity As needed (between 1315.0 in and 1374.0 in) + + + + fdm/jsbsim/inertia/cg-x-in + 1315.0 + + + fdm/jsbsim/inertia/cg-x-in + 1374.0 + + + + + + Engine Swivel + Cruise + + + + fdm/jsbsim/propulsion/engine[0]/pitch-angle-rad + 0.01 + + + fdm/jsbsim/propulsion/engine[1]/pitch-angle-rad + 0.01 + + + fdm/jsbsim/propulsion/engine[2]/pitch-angle-rad + 0.01 + + + + + nasal + + + + Thrust - As needed + Max/Coarse pitch + + + + controls/engines/engine[0]/propeller-pitch + 0.95 + + + controls/engines/engine[1]/propeller-pitch + 0.95 + + + controls/engines/engine[2]/propeller-pitch + 0.95 + + + + + nasal + + + Engine Speed As needed + Mixture Rich of peak EGT + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/final.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/final.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/final.xml 2013-04-28 16:14:39.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/final.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -12,32 +12,136 @@ instructions for the real Zeppelin NT. --> Final Check + Envelope Pressure Check (between 300 Pa and 600 Pa) + + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 6.265 + + + instrumentation/envelope-pressure-indicator/indicated-gas-pressure-psf + 12.532 + + + + Static heaviness - Check (between 882 lbs and -441 lbs)x + Check (between 882 lbs and -441 lbs) + + + + fdm/jsbsim/static-condition/net-lift-lbs + -882.0 + + + fdm/jsbsim/static-condition/net-lift-lbs + 441.0 + + + + Center of Gravity Check (between 1344.5 in and 1374.0 in) + + + + fdm/jsbsim/inertia/cg-x-in + 1344.5 + + + fdm/jsbsim/inertia/cg-x-in + 1374.0 + + + + Engine Swivel As needed + Thrust As needed - - Engine Speed - 2600 - 2700 RPM - + Mixture Rich + + + + controls/engines/engine[0]/mixture + 0.90 + + + controls/engines/engine[1]/mixture + 0.90 + + + controls/engines/engine[2]/mixture + 0.90 + + + + + nasal + + + + + + Engine Speed + 2600 - 2700 RPM + + + + engines/engine[0]/rpm + 2600.0 + + + engines/engine[0]/rpm + 2700.0 + + + engines/engine[1]/rpm + 2600.0 + + + engines/engine[1]/rpm + 2700.0 + + + engines/engine[2]/rpm + 2600.0 + + + engines/engine[2]/rpm + 2700.0 + + + + + nasal + + + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/start-engine.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/start-engine.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Checklists/start-engine.xml 2013-04-28 16:14:39.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Checklists/start-engine.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -12,32 +12,220 @@ instructions for the real Zeppelin NT. --> Start Engine List + Mixture Rich + + + + controls/engines/engine[0]/mixture + 0.90 + + + controls/engines/engine[1]/mixture + 0.90 + + + controls/engines/engine[2]/mixture + 0.90 + + + + + nasal + + + Engine Speed Low RPM + + + + controls/engines/engine[0]/throttle + 0.05 + + + controls/engines/engine[1]/throttle + 0.05 + + + controls/engines/engine[2]/throttle + 0.05 + + + + + nasal + + + Thrust No thrust (propeller blade angle close to 0) + + + + controls/engines/engine[0]/propeller-pitch + 0.40 + + + controls/engines/engine[0]/propeller-pitch + 0.48 + + + controls/engines/engine[1]/propeller-pitch + 0.40 + + + controls/engines/engine[1]/propeller-pitch + 0.48 + + + controls/engines/engine[2]/propeller-pitch + 0.40 + + + controls/engines/engine[2]/propeller-pitch + 0.48 + + + + + nasal + + + Beacon On + + + controls/lighting/beacon + 1 + + + + nasal + + + + + Navigation lights + On + + + controls/lighting/nav-lights + 1 + + + + nasal + + + + Magnetos Both On + + + + controls/engines/engine[0]/magnetos + 3 + + + controls/engines/engine[1]/magnetos + 3 + + + controls/engines/engine[2]/magnetos + 3 + + + + + nasal + + + Engine Starter Start to 500 RPM + + + engines/engine[0]/running + engines/engine[1]/running + engines/engine[2]/running + + + + nasal + + + Engine Speed 800-1000RPM + + + + engines/engine[0]/rpm + 799.0 + + + engines/engine[0]/rpm + 1001.0 + + + engines/engine[1]/rpm + 799.0 + + + engines/engine[1]/rpm + 1001.0 + + + engines/engine[2]/rpm + 799.0 + + + engines/engine[2]/rpm + 1001.0 + + + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Models/instrument_panel.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Models/instrument_panel.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Models/instrument_panel.xml 2013-04-28 13:33:42.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Models/instrument_panel.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -103,6 +103,10 @@ 0.8 + + + /instrumentation/airspeed-indicator[1]/indicated-speed-kt + @@ -114,6 +118,12 @@ 0.302 0.642 + + + instrumentation/rmi/indicated-heading-deg + instrumentation/rmi/spin + + @@ -135,6 +145,19 @@ 0.8 + + + /instrumentation/altimeter[1]/indicated-altitude-ft + + + /instrumentation/altimeter[1]/indicated-altitude-ft + + + /instrumentation/altimeter[1]/indicated-altitude-ft + + + /instrumentation/altimeter[1]/setting-inhg + @@ -273,7 +296,7 @@ - + pick InhgKnob @@ -284,7 +307,7 @@ true property-adjust - instrumentation/altimeter/setting-inhg + instrumentation/altimeter[1]/setting-inhg 0.01 26.0 33.0 @@ -297,7 +320,7 @@ true property-adjust - instrumentation/altimeter/setting-inhg + instrumentation/altimeter[1]/setting-inhg -0.01 26.0 33.0 diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Models/interior.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Models/interior.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Models/interior.xml 2013-04-28 13:33:42.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Models/interior.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -122,89 +122,7 @@ - pick - left_swivel_handle - left_swivel_arm - right_swivel_handle - right_swivel_arm - - - true - 0.2 - - nasal - - - - - - true - 0.2 - - nasal - - - - - - false - - nasal - - - - - - false - - nasal - - - - - - - pick - rear_swivel_handle - rear_swivel_arm - - - true - 0.2 - - nasal - - - - - - true - 0.2 - - nasal - - - - - - false - - nasal - - - - - - false - - nasal - - - - - - - rotate + knob left_swivel_arm left_swivel_handle fdm/jsbsim/fcs/etc/side-engine-swivel-cmd-rad[0] @@ -220,9 +138,23 @@ 1.0 0.0 + + + nasal + + + + + + nasal + + + + vertical + - rotate + knob right_swivel_arm right_swivel_handle fdm/jsbsim/fcs/etc/side-engine-swivel-cmd-rad[1] @@ -238,9 +170,23 @@ 1.0 0.0 + + + nasal + + + + + + nasal + + + + vertical + - rotate + knob rear_swivel_arm rear_swivel_handle fdm/jsbsim/fcs/etc/rear-engine-swivel-cmd-rad @@ -256,143 +202,24 @@ 1.0 0.0 - - - - - pick - throttle_arm.1 - throttle_handle.1 - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/throttle - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/throttle - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[0]/throttle - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[0]/throttle - -0.01 - - - - - - pick - throttle_arm.3 - throttle_handle.3 - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/throttle - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/throttle - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[1]/throttle - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[1]/throttle - -0.01 - - - - - - pick - throttle_arm.2 - throttle_handle.2 - - - true - 0.2 + - property-adjust - /controls/engines/engine[2]/throttle - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[2]/throttle - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[2]/throttle - 0.01 + nasal + - - - - false + + - property-adjust - /controls/engines/engine[2]/throttle - -0.01 + nasal + - + + vertical + - rotate + knob throttle_arm.1 throttle_handle.1 fdm/jsbsim/fcs/propeller-speed-cmd-norm[0] @@ -408,9 +235,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[0]/throttle + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob throttle_arm.3 throttle_handle.3 fdm/jsbsim/fcs/propeller-speed-cmd-norm[1] @@ -426,9 +266,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[1]/throttle + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob throttle_arm.2 throttle_handle.2 fdm/jsbsim/fcs/propeller-speed-cmd-norm[2] @@ -441,146 +294,28 @@ 0.0 - 1.0 - 0.0 - - - - - - pick - mixture_arm.1 - mixture_handle.1 - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/mixture - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/mixture - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[0]/mixture - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[0]/mixture - -0.01 - - - - - - pick - mixture_arm.3 - mixture_handle.3 - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/mixture - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/mixture - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[1]/mixture - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[1]/mixture - -0.01 - - - - - - pick - mixture_arm.2 - mixture_handle.2 - - - true - 0.2 - - property-adjust - /controls/engines/engine[2]/mixture - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[2]/mixture - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[2]/mixture - 0.01 - - + 1.0 + 0.0 + - - false + true + 0.2 property-adjust - /controls/engines/engine[2]/mixture - -0.01 + /controls/engines/engine[2]/throttle + 0.02 + 0.0 + 1.0 + vertical + + + - rotate + knob mixture_arm.1 mixture_handle.1 fdm/jsbsim/fcs/mixture-cmd-norm[0] @@ -596,9 +331,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[0]/mixture + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob mixture_arm.2 mixture_handle.2 fdm/jsbsim/fcs/mixture-cmd-norm[2] @@ -614,9 +362,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[2]/mixture + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob mixture_arm.3 mixture_handle.3 fdm/jsbsim/fcs/mixture-cmd-norm[1] @@ -632,143 +393,23 @@ 1.0 0.0 - - - - - pick - thrust_arm.1 - thrust_handle.1 - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/propeller-pitch - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[0]/propeller-pitch - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[0]/propeller-pitch - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[0]/propeller-pitch - -0.01 - - - - - - pick - thrust_arm.2 - thrust_handle.2 - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/propeller-pitch - 0.1 - - - - - true - 0.2 - - property-adjust - /controls/engines/engine[1]/propeller-pitch - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[1]/propeller-pitch - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[1]/propeller-pitch - -0.01 - - - - - - pick - thrust_arm.3 - thrust_handle.3 - - - true - 0.2 - - property-adjust - /controls/engines/engine[2]/propeller-pitch - 0.1 - - - true 0.2 property-adjust - /controls/engines/engine[2]/propeller-pitch - -0.1 - - - - - false - - property-adjust - /controls/engines/engine[2]/propeller-pitch - 0.01 - - - - - false - - property-adjust - /controls/engines/engine[2]/propeller-pitch - -0.01 + /controls/engines/engine[1]/mixture + 0.02 + 0.0 + 1.0 + vertical + - rotate + knob thrust_arm.1 thrust_handle.1 fdm/jsbsim/fcs/thrust-cmd-norm[0] @@ -784,9 +425,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[0]/propeller-pitch + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob thrust_arm.2 thrust_handle.2 fdm/jsbsim/fcs/thrust-cmd-norm[1] @@ -802,9 +456,22 @@ 1.0 0.0 + + true + 0.2 + + property-adjust + /controls/engines/engine[1]/propeller-pitch + 0.02 + 0.0 + 1.0 + + + vertical + - rotate + knob thrust_arm.3 thrust_handle.3 fdm/jsbsim/fcs/thrust-cmd-norm[2] @@ -820,50 +487,23 @@ 1.0 0.0 - - - - - pick - gas_handle.1 - true 0.2 - nasal - - - - - - true - 0.2 - - nasal - - - - - - false - - nasal - - - - - - false - - nasal - + property-adjust + /controls/engines/engine[2]/propeller-pitch + 0.02 + 0.0 + 1.0 + vertical + - rotate + knob gas_arm.1 gas_handle.1 fdm/jsbsim/buoyant_forces/gas-cell/valve_open @@ -879,89 +519,23 @@ 1.0 0.0 - - - - - pick - ballonet_handle.2 - - - true - 0.2 - - nasal - - - - - - true - 0.2 + nasal - - - - - - false - - nasal - - - - - - false - - nasal - - - - - - - pick - ballonet_handle.3 - - - true - 0.2 - - nasal - - - - - - true - 0.2 - - nasal - - - - - - false - - nasal - + - - - - false + + nasal - + - + + - rotate + knob ballonet_arm.2 ballonet_handle.2 fdm/jsbsim/fcs/ballonet-inflation-cmd-norm[0] @@ -977,10 +551,22 @@ 1.0 0.0 + + + nasal + + + + + + nasal + + + - rotate + knob ballonet_arm.3 ballonet_handle.3 fdm/jsbsim/fcs/ballonet-inflation-cmd-norm[1] @@ -996,6 +582,18 @@ 1.0 0.0 + + + nasal + + + + + + nasal + + + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/ZLT-NT-copilot.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/ZLT-NT-copilot.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/ZLT-NT-copilot.nas 2013-04-28 16:14:40.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/ZLT-NT-copilot.nas 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ ## ## Zeppelin NT-07 airship ## -## Copyright (C) 2008 - 2012 Anders Gidenstam (anders(at)gidenstam.org) +## Copyright (C) 2008 - 2013 Anders Gidenstam (anders(at)gidenstam.org) ## This file is licensed under the GPL license v2 or later. ## ############################################################################### @@ -150,9 +150,9 @@ content.set("default-padding", 5); props.globals.initNode("sim/about/text", "Zeppelin NT07 airship for FlightGear\n" ~ - "Copyright (C) 2008 - 2009 Anders Gidenstam\n\n" ~ + "Copyright (C) 2008 - 2013 Anders Gidenstam\n\n" ~ "FlightGear flight simulator\n" ~ - "Copyright (C) 1997 - 2009 http://www.flightgear.org\n\n" ~ + "Copyright (C) 1997 - 2013 http://www.flightgear.org\n\n" ~ "This is free software, and you are welcome to\n" ~ "redistribute it under certain conditions.\n" ~ "See the GNU GENERAL PUBLIC LICENSE Version 2 for the details.", diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/ZLT-NT-dual-control.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/ZLT-NT-dual-control.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/ZLT-NT-dual-control.nas 2013-04-28 13:33:42.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/ZLT-NT-dual-control.nas 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ ## ## Nasal for dual control of the ZLT-NT over the multiplayer network. ## -## Copyright (C) 2008 - 2012 Anders Gidenstam (anders(at)gidenstam.org) +## Copyright (C) 2008 - 2013 Anders Gidenstam (anders(at)gidenstam.org) ## This file is licensed under the GPL license version 2 or later. ## ############################################################################### @@ -27,7 +27,7 @@ var pilot_TDM2_mpp = "sim/multiplay/generic/string[2]"; var pilot_TDM3_mpp = "sim/multiplay/generic/string[3]"; var pilot_TDM4_mpp = "sim/multiplay/generic/string[4]"; -var pilot_hsi_head_mpp = "sim/multiplay/generic/float[3]"; +var pilot_rmi_head_mpp = "sim/multiplay/generic/float[3]"; var pilot_ai_pitch_mpp = "sim/multiplay/generic/float[4]"; var pilot_ai_roll_mpp = "sim/multiplay/generic/float[5]"; #var pilot_ai_hoffset_mpp = "sim/multiplay/generic/float[6]"; @@ -99,14 +99,14 @@ "engines/engine[2]/fuel-flow-gph"]; # Instruments -var l_altimeter_setting = "instrumentation/altimeter/setting-inhg"; +var l_altimeter_setting = "instrumentation/altimeter[1]/setting-inhg"; var l_gas_pressure = "fdm/jsbsim/instrumentation/gas-pressure-psf"; var l_ballonet_volume = ["fdm/jsbsim/buoyant_forces/gas-cell/ballonet[0]/volume-ft3", "fdm/jsbsim/buoyant_forces/gas-cell/ballonet[1]/volume-ft3"]; var l_net_lift = "/fdm/jsbsim/static-condition/net-lift-lbs"; var l_cg_position = "/fdm/jsbsim/inertia/cg-x-in"; -var l_hsi_heading = "instrumentation/heading-indicator/indicated-heading-deg"; +var l_rmi_heading = "instrumentation/rmi/indicated-heading-deg"; var l_ai_pitch = "instrumentation/attitude-indicator/indicated-pitch-deg"; var l_ai_roll = "instrumentation/attitude-indicator/indicated-roll-deg"; #var l_ai_hoffset = "instrumentation/attitude-indicator/horizon-offset-deg"; @@ -739,13 +739,16 @@ # Map airspeed for airspeed indicator. This is cheating! props.globals. - getNode("/instrumentation/airspeed-indicator/indicated-speed-kt", 1). + getNode("/instrumentation/airspeed-indicator[0]/indicated-speed-kt", 1). + alias(pilot.getNode("velocities/true-airspeed-kt")); + props.globals. + getNode("/instrumentation/airspeed-indicator[1]/indicated-speed-kt", 1). alias(pilot.getNode("velocities/true-airspeed-kt")); - # Map HSI indicated heading for animation and other uses. - pilot.getNode(l_hsi_heading, 1).alias(pilot.getNode(pilot_hsi_head_mpp)); - props.globals.getNode(l_hsi_heading, 1). - alias(pilot.getNode(pilot_hsi_head_mpp)); + # Map RMI indicated heading for animation and other uses. + pilot.getNode(l_rmi_heading, 1).alias(pilot.getNode(pilot_rmi_head_mpp)); + props.globals.getNode(l_rmi_heading, 1). + alias(pilot.getNode(pilot_rmi_head_mpp)); # Map Attitude Indicator for animation. NOTE: global properties. props.globals.getNode(l_ai_pitch, 1). @@ -786,6 +789,7 @@ var panel_props = [ "controls/lighting/panel-norm", + # For the RMI. "instrumentation/nav[0]/heading-deg", "instrumentation/nav[1]/heading-deg", "instrumentation/adf[0]/indicated-bearing-deg", @@ -796,6 +800,6 @@ pilot.getNode(p, 1).alias(props.globals.getNode(p, 1)); } # Hide the RMI warning flag. - pilot.getNode("instrumentation/heading-indicator/spin").setValue(1.0); + pilot.getNode("instrumentation/rmi/spin").setValue(1.0); } diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/copilot-instrumentation.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/copilot-instrumentation.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/copilot-instrumentation.xml 2013-04-28 13:33:42.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/copilot-instrumentation.xml 2013-06-05 21:05:53.000000000 +0000 @@ -1,11 +1,15 @@ + - altimeter - 0 + 1 /systems/static/pressure-inhg 0 0 @@ -13,20 +17,17 @@ - vertical-speed-indicator 0 /systems/static/pressure-inhg - magnetic-compass 0 - clock 0 @@ -44,34 +45,28 @@ - marker-beacon 0 - nav 0 - nav 1 - adf 0 - dme 0 - gps 0 diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/instrumentation.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/instrumentation.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/Systems/instrumentation.xml 2013-04-28 13:33:42.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/Systems/instrumentation.xml 2013-06-05 21:05:53.000000000 +0000 @@ -1,20 +1,14 @@ - - - adf - 0 - - + - airspeed-indicator 0 /systems/pitot/total-pressure-inhg /systems/static/pressure-inhg @@ -23,90 +17,115 @@ 100000.0 + - altimeter 0 /systems/static/pressure-inhg 0 0 + false + false - - attitude-indicator + + 0 - /systems/vacuum[0]/suction-inhg - /systems/vacuum[1]/suction-inhg - + - clock 0 - - dme + + + + 1 + /systems/pitot/total-pressure-inhg + /systems/static/pressure-inhg + 0 + + + - encoder - 0 + 1 /systems/static/pressure-inhg - 10 - 0.1 + 0 + 0 + false + false - - marker-beacon + + 0 - + /systems/vacuum[0]/suction-inhg + /systems/vacuum[1]/suction-inhg + - - heading-indicator + + 0 - /systems/vacuum/suction-inhg - + /systems/static/pressure-inhg + - - kt-70 + + + rmi 0 - + /systems/vacuum[0]/suction-inhg + /systems/vacuum[1]/suction-inhg + - magnetic-compass 0 - nav 0 - nav 1 - - slip-skid-ball + 0 - + - - transponder + 0 - /instrumentation/encoder/mode-c-alt-ft - + - - vertical-speed-indicator + 0 - /systems/static/pressure-inhg - + - gps 0 + + encoder + 0 + true + true + /systems/static/pressure-inhg + 0.0 + 0.0 + + + + kt-70 + 0 + /instrumentation/encoder + 1 + true + + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/ZLT-NT-copilot-set.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/ZLT-NT-copilot-set.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Aircraft/ZLT-NT/ZLT-NT-copilot-set.xml 2013-04-28 16:14:40.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Aircraft/ZLT-NT/ZLT-NT-copilot-set.xml 2013-06-05 21:05:53.000000000 +0000 @@ -2,7 +2,7 @@ @@ -11,7 +11,7 @@ Zeppelin NT07 airship Anders Gidenstam - $Id: ZLT-NT-set.xml,v 1.58 2012/12/09 19:47:32 anders Exp $ + $Id: ZLT-NT-set.xml,v 1.59 2013/05/12 12:37:37 anders Exp $ beta @@ -168,7 +168,7 @@ + alias="/instrumentation/rmi/indicated-heading-deg"/> + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + 1 @@ -261,6 +276,9 @@ 1 + + 1 + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/terrain-default.eff fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/terrain-default.eff --- fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/terrain-default.eff 2013-04-28 16:14:52.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/terrain-default.eff 2013-06-07 13:04:56.000000000 +0000 @@ -104,7 +104,9 @@ /environment/cloud-self-shading /environment/moonlight /environment/season - /environment/wind-speed-kt + /sim/rendering/shaders/wind-effects + /environment/sea/surface/wind-from-east-fps + /environment/sea/surface/wind-from-north-fps /sim/rendering/shaders/landmass /sim/rendering/shaders/transition @@ -347,11 +349,6 @@ float wetness - - windspeed - float - windspeed - fogstructure float @@ -372,6 +369,16 @@ float season + + WindE + float + windE + + + WindN + float + windN + quality_level int @@ -383,6 +390,11 @@ tquality_level + wind_effects + int + wind_effects + + texture sampler-2d 0 diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/tree.eff fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/tree.eff --- fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/tree.eff 2013-06-01 01:05:29.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/tree.eff 2013-06-07 13:04:56.000000000 +0000 @@ -33,6 +33,9 @@ /sim/rendering/shaders/skydome /environment/fog-structure /sim/rendering/shaders/landmass + /sim/rendering/shaders/wind-effects + /environment/sea/surface/wind-from-east-fps + /environment/sea/surface/wind-from-north-fps @@ -136,6 +139,16 @@ season + WindE + float + windE + + + WindN + float + windN + + texture sampler-2d 0 @@ -150,6 +163,11 @@ int quality_level + + wind_effects + int + wind_effects + @@ -257,6 +275,16 @@ float season + + WindE + float + windE + + + WindN + float + windN + texture sampler-2d @@ -272,6 +300,11 @@ int quality_level + + wind_effects + int + wind_effects + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/water-inland.eff fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/water-inland.eff --- fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/water-inland.eff 2013-04-28 16:14:52.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/water-inland.eff 2013-06-07 13:04:56.000000000 +0000 @@ -508,6 +508,11 @@ sea_b + + ocean_flag + int + 0 + @@ -870,6 +875,11 @@ sea_b + + ocean_flag + int + 0 + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/water.eff fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/water.eff --- fgfs-base-2.11.0+201305312000~git20fb3ba/Effects/water.eff 2013-04-28 16:14:52.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Effects/water.eff 2013-06-07 13:04:56.000000000 +0000 @@ -562,6 +562,11 @@ int quality_level + + ocean_flag + int + 1 + @@ -925,6 +930,11 @@ sea_b + + ocean_flag + int + 1 + diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Input/Joysticks/SpeedLink/black-widow.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/Input/Joysticks/SpeedLink/black-widow.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/Input/Joysticks/SpeedLink/black-widow.xml 2013-04-28 13:35:28.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Input/Joysticks/SpeedLink/black-widow.xml 2013-06-08 01:05:11.000000000 +0000 @@ -45,6 +45,7 @@ Mega World USB Game Controllers SpeedLink SL-6640 Black Widow Flight Stick SL-6640 Black Widow Flightstick + SL-6640-SBK BLACK WIDOW Flightstick Aileron diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/canvas/api.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/canvas/api.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/canvas/api.nas 2013-04-28 16:14:55.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/canvas/api.nas 2013-06-07 01:05:22.000000000 +0000 @@ -833,10 +833,12 @@ # @param id Optional id/name for the group createGroup: func(id = nil) { - var ghost = me._createGroup(); - return { - parents: [ Group.new(ghost) ] - }; + return Group.new(me._createGroup(id)); + }, + # Get the group with the given name + getGroup: func(id) + { + return Group.new(me._getGroup(id)); }, # Set the background color # @@ -859,10 +861,12 @@ var wrapCanvas = func(canvas_ghost) { - return { - parents: [Canvas, canvas_ghost], + var m = { + parents: [PropertyElement, Canvas, canvas_ghost], texture: props.wrapNode(canvas_ghost._node_ghost) }; + m._node = m.texture; + return m; } # Create a new canvas. Pass parameters as hash, eg: diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/canvas/gui.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/canvas/gui.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/canvas/gui.nas 2013-04-28 16:14:55.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/canvas/gui.nas 2013-06-07 01:05:22.000000000 +0000 @@ -2,23 +2,31 @@ # Constructor # # @param size ([width, height]) - new: func(size, id = nil) + new: func(size, type = nil, id = nil) { + var ghost = _newWindowGhost(id); var m = { - parents: [Window, PropertyElement.new(["/sim/gui/canvas", "window"], id)] + parents: [Window, PropertyElement, ghost], + _node: props.wrapNode(ghost._node_ghost) }; + m.setInt("size[0]", size[0]); m.setInt("size[1]", size[1]); + # TODO better default position + m.move(0,0); + # arg = [child, listener_node, mode, is_child_event] setlistener(m._node, func m._propCallback(arg[0], arg[2]), 0, 2); + if( type ) + m.set("type", type); return m; }, # Destructor del: func { - me.parents[1].del(); + me._node.remove(); if( me["_canvas"] != nil ) me._canvas.del(); }, @@ -58,15 +66,19 @@ { return me['_canvas']; }, + getCanvasDecoration: func() + { + return wrapCanvas(me._getCanvasDecoration()); + }, setPosition: func(x, y) { - me.setInt("x", x); - me.setInt("y", y); + me.setInt("tf/t[0]", x); + me.setInt("tf/t[1]", y); }, move: func(x, y) { - me.setInt("x", me.get("x", 0) + x); - me.setInt("y", me.get("y", 0) + y); + me.setInt("tf/t[0]", me.get("tf/t[0]", 10) + x); + me.setInt("tf/t[1]", me.get("tf/t[1]", 30) + y); }, # Raise to top of window stack raise: func() @@ -76,11 +88,22 @@ # private: _propCallback: func(child, mode) { + if( !me._node.equals(child.getParent()) ) + return; + var name = child.getName(); + # support for CSS like position: absolute; with right and/or bottom margin - if( child.getName() == "right" ) - me._handlePositionAbsolute(child, mode, child.getName(), 0); - else if( child.getName() == "bottom" ) - me._handlePositionAbsolute(child, mode, child.getName(), 1); + if( name == "right" ) + me._handlePositionAbsolute(child, mode, name, 0); + else if( name == "bottom" ) + me._handlePositionAbsolute(child, mode, name, 1); + + # update decoration on type change + else if( name == "type" ) + { + if( mode == 0 ) + settimer(func me._updateDecoration(), 0); + } }, _handlePositionAbsolute: func(child, mode, name, index) { @@ -112,10 +135,62 @@ { me.setInt ( - index == 0 ? "x" : "y", + "tf/t[" ~ index ~ "]", getprop("/sim/gui/canvas/size[" ~ index ~ "]") - me.get(name) - me.get("size[" ~ index ~ "]") ); + }, + _updateDecoration: func() + { + var border_radius = 9; + me.set("decoration-border", "25 1 1"); + me.set("shadow-inset", int((1 - math.cos(45 * D2R)) * border_radius + 0.5)); + me.set("shadow-radius", 5); + + var canvas_deco = me.getCanvasDecoration(); + canvas_deco.addEventListener("mousedown", func me.raise()); + canvas_deco.set("blend-source-rgb", "src-alpha"); + canvas_deco.set("blend-destination-rgb", "one-minus-src-alpha"); + canvas_deco.set("blend-source-alpha", "one"); + canvas_deco.set("blend-destination-alpha", "one"); + + var group_deco = canvas_deco.getGroup("decoration"); + var title_bar = group_deco.createChild("group", "title_bar"); + title_bar.addEventListener("drag", func(e) { me.move(e.deltaX, e.deltaY); }); + title_bar + .rect( 0, 0, + me.get("size[0]"), + me.get("size[1]"), #25, + {"border-top-radius": border_radius} ) + .setColorFill(0.25,0.24,0.22) + .setStrokeLineWidth(0); + + var style_dir = "gui/styles/AmbianceClassic/"; + + # close icon + var x = 10; + var y = 3; + var w = 19; + var h = 19; + var ico = title_bar.createChild("image", "icon-close") + .set("file", style_dir ~ "close_focused_normal.png") + .setTranslation(x,y); + ico.addEventListener("click", func me.del()); + ico.addEventListener("mouseover", func ico.set("file", style_dir ~ "close_focused_prelight.png")); + ico.addEventListener("mousedown", func ico.set("file", style_dir ~ "close_focused_pressed.png")); + ico.addEventListener("mouseout", func ico.set("file", style_dir ~ "close_focused_normal.png")); + + # title + me._title = title_bar.createChild("text", "title") + .set("alignment", "left-center") + .set("character-size", 14) + .set("font", "LiberationFonts/LiberationSans-Bold.ttf") + .setTranslation( int(x + 1.5 * w + 0.5), + int(y + 0.5 * h + 0.5) ); + + var title = me.get("title", "Canvas Dialog"); + me._node.getNode("title", 1).alias(me._title._node.getPath() ~ "/text"); + me.set("title", title); } }; diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/route_manager.nas fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/route_manager.nas --- fgfs-base-2.11.0+201305312000~git20fb3ba/Nasal/route_manager.nas 2013-04-28 16:14:55.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Nasal/route_manager.nas 2013-06-01 13:07:16.000000000 +0000 @@ -100,18 +100,17 @@ return m; }, - _landingCheckTimeout: func - { - var cur = me.flightplan.currentWP(); - var wow = getprop('gear/gear[0]/wow'); - var gs = getprop('velocities/groundspeed-kt'); - if (wow and (gs < 25)) { - debug.dump('touchdown on destination runway, end of route.'); - me.landingCheck.stop(); - # record touch-down time? - me.flightplan.finish(); - } - }, + _landingCheckTimeout: func + { + var wow = getprop('gear/gear[0]/wow'); + var gs = getprop('velocities/groundspeed-kt'); + if (wow and (gs < 25)) { + debug.dump('touchdown on destination runway, end of route.'); + me.landingCheck.stop(); + # record touch-down time? + me.flightplan.finish(); + } + }, waypointsChanged: func { @@ -125,8 +124,8 @@ currentWaypointChanged: func { if (me.landingCheck != nil) { - me.landingCheck.stop(); - me.landingCheck = nil; # delete timer + me.landingCheck.stop(); + me.landingCheck = nil; # delete timer } #debug.dump('saw current WP changed, now ' ~ me.flightplan.current); @@ -134,14 +133,22 @@ if (active == nil) return; if (active.alt_cstr_type != 'none') { - debug.dump('new WP has valid altitude restriction, setting on AP'); - setprop('/autopilot/settings/target-altitude-ft', active.alt_cstr); + debug.dump('new WP has valid altitude restriction, setting on AP'); + setprop('/autopilot/settings/target-altitude-ft', active.alt_cstr); } var activeRunway = active.runway(); - if ((activeRunway != nil) and (activeRunway.id == me.flightplan.destination_runway.id)) { - me.landingCheck = maketimer(2.0, me, FMSDelegate._landingCheckTimeout); - me.landingCheck.start(); + # this check is needed to avoid problems with circular routes; when + # activating the FP we end up here, and without this check, immediately + # detect that we've 'landed' and finish the FP again. + var wow = getprop('gear/gear[0]/wow'); + + if (!wow and + (activeRunway != nil) and + (activeRunway.id == me.flightplan.destination_runway.id)) + { + me.landingCheck = maketimer(2.0, me, FMSDelegate._landingCheckTimeout); + me.landingCheck.start(); } } }; diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/terrain-haze-ultra.frag fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/terrain-haze-ultra.frag --- fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/terrain-haze-ultra.frag 2013-04-28 16:14:56.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/terrain-haze-ultra.frag 2013-06-07 13:04:56.000000000 +0000 @@ -44,7 +44,6 @@ uniform float snow_thickness_factor; uniform float cloud_self_shading; uniform float season; -uniform float windspeed; uniform float grain_strength; uniform float intrinsic_wetness; uniform float transition_model; @@ -52,9 +51,12 @@ uniform float dot_density; uniform float dot_size; uniform float dust_resistance; +uniform float WindE; +uniform float WindN; uniform float osg_SimulationTime; uniform int quality_level; uniform int tquality_level; +uniform int wind_effects; const float EarthRadius = 5800000.0; const float terminator_width = 200000.0; @@ -272,6 +274,34 @@ float intensity; + +// Wind motion of the overlay noise simulating movement of vegetation and loose debris + +vec2 windPos; + +if (wind_effects > 1) + { + float windSpeed = length(vec2 (WindE,WindN)) /3.0480; + // interfering sine wave wind pattern + float sineTerm = sin(0.35 * windSpeed * osg_SimulationTime + 0.05 * (rawPos.x + rawPos.y)); + sineTerm = sineTerm + sin(0.3 * windSpeed * osg_SimulationTime + 0.04 * (rawPos.x + rawPos.y)); + sineTerm = sineTerm + sin(0.22 * windSpeed * osg_SimulationTime + 0.05 * (rawPos.x + rawPos.y)); + sineTerm = sineTerm/3.0; + // non-linear amplification to simulate gusts + sineTerm = sineTerm * sineTerm;//smoothstep(0.2, 1.0, sineTerm); + + // wind starts moving dust and leaves at around 8 m/s + float timeArg = 0.01 * osg_SimulationTime * windSpeed * smoothstep(8.0, 15.0, windSpeed); + timeArg = timeArg + 0.02 * sineTerm; + + windPos = vec2 (rawPos.x + WindN * timeArg, rawPos.y + WindE * timeArg); + } +else + { + windPos = rawPos.xy; + } + + // get noise at different wavelengths // used: 5m, 5m gradient, 10m, 10m gradient: heightmap of the closeup terrain, 10m also snow @@ -287,7 +317,7 @@ float noise_5m = Noise2D(rawPos.xy ,5.0); float noise_2m = Noise2D(rawPos.xy ,2.0); float noise_1m = Noise2D(rawPos.xy ,1.0); -float noise_01m = Noise2D(rawPos.xy, 0.1); +float noise_01m = Noise2D(windPos.xy, 0.1); float noisegrad_10m; float noisegrad_5m; @@ -488,15 +518,7 @@ texel.rgb = texel.rgb * (1.0 - 0.6 * combined_wetness); -// surf - terrain is too bad... -/* foam_texel.rgb =vec3 (1.0, 1.0, 1.0); - foam_texel.rg = 0.7 * foam_texel.rg +0.3 * noise_2m * foam_texel.rg; - float surf_strength = 1.0 + windspeed/5.0; - float surf_sine = sin(osg_SimulationTime+5.0*noise_25m); - float surf_steepcorr = 1.0 -smoothstep(0.99,1.01,abs(steepness)); - float surf_alt = (relPos.z+eye_alt ) - 20.0 * surf_steepcorr ;//+ noise_10m * surf_steepcorr - texel.rgb = mix(foam_texel.rgb, texel.rgb, smoothstep((0.3 +0.3*surf_strength+ surf_sine) * surf_steepcorr-20.0, (0.3+ surf_strength + surf_sine) * surf_steepcorr-19.0, surf_alt)); -*/ + // light computations diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/tree-haze.vert fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/tree-haze.vert --- fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/tree-haze.vert 2013-06-01 01:05:29.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/tree-haze.vert 2013-06-07 13:04:56.000000000 +0000 @@ -18,27 +18,26 @@ // the surface normal is passed in gl_{Front,Back}Color. The alpha // component is set to 1 for front, 0 for back in order to work around // bugs with gl_FrontFacing in the fragment shader. -//varying vec4 diffuse_term; -//varying vec3 normal; -varying vec3 relPos; -//varying float earthShade; -//varying float yprime; -//varying float vertex_alt; + +varying vec3 relPos; varying float yprime_alt; -//varying float mie_angle; uniform int colorMode; +uniform int wind_effects; uniform float hazeLayerAltitude; uniform float terminator; uniform float terrain_alt; uniform float avisibility; uniform float visibility; uniform float overcast; -//uniform float scattering; uniform float ground_scattering; uniform float snow_level; uniform float season; +uniform float WindN; +uniform float WindE; + +uniform float osg_SimulationTime; float earthShade; float mie_angle; @@ -94,6 +93,14 @@ // Rotation of the generic quad to specific one for the tree. position.xy = vec2(dot(position.xy, vec2(cr, sr)), dot(position.xy, vec2(-sr, cr))); + + // Shear by wind. Note that this only applies to the top vertices + if (wind_effects > 0) + { + position.x = position.x + position.z * (sin(osg_SimulationTime * 1.8 + (gl_Color.x + gl_Color.y + gl_Color.z) * 0.01) + 1.0) * 0.0025 * WindN; + position.y = position.y + position.z * (sin(osg_SimulationTime * 1.8 + (gl_Color.x + gl_Color.y + gl_Color.z) * 0.01) + 1.0) * 0.0025 * WindE; + } + // Move to correct location (stored in gl_Color) position = position + gl_Color.xyz; gl_Position = gl_ModelViewProjectionMatrix * vec4(position,1.0); diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/water_lightfield.frag fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/water_lightfield.frag --- fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/water_lightfield.frag 2013-04-28 16:14:56.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/water_lightfield.frag 2013-06-07 13:04:56.000000000 +0000 @@ -30,6 +30,7 @@ varying float earthShade; varying float yprime_alt; varying float mie_angle; +varying float steepness; uniform float WaveFreq ; uniform float WaveAmp ; @@ -57,6 +58,7 @@ uniform float sea_b; uniform int quality_level; +uniform int ocean_flag; vec3 specular_light; @@ -525,11 +527,18 @@ float waveSlope = N.g; - - if (windEffect >= 8.0) + float surfFact = 0.0; + if ((windEffect >= 8.0) || (steepness < 0.999)) + { + if ((waveSlope > 0.0) && (ocean_flag ==1)) + { + surfFact = surfFact +(1.0 -smoothstep(0.97,1.0,steepness)); + waveSlope = waveSlope + 2.0 * surfFact; + } if (waveSlope >= foamSlope){ - finalColor = mix(finalColor, max(finalColor, finalColor + foam_texel), smoothstep(0.01, 0.50, N.g)); + finalColor = mix(finalColor, max(finalColor, finalColor + foam_texel), smoothstep(0.01, 0.50, N.g+0.2 * surfFact)); } + } } diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/water_lightfield.vert fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/water_lightfield.vert --- fgfs-base-2.11.0+201305312000~git20fb3ba/Shaders/water_lightfield.vert 2013-04-28 16:14:56.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/Shaders/water_lightfield.vert 2013-06-07 13:04:56.000000000 +0000 @@ -15,6 +15,7 @@ varying vec3 viewerdir; varying vec3 lightdir; +varying float steepness; varying float earthShade; @@ -31,6 +32,8 @@ uniform float overcast; uniform float ground_scattering; +uniform int ocean_flag; + uniform mat4 osg_ViewMatrixInverse; vec3 specular_light; @@ -79,6 +82,11 @@ viewerdir = vec3(gl_ModelViewMatrixInverse[3]) - vec3(gl_Vertex); lightdir = normalize(vec3(gl_ModelViewMatrixInverse * gl_LightSource[0].position)); + if (ocean_flag == 1) + {steepness = dot(normalize(gl_Normal), vec3 (0.0, 0.0, 1.0));} + else + {steepness = 0.0;} + waterTex4 = vec4( ecPosition.xzy, 0.0 ); diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/debian/changelog fgfs-base-2.11.0+201306072000~gitb3ad2aa/debian/changelog --- fgfs-base-2.11.0+201305312000~git20fb3ba/debian/changelog 2013-06-01 01:05:37.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/debian/changelog 2013-06-08 01:05:18.000000000 +0000 @@ -1,3 +1,72 @@ +fgfs-base (2.11.0+201306072000~gitb3ad2aa-0ubuntu0ppa1) raring; urgency=low + + [ Csaba Halasz ] + * Added another name for joystick SpeedLink Black Widow (as reported on IRC) + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Fri, 07 Jun 2013 20:05:18 -0500 + +fgfs-base (2.11.0+201306070800~git74a41c2-0ubuntu0ppa1) raring; urgency=low + + [ Thorsten Renk ] + * Wind effects on vegetation for Atmospheric Light Scattering: movement of trees and hires terrain texture noise simulating vegetation and debris movement + * Shader trick to generate surf at steep coastlines + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Fri, 07 Jun 2013 08:05:04 -0500 + +fgfs-base (2.11.0+201306062000~git33670a4-0ubuntu0ppa1) raring; urgency=low + + [ Thomas Geymayer ] + * Basic window decorator with title bar and close button. + * Use integer coordinates for placing canvas dialog title + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Thu, 06 Jun 2013 20:05:30 -0500 + +fgfs-base (2.11.0+201306051600~git35d071d-0ubuntu0ppa1) raring; urgency=low + + [ Anders Gidenstam ] + * Updated ZLT-NT: Updated instrumentation, checklists and added knob animations. + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Wed, 05 Jun 2013 16:06:00 -0500 + +fgfs-base (2.11.0+201306050800~git1b0873e-0ubuntu0ppa1) raring; urgency=low + + [ BARANGER Emmanuel ] + * Nord 2501/2502 : Upgrading headers, adding effects and some details. New panel by slowman and 3 superb textures and 2 Splash Screen. + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Wed, 05 Jun 2013 08:05:42 -0500 + +fgfs-base (2.11.0+201306032000~gite61f4ea-0ubuntu0ppa1) raring; urgency=low + + [ Hyde Yamakawa ] + * 777:Minor fix of autoland rollout + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Mon, 03 Jun 2013 20:06:30 -0500 + +fgfs-base (2.11.0+201306010800~git576b0be-0ubuntu0ppa1) raring; urgency=low + + [ James Turner ] + * Map KT-70 mode to tooltip using an array. + * Fix an issue with circular flight-plans. + + [ Gijs de Rooy ] + * 747-400: add transponder and aileron trim + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Sat, 01 Jun 2013 08:07:26 -0500 + fgfs-base (2.11.0+201305312000~git20fb3ba-0ubuntu0ppa1) raring; urgency=low [ BARANGER Emmanuel ] diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/gui/dialogs/shaders-lightfield.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/dialogs/shaders-lightfield.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/gui/dialogs/shaders-lightfield.xml 2013-04-28 16:15:10.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/dialogs/shaders-lightfield.xml 2013-06-07 13:04:56.000000000 +0000 @@ -172,6 +172,30 @@ 55 + + + hbox + right + + + + + wind + 0.0 + 2.0 + 1.0 + 0.17 + true + /sim/rendering/shaders/wind-effects + + dialog-apply + wind + + + + 55 + + hbox Binary files /tmp/Ot3pjSHhov/fgfs-base-2.11.0+201305312000~git20fb3ba/gui/images/shadow.png and /tmp/AcWxdjSWV7/fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/images/shadow.png differ Binary files /tmp/Ot3pjSHhov/fgfs-base-2.11.0+201305312000~git20fb3ba/gui/styles/AmbianceClassic/close_focused_normal.png and /tmp/AcWxdjSWV7/fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/styles/AmbianceClassic/close_focused_normal.png differ Binary files /tmp/Ot3pjSHhov/fgfs-base-2.11.0+201305312000~git20fb3ba/gui/styles/AmbianceClassic/close_focused_prelight.png and /tmp/AcWxdjSWV7/fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/styles/AmbianceClassic/close_focused_prelight.png differ Binary files /tmp/Ot3pjSHhov/fgfs-base-2.11.0+201305312000~git20fb3ba/gui/styles/AmbianceClassic/close_focused_pressed.png and /tmp/AcWxdjSWV7/fgfs-base-2.11.0+201306072000~gitb3ad2aa/gui/styles/AmbianceClassic/close_focused_pressed.png differ diff -Nru fgfs-base-2.11.0+201305312000~git20fb3ba/preferences.xml fgfs-base-2.11.0+201306072000~gitb3ad2aa/preferences.xml --- fgfs-base-2.11.0+201305312000~git20fb3ba/preferences.xml 2013-04-28 16:15:10.000000000 +0000 +++ fgfs-base-2.11.0+201306072000~gitb3ad2aa/preferences.xml 2013-06-07 13:04:56.000000000 +0000 @@ -147,6 +147,7 @@ 1.0 1.0 1.0 + 0.0 1.0 1.0