From 8b53b5852fa249f1bedf4bfe92d17a854eba6716 Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Sun, 16 Sep 2018 18:13:13 +0100 Subject: [PATCH] Update from c172p-detailed for 2018.3 release. https://github.com/c172p-team/c172p/tree/release/2018.3 fee693699561f4479a15dfb0c4df6038e51b81dd --- .../interior/c172p-interior-radiance.eff | 4 +- .../Effects/interior/c172p-interior.eff | 4 +- .../c172p/Models/Effects/pontoon/pontoon.xml | 22 ++ .../Models/Interior/Baggages/suitcase1.xml | 17 +- .../Models/Interior/Baggages/suitcase2.xml | 17 +- Aircraft/c172p/Models/Interior/FE-ELT/elt.xml | 15 + Aircraft/c172p/Models/Interior/FE-ELT/fe.xml | 15 + Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml | 15 + .../Models/Interior/Panel/Flaps/flaps.xml | 17 + .../Interior/Panel/Instruments/AI/AI.xml | 24 +- .../Instruments/BatteryGauge/BatteryGauge.xml | 8 +- .../Interior/Panel/Instruments/EGT/EGT.xml | 23 +- .../Instruments/FuelOilAmps/c172fuel.xml | 7 +- .../Panel/Instruments/FuelOilAmps/c172oil.xml | 20 ++ .../Interior/Panel/Instruments/RPM/RPM.xml | 20 ++ .../Interior/Panel/Instruments/VSI/VSI.xml | 7 +- .../Interior/Panel/Instruments/alt/alt.xml | 22 +- .../Interior/Panel/Instruments/asi/asi.xml | 7 +- .../Panel/Instruments/clock/clock.xml | 7 +- .../digital-clock/digital-clock.xml | 9 +- .../Interior/Panel/Instruments/dme/ki266.xml | 50 +++ .../Panel/Instruments/garmin196/garmin196.xml | 34 ++ .../Panel/Instruments/garmin196/gpsmodel.xml | 16 + .../Panel/Instruments/gear/gear-ctl.xml | 29 ++ .../Interior/Panel/Instruments/hi/hi.xml | 23 +- .../Panel/Instruments/hobbs/hobbs.xml | 7 +- .../Instruments/kap140/KAP140TwoAxisAlt.xml | 27 ++ .../Panel/Instruments/kma20/kma20.xml | 28 ++ .../Panel/Instruments/kr87-adf/ki227_228.xml | 23 +- .../Panel/Instruments/kr87-adf/kr87.xml | 23 ++ .../Panel/Instruments/kt76a/kt76a.xml | 33 ++ .../Panel/Instruments/kx165/kx165-1.xml | 29 ++ .../Panel/Instruments/kx165/kx165-2.xml | 29 ++ .../mag-compass/mag-compass-float.xml | 49 ++- .../Instruments/mag-compass/mag-compass.xml | 49 ++- .../magneto-switch/magneto-switch.xml | 17 + .../Interior/Panel/Instruments/oat/oat.xml | 18 + .../Interior/Panel/Instruments/tc/tc.xml | 7 +- .../Interior/Panel/Instruments/vac/vac.xml | 7 +- .../Interior/Panel/Instruments/vor/vor.xml | 22 +- .../Interior/Panel/Instruments/vor/vor2.xml | 22 +- .../Models/Interior/Pedals/pedals-copilot.xml | 18 + .../Models/Interior/Pedals/pedals-pilot.xml | 18 + Aircraft/c172p/Models/Interior/Yoke/yoke.xml | 22 ++ .../Interior/control-lock/control-lock.xml | 16 + Aircraft/c172p/Models/c172p.xml | 116 ++++++ Aircraft/c172p/Nasal/engine.nas | 12 + Aircraft/c172p/Nasal/mooring.nas | 14 +- Aircraft/c172p/Nasal/save.nas | 35 +- Aircraft/c172p/Nasal/state-manager.nas | 2 +- Aircraft/c172p/README.md | 2 + Aircraft/c172p/Systems/als-lights.xml | 338 ++++++++++++++++-- Aircraft/c172p/c172p-set.xml | 33 +- Aircraft/c172p/c172p.xml | 2 +- 54 files changed, 1279 insertions(+), 171 deletions(-) diff --git a/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff b/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff index db416d4cc..c64e0732c 100644 --- a/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff +++ b/Aircraft/c172p/Models/Effects/interior/c172p-interior-radiance.eff @@ -20,10 +20,10 @@ 13 2 .2 - + 1 diff --git a/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff b/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff index 7243f05a3..3fd235d2c 100644 --- a/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff +++ b/Aircraft/c172p/Models/Effects/interior/c172p-interior.eff @@ -23,10 +23,10 @@ 13 2 .2 - + 1 diff --git a/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml b/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml index 48648d7e2..faf650f48 100644 --- a/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml +++ b/Aircraft/c172p/Models/Effects/pontoon/pontoon.xml @@ -47,6 +47,28 @@ FloatReinforceJoin + + material + FloatReinforceLeft + FloatReinforceRight + FloatReinforceJoin + RudderCatch + RudderHandle + RudderScrews + RudderTube + RudderCable + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material diff --git a/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml b/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml index accc445b5..f413e00f6 100644 --- a/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml +++ b/Aircraft/c172p/Models/Interior/Baggages/suitcase1.xml @@ -7,7 +7,22 @@ ../../Effects/interior/c172p-interior suitcase1 - + + + material + suitcase1 + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + suitcase1 diff --git a/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml b/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml index eafea739a..b48a895af 100644 --- a/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml +++ b/Aircraft/c172p/Models/Interior/Baggages/suitcase2.xml @@ -7,7 +7,22 @@ ../../Effects/interior/c172p-interior suitcase2 - + + + material + suitcase2 + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + suitcase2 diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml b/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml index 73506e301..dfc5d2644 100644 --- a/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml +++ b/Aircraft/c172p/Models/Interior/FE-ELT/elt.xml @@ -8,6 +8,21 @@ elt + + material + elt + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + elt diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml b/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml index 896772bee..f0c4141fc 100644 --- a/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml +++ b/Aircraft/c172p/Models/Interior/FE-ELT/fe.xml @@ -8,6 +8,21 @@ extinguisher + + material + extinguisher + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + extinguisher diff --git a/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml b/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml index a573f45c9..4fbec6deb 100644 --- a/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml +++ b/Aircraft/c172p/Models/Interior/FE-ELT/fe2.xml @@ -9,4 +9,19 @@ extinguisher + + material + extinguisher + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + diff --git a/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml b/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml index 5de31d7cc..444f064b3 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Flaps/flaps.xml @@ -140,4 +140,21 @@ + + material + FlapSwitch + FlapPos + rect + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml index e28b74b72..66750b3e5 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/AI/AI.xml @@ -31,11 +31,27 @@ /sim/rendering/shaders/skydome + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + AdjustKnob + Bezel + Bracket + + + /sim/rendering/shaders/skydome + + - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml index 5eefa9493..b2bbe3ed9 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/BatteryGauge/BatteryGauge.xml @@ -20,6 +20,7 @@ material Face PtrTip + Ptr Case @@ -27,10 +28,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml index ca7dea449..6590324b9 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/EGT/EGT.xml @@ -44,6 +44,7 @@ material Needle Bug + Knob Face Case @@ -52,10 +53,24 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + Front + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml index 632b4f89c..e3eb27f17 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172fuel.xml @@ -28,10 +28,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml index 711adde77..7e359d023 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/FuelOilAmps/c172oil.xml @@ -22,6 +22,26 @@ OilTempNeedle OilPressNeedle Case + + + /sim/rendering/shaders/skydome + + + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + material + Face + OilTempNeedle + OilPressNeedle + Case + + /sim/rendering/shaders/skydome + 1.0 0.8 diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml index 39f34c302..693a1b139 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/RPM/RPM.xml @@ -27,6 +27,26 @@ Face PointerTip Case + PointerCentre + + + /sim/rendering/shaders/skydome + + + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + material + Face + PointerTip + Case + + /sim/rendering/shaders/skydome + 1.0 0.8 diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml index d3de9009d..cbca7d3bf 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/VSI/VSI.xml @@ -28,10 +28,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml index b949a86df..3b646d744 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/alt/alt.xml @@ -33,10 +33,24 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + disk + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml index 271e33242..68d661277 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/asi/asi.xml @@ -27,10 +27,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml index 087f1d694..e21de5f95 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/clock/clock.xml @@ -30,10 +30,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml index 73fa20ef5..7bfb4d2af 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/digital-clock/digital-clock.xml @@ -30,11 +30,10 @@ /sim/rendering/shaders/skydome - - 1.0 - 0.95 - 0.88 - /sim/model/material/instruments/integral-factor + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml index 9b3f19742..5e8a77261 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/dme/ki266.xml @@ -74,6 +74,56 @@ base + + material + SourceSelectorKnob + PowerSwitch.Lever + on + off + Label3 + n1 + hld + n2 + PowerSwitch.Base + Background + ModeSwitch + Frame + base + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + + + material + SourceSelectorKnob + PowerSwitch.Lever + on + off + Label3 + n1 + hld + n2 + PowerSwitch.Base + + + /sim/rendering/shaders/skydome + + + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + select diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml index dce6f5b93..bf70b3c44 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/garmin196.xml @@ -207,6 +207,40 @@ GPSMount + + material + coque + coque-capot + coque.buttons + antenne + rocker.up + rocker.down + rocker.left + rocker.right + button.in + button.out + button.page + button.quit + button.enter + button.menu + button.nrst + button.power + button.dto + coque.inter + ecran.off + GPSMount + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material ecran.off diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml index 285941938..77d0cc3c6 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/garmin196/gpsmodel.xml @@ -8,4 +8,20 @@ ../../../../Effects/interior/lm-gpsmodel gpsmodel + + + material + gpsmodel + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml index 723b7091e..70a866d5e 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/gear/gear-ctl.xml @@ -28,4 +28,33 @@ GearScrews + + material + nosedn1 + nosedn2 + maindn1 + maindn2 + noseup1 + noseup2 + mainup1 + mainup2 + pump + Switch.nut + Dim.toggle + Dim.bezel + GearFace + GearScrews + Gearswitch + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml index 1f42a2099..14fc1289e 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/hi/hi.xml @@ -30,10 +30,25 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + OBS-Knob + Hdg-Knob + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml index 5a210580b..60faedbad 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/hobbs/hobbs.xml @@ -43,10 +43,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml index 13d9fd0d4..2308f9b61 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kap140/KAP140TwoAxisAlt.xml @@ -87,6 +87,33 @@ properties' values. inhg-digit5 + + material + knob-outer + knob-inner + base + ap-btn + hdg-btn + nav-btn + apr-btn + alt-btn + rev-btn + dn-btn + up-btn + arm-btn + baro-btn + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material buttons diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml index 1d81dd8a9..5f41b9710 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kma20/kma20.xml @@ -66,6 +66,34 @@ O + + material + Knob + Chassis + AUTO + COM1 + COM2 + NAV1 + NAV2 + ADF + DME + MKR + SENS + M + A + O + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material O diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml index b062a7d3d..945647dcc 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/ki227_228.xml @@ -21,7 +21,6 @@ CompassRose KI227.ADFNeedle HDGSelector - @@ -50,10 +49,24 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + HDGSelector + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml index 750d645ea..63099be9a 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kr87-adf/kr87.xml @@ -45,6 +45,29 @@ indicator.Stby.1 + + material + Volume + FRQOuter + FRQInner + Chassis + knobs.ADF + knobs.BFO + knobs.FRQ + knobs.FLT + knobs.SET + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + select indicator diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml index b5363e341..b1972a071 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kt76a/kt76a.xml @@ -52,6 +52,39 @@ test + + material + Dial1 + Dial10 + Dial100 + Dial1000 + Knob1 + Knob10 + Knob100 + Knob1000 + KnobMode + Front + Ident + Ident-light + Border + + off + stby + on + alt + test + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + Dial1 Dial10 diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml index 686a89d06..68bbf2369 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-1.xml @@ -103,6 +103,35 @@ NavUseDot + + material + CommToggle + NavToggle + Chassis + CommKnobs + CommVolume + NavKnobs + NavVolume + CommKHz + CommMHz + CommToggle + CommVolume + NavKHz + NavMHz + NavToggle + NavVolume + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + CommKnobs CommKHz diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml index 8e0c555c7..16b7a9f12 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/kx165/kx165-2.xml @@ -103,6 +103,35 @@ NavUseDot + + material + CommToggle + NavToggle + Chassis + CommKnobs + CommVolume + NavKnobs + NavVolume + CommKHz + CommMHz + CommToggle + CommVolume + NavKHz + NavMHz + NavToggle + NavVolume + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + CommKnobs CommKHz diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml index d033260c8..88014f29c 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass-float.xml @@ -21,6 +21,38 @@ Glass + + material + Ring + Needle + + + /sim/rendering/shaders/skydome + + + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + Casing + Interior + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + rotate Ring @@ -49,20 +81,5 @@ - - material - Ring - Needle - - - /sim/rendering/shaders/skydome - - - - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/factor - - + diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml index dead5f30e..de0a37599 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/mag-compass/mag-compass.xml @@ -21,6 +21,38 @@ Glass + + material + Ring + Needle + + + /sim/rendering/shaders/skydome + + + + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + Casing + Interior + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + rotate Ring @@ -49,20 +81,5 @@ - - material - Ring - Needle - - - /sim/rendering/shaders/skydome - - - - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/factor - - + diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml index d8da3e812..2b8504725 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/magneto-switch/magneto-switch.xml @@ -15,6 +15,23 @@ magsw + + material + key + start + magsw + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material key diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml index b4d789471..6aa0e4be9 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/oat/oat.xml @@ -12,6 +12,24 @@ OAT + + material + OAT.needle + OAT.face + OAT.frame + OAT + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + rotate OAT.needle diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml index 2f4b86531..826358dbc 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/tc/tc.xml @@ -31,10 +31,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml index ca2175f14..1fa39295e 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vac/vac.xml @@ -26,10 +26,9 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml index 9d09899d3..bc087063a 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor.xml @@ -51,10 +51,24 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + disk + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml index 367d4fcdf..ab16a2092 100644 --- a/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml +++ b/Aircraft/c172p/Models/Interior/Panel/Instruments/vor/vor2.xml @@ -51,10 +51,24 @@ - 1.0 - 0.8 - 0.5 - /sim/model/material/instruments/integral-factor + /sim/model/material/instruments/default-red-combined-factor + /sim/model/material/instruments/default-green-combined-factor + /sim/model/material/instruments/default-blue-combined-factor + + + + + material + disk + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor diff --git a/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml b/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml index d32368441..2bdbbe191 100644 --- a/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml +++ b/Aircraft/c172p/Models/Interior/Pedals/pedals-copilot.xml @@ -16,6 +16,24 @@ pedal-rod-right + + material + RightPedal + LeftPedal + pedal-rod-left + pedal-rod-right + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + translate LeftPedal diff --git a/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml b/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml index 437e9ecaf..849ee64bf 100644 --- a/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml +++ b/Aircraft/c172p/Models/Interior/Pedals/pedals-pilot.xml @@ -16,6 +16,24 @@ pedal-rod-right + + material + RightPedal + LeftPedal + pedal-rod-left + pedal-rod-right + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + translate LeftPedal diff --git a/Aircraft/c172p/Models/Interior/Yoke/yoke.xml b/Aircraft/c172p/Models/Interior/Yoke/yoke.xml index 725b3562f..db0aa5442 100644 --- a/Aircraft/c172p/Models/Interior/Yoke/yoke.xml +++ b/Aircraft/c172p/Models/Interior/Yoke/yoke.xml @@ -31,6 +31,28 @@ RightYokeMount + + material + LeftYoke + LeftYokeMain + RightYoke + RightYokeMain + LeftYoke + LeftYokeMount + RightYoke + RightYokeMount + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + translate LeftYoke diff --git a/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml b/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml index e7119c0b1..7fc1d82fd 100644 --- a/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml +++ b/Aircraft/c172p/Models/Interior/control-lock/control-lock.xml @@ -11,6 +11,22 @@ ControlLock-yoke + + material + ControlLock-pocket + ControlLock-yoke + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + select ControlLock-yoke diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml index f2e6e13ae..0aea76494 100644 --- a/Aircraft/c172p/Models/c172p.xml +++ b/Aircraft/c172p/Models/c172p.xml @@ -936,6 +936,122 @@ glas_interior_back + + material + TrimWheel + AvionicsSwitch + radio-light-knob + panel-light-knob + gloveboxlock + Panel_0 + ElevatorTrimPos + mike_mount + CabinAirMounts + CabinAir + CabinHeat + BeaconSwitch + CarbHeat + CarbHeatMount + GenSwitch + LandingLightSwitch + MasterSwitch + Mixture + MixtureMount + NavLightSwitch + PitotHeatSwitch + PrimerLeverMount + StrobeSwitch + TaxiLightSwitch + Throttle + ThrottleMount + mike + mike_chord + ParkingBrake + PrimerLever + LeftBag + bolts + accport + autopilot_breaker + radio5_breaker + radio4_breaker + radio3_breaker + radio2_breaker + radio1_breaker + turn-coordinator_breaker + strobe_breaker + bcnlt_breaker + landing_breaker + navlt_breaker + intlt_breaker + instr_breaker + pitot-heat_breaker + master_breaker + flaps_breaker + BreakersBase + AvionicsSwitchBase + windlocket_right + windlocket_left + windlocketbak_right + windlocketbak_left + doorhandleint_right + doorhandleint_left + CeilingSpeaker + DomeSliderWhite + DomeSwitchWhite + DomeSwitchRed + light-knob-base + AltStaticAir + LowVoltageLed + LowVoltageLedBase + panel_1_gauges + Pedestal + InstrumentCover + panel_1_1.inf + panel_1_1_right + gloveboxdoor + glovebox + gloveboxfull + + carpet + chassis + backseat_left + pilotseat_left + pilotseat_right + doorint_right + doorint_left + windowframeleftint + windowframerightint + baggagedoorinterior + AirVent_left + AirVent_right + wing_1L + wing_1R + visorleft + visorright + visorrodleft + visorrodright + visorbaseleft + visorbaseright + doorintstrapleft + doorintstrapright + + FuelSelectorFace + FuelSelectorLeft + FuelSelectorRight + FuelSelectorBoth + FuelSelectorOff + + + /sim/rendering/shaders/skydome + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + /sim/model/c172p/lighting/rgb-ra-g-factor + /sim/model/c172p/lighting/rgb-ra-b-factor + + + material diff --git a/Aircraft/c172p/Nasal/engine.nas b/Aircraft/c172p/Nasal/engine.nas index 1e24a3d0c..d8b0d3ca0 100644 --- a/Aircraft/c172p/Nasal/engine.nas +++ b/Aircraft/c172p/Nasal/engine.nas @@ -453,6 +453,18 @@ controls.mixtureAxis = func { setprop("/controls/engines/current-engine/mixture", new_value); }; +var _axisMode = { + 0: controls.perIndexAxisHandler("/controls/engines/current-engine[", + "]/throttle"), + 1: controls.perIndexAxisHandler("/controls/engines/current-engine[", + "]/mixture"), + 2: controls.perIndexAxisHandler("/controls/engines/current-engine[", + "]/propeller-pitch") +}; +controls.perEngineSelectedAxisHandler = func(mode) { + return _axisMode[mode]; +}; + controls.stepMagnetos = func { var old_value = getprop("/controls/switches/magnetos"); var new_value = std.max(0, std.min(old_value + arg[0], 3)); diff --git a/Aircraft/c172p/Nasal/mooring.nas b/Aircraft/c172p/Nasal/mooring.nas index 33c2e12c1..8eca68b43 100644 --- a/Aircraft/c172p/Nasal/mooring.nas +++ b/Aircraft/c172p/Nasal/mooring.nas @@ -74,15 +74,17 @@ Mooring.setmoorage = func( index, moorage ) { print (" LAT ",latitudedeg," LON ",longitudedeg," HEAD ",headingdeg); # overwrite the coordinates from the original airport - me.presets.getChild("airport-id").setValue(""); + # forces the computation of ground + me.presets.getChild("altitude-ft").setValue(-9999); + me.presets.getChild("airspeed-kt").setValue(0); me.presets.getChild("latitude-deg").setValue(latitudedeg); me.presets.getChild("longitude-deg").setValue(longitudedeg); me.presets.getChild("heading-deg").setValue(headingdeg); - me.presets.getChild("roll-deg").setValue(0); - me.presets.getChild("pitch-deg").setValue(0); - me.presets.getChild("airspeed-kt").setValue(0); - # forces the computation of ground - me.presets.getChild("altitude-ft").setValue(-9999); + me.presets.getChild("offset-distance-nm").setValue(0); + me.presets.getChild("glideslope-deg").setValue(0); + me.presets.getChild("runway").setValue(""); + me.presets.getChild("runway-requested").setValue(0); + me.presets.getChild("airport-id").setValue(""); } Mooring.presetseaplane = func { diff --git a/Aircraft/c172p/Nasal/save.nas b/Aircraft/c172p/Nasal/save.nas index 686dbb8a8..df8d198a0 100644 --- a/Aircraft/c172p/Nasal/save.nas +++ b/Aircraft/c172p/Nasal/save.nas @@ -201,10 +201,7 @@ var save_state = func { setprop("/save/anchorlat", anchorlat); } - setprop("/save/valid-flag", 1); - # the scenario description - var timestring = getprop("/sim/time/real/year"); timestring = timestring~ "-"~getprop("/sim/time/real/month"); timestring = timestring~ "-"~getprop("/sim/time/real/day"); @@ -236,26 +233,17 @@ var read_state_from_file = func (filename) { var path = getprop("/sim/fg-home") ~ "/aircraft-data/c172pSave/"~filename; var readNode = props.globals.getNode("/save", 0); - var valid_flag = getprop("/save/valid-flag"); - if (valid_flag) { - io.read_properties(path, readNode); - } + io.read_properties(path, readNode); } var resume_state = func { - var valid_flag = getprop("/save/valid-flag"); - - if (valid_flag) { - setprop("/fdm/jsbsim/settings/damage", 0); - } else { - gui.popupTip("Valid saved state file not found, reverting to automatic state!", 5.0); - return; - } + setprop("/fdm/jsbsim/settings/damage", 0); c172p.oil_consumption.stop(); + setprop("/sim/presets/airport-id", ""); var lat = getprop("/save/latitude-deg"); setprop("/sim/presets/latitude-deg", lat); var lon = getprop("/save/longitude-deg"); @@ -270,9 +258,13 @@ var resume_state = func { setprop("/sim/presets/vBody-fps", vBody); var wBody = getprop("/save/wBody-fps"); setprop("/sim/presets/wBody-fps", wBody); - setprop("/sim/presets/on-ground", 1); setprop("/sim/presets/altitude-ft", -9999); setprop("/sim/presets/airspeed-kt", 0); + setprop("/sim/presets/offset-distance-nm", 0); + setprop("/sim/presets/glideslope-deg", 0); + setprop("/sim/presets/runway", ""); + setprop("/sim/presets/parkpos", ""); + setprop("/sim/presets/runway-requested", 0); var heading = getprop("/save/heading-deg"); var anchorconnect = getprop("/save/anchorconnect"); @@ -281,17 +273,6 @@ var resume_state = func { setprop("/sim/presets/heading-deg", heading); } - setprop("/sim/aircraft-state", ""); - setprop("/sim/presets/onground", ""); - setprop("/sim/presets/parkpos", ""); - setprop("/sim/presets/runway", ""); - setprop("/sim/presets/airport-requested", 1); - setprop("/sim/presets/runway-requested", 1); - setprop("/sim/presets/parking-requested", 1); - #airport-requested true - #runway-requested true - #parking-requested true - fgcommand("reposition"); var load_delay = 2.0; diff --git a/Aircraft/c172p/Nasal/state-manager.nas b/Aircraft/c172p/Nasal/state-manager.nas index d212473fd..6130b7cde 100644 --- a/Aircraft/c172p/Nasal/state-manager.nas +++ b/Aircraft/c172p/Nasal/state-manager.nas @@ -62,7 +62,7 @@ var state_manager = func { setprop("/sim/model/c172p/securing/cowl-plugs-visible", 0); setprop("/sim/model/c172p/cockpit/control-lock-placed", 0); - var distance_nm = getprop("/sim/presets/offset-distance-nm") or ""; + var distance_nm = getprop("/sim/presets/offset-distance-nm") or 0; var engine_running_check_delay = 5.0; settimer(func { diff --git a/Aircraft/c172p/README.md b/Aircraft/c172p/README.md index acfbeb2a3..aeeed6418 100644 --- a/Aircraft/c172p/README.md +++ b/Aircraft/c172p/README.md @@ -27,6 +27,8 @@ This aircraft was modified and updated in a joint effort by the following people * Daniel Dubreuil (Dany93): [FDM] stall and spin + a few improvements, in-flight damages on wings, fuel float chamber +* Jonathan Redpath (legoboyvdlp): bug tracking, testing, programming + * Tuomas Kuosmanen (tigert): Reference photos of the aircraft and of the OH-CTL livery. Feedback and testing of the Aircraft Systems and operation * Anders Gidenstam (AndersG): Hydrodynamics for the pontoon/float and amphibious variants diff --git a/Aircraft/c172p/Systems/als-lights.xml b/Aircraft/c172p/Systems/als-lights.xml index 26a47b242..931202847 100644 --- a/Aircraft/c172p/Systems/als-lights.xml +++ b/Aircraft/c172p/Systems/als-lights.xml @@ -341,7 +341,7 @@ - + - + + + RGB Red Factor from post lights + gain + + /sim/model/c172p/lighting/ra-r-p + + /sim/model/material/instruments/factor + + + + /sim/model/c172p/lighting/rgb-ra-r-p-factor + + + + RGB Green Factor from post lights + gain + + /sim/model/c172p/lighting/ra-g-p + + /sim/model/material/instruments/factor + + + + /sim/model/c172p/lighting/rgb-ra-g-p-factor + + + + RGB Blue Factor from post lights + gain + + /sim/model/c172p/lighting/ra-b-p + + /sim/model/material/instruments/factor + + + + /sim/model/c172p/lighting/rgb-ra-b-p-factor + + + + + RGB Red Factor from flood lights + gain + + /sim/model/c172p/lighting/flood-red + + /sim/model/c172p/lighting/flood-default + + + + /sim/model/c172p/lighting/flood-proc-red-factor + + + + RGB Green Factor flood lights + gain + + /sim/model/c172p/lighting/flood-green + + /sim/model/c172p/lighting/flood-default + + + + /sim/model/c172p/lighting/flood-proc-green-factor + + + + RGB Blue Factor flood lights + gain + + /sim/model/c172p/lighting/flood-blue + + /sim/model/c172p/lighting/flood-default + + + + /sim/model/c172p/lighting/flood-proc-blue-factor + + + + + + RGB Red Factor combined + gain + + + + + /sim/model/c172p/lighting/rgb-ra-r-r-factor + + /sim/model/c172p/lighting/rgb-ra-r-p-factor + + /sim/model/c172p/lighting/dome-default + + /sim/model/c172p/lighting/flood-proc-red-factor + + + + + /sim/model/c172p/lighting/rgb-ra-r-factor + + + + RGB Green Factor combined + gain + + + + /sim/model/c172p/lighting/rgb-ra-g-r-factor + /sim/model/c172p/lighting/rgb-ra-g-p-factor + /sim/model/c172p/lighting/dome-default + /sim/model/c172p/lighting/flood-proc-green-factor + + + + + /sim/model/c172p/lighting/rgb-ra-g-factor + + + + RGB Blue Factor combined + gain + + + + /sim/model/c172p/lighting/rgb-ra-b-r-factor + /sim/model/c172p/lighting/rgb-ra-b-p-factor + /sim/model/c172p/lighting/dome-default + /sim/model/c172p/lighting/flood-proc-blue-factor + + + + + /sim/model/c172p/lighting/rgb-ra-b-factor + + + + + + RGB Red Factor default renderer guages combined + gain + + + + /sim/rendering/shaders/skydome + + + /sim/model/c172p/lighting/dome-proc + /sim/model/material/instruments/factor + + + + + + /sim/model/c172p/lighting/dome-proc + 1.0 + + /sim/model/c172p/lighting/flood-proc-red-factor + + + + + + + /sim/rendering/shaders/skydome + + + /sim/model/material/instruments/factor + /sim/model/c172p/lighting/dome-proc + + + + + + /sim/model/material/instruments/factor + 1.0 + + /sim/model/c172p/lighting/flood-proc-red-factor + + + + + /sim/model/material/instruments/default-red-combined-factor + + + + RGB Green Factor default renderer guages combined + gain + + + + /sim/rendering/shaders/skydome + + + /sim/model/c172p/lighting/dome-proc + /sim/model/material/instruments/factor + + + + + + /sim/model/c172p/lighting/dome-proc + 0.8 + + /sim/model/c172p/lighting/flood-proc-green-factor + + + + + + + /sim/rendering/shaders/skydome + + + /sim/model/material/instruments/factor + /sim/model/c172p/lighting/dome-proc + + + + + + /sim/model/material/instruments/factor + 0.8 + + /sim/model/c172p/lighting/flood-proc-green-factor + + + + + /sim/model/material/instruments/default-green-combined-factor + + + + RGB Blue Factor default renderer guages combined + gain + + + + /sim/rendering/shaders/skydome + + + /sim/model/c172p/lighting/dome-proc + /sim/model/material/instruments/factor + + + + + + /sim/model/c172p/lighting/dome-proc + 0.5 + + /sim/model/c172p/lighting/flood-proc-blue-factor + + + + + + + /sim/rendering/shaders/skydome + + + /sim/model/material/instruments/factor + /sim/model/c172p/lighting/dome-proc + + + + + + /sim/model/material/instruments/factor + 0.5 + + /sim/model/c172p/lighting/flood-proc-blue-factor + + + + + /sim/model/material/instruments/default-blue-combined-factor + + + + + + gain + .125 + /sim/model/lightmap/dome/factor + /sim/model/c172p/lighting/dome-default + + + + gain + .175 + /sim/model/lightmap/flood/factor + /sim/model/c172p/lighting/flood-default + + + gain .25 /sim/model/lightmap/dome/factor /sim/model/c172p/lighting/dome-proc - gain .2 /sim/model/lightmap/flood/factor /sim/model/c172p/lighting/flood-proc - gain .25 /sim/model/lighting/courtesy/factor /sim/model/c172p/lighting/courtesy-proc - gain .35 @@ -579,6 +870,7 @@ /sim/model/c172p/lighting/instrument-proc + Interior Glass Glare Factor Dome gain diff --git a/Aircraft/c172p/c172p-set.xml b/Aircraft/c172p/c172p-set.xml index b48b26988..8beff3bd9 100644 --- a/Aircraft/c172p/c172p-set.xml +++ b/Aircraft/c172p/c172p-set.xml @@ -43,7 +43,7 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 fixed-gear - Original by David Megginson, gsagostinho (Gilberto Agostinho), wlbragg (Wayne Bragg), Juanvvc (Juan Vera del Campo), onox, thevirtualfer, Dany93 (Daniel Dubreuil), dg-505 (Jonathan Schellhase), tigert (Tuomas Kuosmanen), AndersG (Anders Gidenstam), wkitty42 (Waldo Kitty), algefaen, Horacio, D-ECHO, Jarl Arntzen (jarlarntzen) + Original by David Megginson, gsagostinho (Gilberto Agostinho), wlbragg (Wayne Bragg), Juanvvc (Juan Vera del Campo), onox, thevirtualfer, Dany93 (Daniel Dubreuil), legoboyvdlp (Jonathan Redpath), dg-505 (Jonathan Schellhase), tigert (Tuomas Kuosmanen), AndersG (Anders Gidenstam), wkitty42 (Waldo Kitty), algefaen, Horacio, D-ECHO, Jarl Arntzen (jarlarntzen) advanced production 2018.3 @@ -143,17 +143,24 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 false false - .05 - .05 - .03 + .05 + .05 + .03 + 0.05 + 0.025 + 0.025 + 0.0 + 0.0 + 0.0 0 0 - false + + 0.7 + 0.3 + 0.3 @@ -305,7 +312,6 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 /engines/active-engine/complex-engine-procedures /sim/model/immat /controls/mooring/automatic - /save/valid-flag @@ -726,6 +732,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 0 0 + 200.0 + 200.0 @@ -733,6 +741,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 0 0 + 118.0 + 118.0 0.7 @@ -741,6 +751,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 0 0 + 118.0 + 118.0 0.7 @@ -749,6 +761,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 0 0 + 108.0 + 108.0 false @@ -757,6 +771,8 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 0 0 + 108.0 + 108.0 false @@ -1133,7 +1149,6 @@ http://forum.flightgear.org/viewtopic.php?f=4&t=25157 - false 0.0 0.0 0.0 diff --git a/Aircraft/c172p/c172p.xml b/Aircraft/c172p/c172p.xml index b7848e0c5..f487bfa47 100644 --- a/Aircraft/c172p/c172p.xml +++ b/Aircraft/c172p/c172p.xml @@ -976,7 +976,7 @@ - + /systems/electrical/outputs/instrument-lights le 20.0 /controls/switches/master-avionics eq 0