diff --git a/Aircraft/Instruments-3d/kx165/kx165-1.xml b/Aircraft/Instruments-3d/kx165/kx165-1.xml index cc7b8d3b1..758882d6a 100644 --- a/Aircraft/Instruments-3d/kx165/kx165-1.xml +++ b/Aircraft/Instruments-3d/kx165/kx165-1.xml @@ -1,758 +1,804 @@ - - - - - - - instrumentation/comm[0]/serviceable - instrumentation/nav[0]/serviceable - instrumentation/nav[0]/power-btn - instrumentation/comm[0]/power-btn - - instrumentation/comm[0]/frq-swap-btn - instrumentation/comm[0]/frequencies/selected-mhz - instrumentation/comm[0]/frequencies/standby-mhz - instrumentation/comm[0]/volume - instrumentation/comm[0]/test-btn - - instrumentation/nav[0]/frq-swap-btn - instrumentation/nav[0]/frequencies/selected-mhz - instrumentation/nav[0]/frequencies/standby-mhz - instrumentation/nav[0]/volume - instrumentation/nav[0]/audio-btn - - instrumentation/comm[0]/dimming-norm - - - kx165.ac - - - CommKnobs - CommKHz - CommMHz - CommToggle - CommVolume - CommStby - CommStby100K - CommStby100M - CommStby10K - CommStby10M - CommStby1M - CommStbyDot - CommUse - CommUse100K - CommUse100M - CommUse10K - CommUse10M - CommUse1M - CommUseDot - NavKnobs - NavKHz - NavMHz - NavToggle - NavVolume - NavStby - NavStby100K - NavStby100M - NavStby10K - NavStby10M - NavStby1M - NavStbyDot - NavUse - NavUse100K - NavUse100M - NavUse10K - NavUse10M - NavUse1M - NavUseDot - Chassis - - - - select - CommUse - CommStby - - - - - - systems/electrical/outputs/comm[0] - 6.0 - - - - - - - select - NavUse - NavStby - - - - - - systems/electrical/outputs/comm[0] - 6.0 - - - - - - - Effects/model-transparent - CommUse - CommStby - NavUse - NavStby - - - - - - translate - CommToggle - - -0.004 - - 1 - 0 - 0 - - - - - textranslate - CommUse100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - - - translate - NavToggle - - -0.004 - - 1 - 0 - 0 - - - - - textranslate - NavUse100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - - - - translate - NavVolume - - 0.002 - - 1 - 0 - 0 - - - - - - - - - knob - CommVolume - - -270 - - 1 - 0 - 0 - -
- 0.0188947 - -0.0620002 - -0.0139999 -
- - - property-adjust - - 0.1 - 0.0 - 1.0 - false - - - property-assign - - 1 - - - - 0.05 - - - - - property-assign - - 0 - - - - 0.05 - - - - - - - - knob - CommKHz - - -360 - - 1 - 0 - 0 - -
- 0.0320882 - -0.022 - -0.012 -
- - - - - - property-adjust - - 0.025 - 0.0 - 1.0 - 0.025 - true - decimal - - - - - - knob - CommMHz - - -7 - - 1 - 0 - 0 - -
- 0.0320882 - -0.022 - -0.012 -
- - - - - - property-adjust - - 1 - 118.0 - 137.0 - true - integer - - - - - - pick - CommToggle - true - - - false - - property-assign - - 1 - - - property-swap - - - - - - property-assign - - 0 - - - - - - - - - knob - NavVolume - - -270 - - 1 - 0 - 0 - -
- 0.0188946 - 0.0180001 - -0.0139999 -
- - - property-adjust - - 0.1 - 0.0 - 1.0 - false - - - - - - knob - NavKHz - - -360 - - 1 - 0 - 0 - -
- 0.0320882 - 0.058 - -0.012 -
- - - - - - property-adjust - - 0.025 - 0.0 - 1.0 - true - decimal - - - - - - knob - NavMHz - - -7 - - 1 - 0 - 0 - -
- 0.0320882 - 0.058 - -0.012 -
- - - - - - property-adjust - - 1 - 108.0 - 118.0 - true - - - - - - pick - NavToggle - true - - - false - - property-assign - - 1 - - - property-swap - - - - - - property-assign - - 0 - - - - - - - - - textosg - literal - COMM 1 / NAV 1 - true - Helvetica.txf - 0.014 - 1.0 - yz-plane - 0.06 - 0.15 - - 64 - 64 - - center-center - - 0.015 - 0.000 - 0.015 - - - - - material - textosg - - 0.8 - 0.8 - 0.0 - - - - - select - textosg - - sim/panel-hotspots - - - - - + + + + + + + instrumentation/comm[0]/serviceable + instrumentation/nav[0]/serviceable + instrumentation/nav[0]/power-btn + instrumentation/comm[0]/power-btn + + instrumentation/comm[0]/frq-swap-btn + instrumentation/comm[0]/frequencies/selected-mhz + instrumentation/comm[0]/frequencies/standby-mhz + instrumentation/comm[0]/volume + instrumentation/comm[0]/test-btn + + instrumentation/nav[0]/frq-swap-btn + instrumentation/nav[0]/frequencies/selected-mhz + instrumentation/nav[0]/frequencies/standby-mhz + instrumentation/nav[0]/volume + instrumentation/nav[0]/audio-btn + + instrumentation/comm[0]/dimming-norm + + + kx165.ac + + + CommKnobs + CommKHz + CommMHz + CommToggle + CommVolume + CommStby + CommStby100K + CommStby100M + CommStby10K + CommStby10M + CommStby1M + CommStbyDot + CommUse + CommUse100K + CommUse100M + CommUse10K + CommUse10M + CommUse1M + CommUseDot + NavKnobs + NavKHz + NavMHz + NavToggle + NavVolume + NavStby + NavStby100K + NavStby100M + NavStby10K + NavStby10M + NavStby1M + NavStbyDot + NavUse + NavUse100K + NavUse100M + NavUse10K + NavUse10M + NavUse1M + NavUseDot + Chassis + + + + material + CommKnobs + CommKHz + CommMHz + CommToggle + CommVolume + CommStby + CommStby100K + CommStby100M + CommStby10K + CommStby10M + CommStby1M + CommStbyDot + CommUse + CommUse100K + CommUse100M + CommUse10K + CommUse10M + CommUse1M + CommUseDot + NavKnobs + NavKHz + NavMHz + NavToggle + NavVolume + NavStby + NavStby100K + NavStby100M + NavStby10K + NavStby10M + NavStby1M + NavStbyDot + NavUse + NavUse100K + NavUse100M + NavUse10K + NavUse10M + NavUse1M + NavUseDot + Chassis + + /sim/instrumentation/comm[0] + texture-file + + + + select + CommUse + CommStby + + + + + + systems/electrical/outputs/comm[0] + 6.0 + + + + + + + select + NavUse + NavStby + + + + + + systems/electrical/outputs/comm[0] + 6.0 + + + + + + + Effects/model-transparent + CommUse + CommStby + NavUse + NavStby + + + + + + translate + CommToggle + + -0.004 + + 1 + 0 + 0 + + + + + textranslate + CommUse100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + + + translate + NavToggle + + -0.004 + + 1 + 0 + 0 + + + + + textranslate + NavUse100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + + + + translate + NavVolume + + 0.002 + + 1 + 0 + 0 + + + + + + + + + knob + CommVolume + + -270 + + 1 + 0 + 0 + +
+ 0.0188947 + -0.0620002 + -0.0139999 +
+ + + property-adjust + + 0.1 + 0.0 + 1.0 + false + + + property-assign + + 1 + + + + 0.05 + + + + + property-assign + + 0 + + + + 0.05 + + + + + + + + knob + CommKHz + + -360 + + 1 + 0 + 0 + +
+ 0.0320882 + -0.022 + -0.012 +
+ + + + + + property-adjust + + 0.025 + 0.0 + 1.0 + 0.025 + true + decimal + + + + + + knob + CommMHz + + -7 + + 1 + 0 + 0 + +
+ 0.0320882 + -0.022 + -0.012 +
+ + + + + + property-adjust + + 1 + 118.0 + 137.0 + true + integer + + + + + + pick + CommToggle + true + + + false + + property-assign + + 1 + + + property-swap + + + + + + property-assign + + 0 + + + + + + + + + knob + NavVolume + + -270 + + 1 + 0 + 0 + +
+ 0.0188946 + 0.0180001 + -0.0139999 +
+ + + property-adjust + + 0.1 + 0.0 + 1.0 + false + + + + + + knob + NavKHz + + -360 + + 1 + 0 + 0 + +
+ 0.0320882 + 0.058 + -0.012 +
+ + + + + + property-adjust + + 0.025 + 0.0 + 1.0 + true + decimal + + + + + + knob + NavMHz + + -7 + + 1 + 0 + 0 + +
+ 0.0320882 + 0.058 + -0.012 +
+ + + + + + property-adjust + + 1 + 108.0 + 118.0 + true + + + + + + pick + NavToggle + true + + + false + + property-assign + + 1 + + + property-swap + + + + + + property-assign + + 0 + + + + + + + + + textosg + literal + COMM 1 / NAV 1 + true + Helvetica.txf + 0.014 + 1.0 + yz-plane + 0.06 + 0.15 + + 64 + 64 + + center-center + + 0.015 + 0.000 + 0.015 + + + + + material + textosg + + 0.8 + 0.8 + 0.0 + + + + + select + textosg + + sim/panel-hotspots + + + + + \ No newline at end of file diff --git a/Aircraft/Instruments-3d/kx165/kx165-2.xml b/Aircraft/Instruments-3d/kx165/kx165-2.xml index 9bb7c0dce..3c6c339c7 100644 --- a/Aircraft/Instruments-3d/kx165/kx165-2.xml +++ b/Aircraft/Instruments-3d/kx165/kx165-2.xml @@ -1,757 +1,803 @@ - - - - - - - instrumentation/comm[1]/serviceable - instrumentation/nav[1]/serviceable - instrumentation/nav[1]/power-btn - instrumentation/comm[1]/power-btn - - instrumentation/comm[1]/frq-swap-btn - instrumentation/comm[1]/frequencies/selected-mhz - instrumentation/comm[1]/frequencies/standby-mhz - instrumentation/comm[1]/volume - instrumentation/comm[1]/test-btn - - instrumentation/nav[1]/frq-swap-btn - instrumentation/nav[1]/frequencies/selected-mhz - instrumentation/nav[1]/frequencies/standby-mhz - instrumentation/nav[1]/volume - instrumentation/nav[1]/audio-btn - - instrumentation/comm[1]/dimming-norm - - - kx165.ac - - - CommKnobs - CommKHz - CommMHz - CommToggle - CommVolume - CommStby - CommStby100K - CommStby100M - CommStby10K - CommStby10M - CommStby1M - CommStbyDot - CommUse - CommUse100K - CommUse100M - CommUse10K - CommUse10M - CommUse1M - CommUseDot - NavKnobs - NavKHz - NavMHz - NavToggle - NavVolume - NavStby - NavStby100K - NavStby100M - NavStby10K - NavStby10M - NavStby1M - NavStbyDot - NavUse - NavUse100K - NavUse100M - NavUse10K - NavUse10M - NavUse1M - NavUseDot - Chassis - - - - select - CommUse - CommStby - - - - - - systems/electrical/outputs/comm[1] - 6.0 - - - - - - - select - NavUse - NavStby - - - - - - systems/electrical/outputs/comm[1] - 6.0 - - - - - - - Effects/model-transparent - CommUse - CommStby - NavUse - NavStby - - - - - - translate - CommToggle - - -0.004 - - 1 - 0 - 0 - - - - - textranslate - CommUse100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommUse10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - CommStby10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - - - translate - NavToggle - - -0.004 - - 1 - 0 - 0 - - - - - textranslate - NavUse100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavUse10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby100M - - 100 - 0.001 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby10M - - 10 - 0.01 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby1M - - 1 - 0.1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby100K - - 0.1 - 1 - 0.0001 - - 1 - 0 - 0 - - - - - textranslate - NavStby10K - - 0.01 - 10 - 0.0001 - - 1 - 0 - 0 - - - - - - - translate - NavVolume - - 0.002 - - 1 - 0 - 0 - - - - - - - - - knob - CommVolume - - -270 - - 1 - 0 - 0 - -
- 0.0188947 - -0.0620002 - -0.0139999 -
- - - property-adjust - - 0.1 - 0.0 - 1.0 - false - - - property-assign - - 1 - - - - 0.05 - - - - - property-assign - - 0 - - - - 0.05 - - - - - - - - knob - CommKHz - - -360 - - 1 - 0 - 0 - -
- 0.0320882 - -0.022 - -0.012 -
- - - - - - property-adjust - - 0.025 - 0.0 - 1.0 - 0.025 - true - decimal - - - - - - knob - CommMHz - - -7 - - 1 - 0 - 0 - -
- 0.0320882 - -0.022 - -0.012 -
- - - - - - property-adjust - - 1 - 118.0 - 137.0 - true - integer - - - - - - pick - CommToggle - true - - - false - - property-assign - - 1 - - - property-swap - - - - - - property-assign - - 0 - - - - - - - - - knob - NavVolume - - -270 - - 1 - 0 - 0 - -
- 0.0188946 - 0.0180001 - -0.0139999 -
- - - property-adjust - - 0.1 - 0.0 - 1.0 - false - - - - - - knob - NavKHz - - -360 - - 1 - 0 - 0 - -
- 0.0320882 - 0.058 - -0.012 -
- - - - - - property-adjust - - 0.025 - 0.0 - 1.0 - true - decimal - - - - - - knob - NavMHz - - -7 - - 1 - 0 - 0 - -
- 0.0320882 - 0.058 - -0.012 -
- - - - - - property-adjust - - 1 - 108.0 - 118.0 - true - - - - - - pick - NavToggle - true - - - false - - property-assign - - 1 - - - property-swap - - - - - - property-assign - - 0 - - - - - - - - - textosg - literal - COMM 2 / NAV 2 - true - Helvetica.txf - 0.014 - 1.0 - yz-plane - 0.06 - 0.15 - - 64 - 64 - - center-center - - 0.015 - 0.000 - 0.015 - - - - - material - textosg - - 0.8 - 0.8 - 0.0 - - - - - select - textosg - - sim/panel-hotspots - - - - - + + + + + + + instrumentation/comm[1]/serviceable + instrumentation/nav[1]/serviceable + instrumentation/nav[1]/power-btn + instrumentation/comm[1]/power-btn + + instrumentation/comm[1]/frq-swap-btn + instrumentation/comm[1]/frequencies/selected-mhz + instrumentation/comm[1]/frequencies/standby-mhz + instrumentation/comm[1]/volume + instrumentation/comm[1]/test-btn + + instrumentation/nav[1]/frq-swap-btn + instrumentation/nav[1]/frequencies/selected-mhz + instrumentation/nav[1]/frequencies/standby-mhz + instrumentation/nav[1]/volume + instrumentation/nav[1]/audio-btn + + instrumentation/comm[1]/dimming-norm + + + kx165.ac + + + CommKnobs + CommKHz + CommMHz + CommToggle + CommVolume + CommStby + CommStby100K + CommStby100M + CommStby10K + CommStby10M + CommStby1M + CommStbyDot + CommUse + CommUse100K + CommUse100M + CommUse10K + CommUse10M + CommUse1M + CommUseDot + NavKnobs + NavKHz + NavMHz + NavToggle + NavVolume + NavStby + NavStby100K + NavStby100M + NavStby10K + NavStby10M + NavStby1M + NavStbyDot + NavUse + NavUse100K + NavUse100M + NavUse10K + NavUse10M + NavUse1M + NavUseDot + Chassis + + + + material + CommKnobs + CommKHz + CommMHz + CommToggle + CommVolume + CommStby + CommStby100K + CommStby100M + CommStby10K + CommStby10M + CommStby1M + CommStbyDot + CommUse + CommUse100K + CommUse100M + CommUse10K + CommUse10M + CommUse1M + CommUseDot + NavKnobs + NavKHz + NavMHz + NavToggle + NavVolume + NavStby + NavStby100K + NavStby100M + NavStby10K + NavStby10M + NavStby1M + NavStbyDot + NavUse + NavUse100K + NavUse100M + NavUse10K + NavUse10M + NavUse1M + NavUseDot + Chassis + + /sim/instrumentation/comm[1] + texture-file + + + + select + CommUse + CommStby + + + + + + systems/electrical/outputs/comm[1] + 6.0 + + + + + + + select + NavUse + NavStby + + + + + + systems/electrical/outputs/comm[1] + 6.0 + + + + + + + Effects/model-transparent + CommUse + CommStby + NavUse + NavStby + + + + + + translate + CommToggle + + -0.004 + + 1 + 0 + 0 + + + + + textranslate + CommUse100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommUse10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + CommStby10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + + + translate + NavToggle + + -0.004 + + 1 + 0 + 0 + + + + + textranslate + NavUse100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavUse10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby100M + + 100 + 0.001 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby10M + + 10 + 0.01 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby1M + + 1 + 0.1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby100K + + 0.1 + 1 + 0.0001 + + 1 + 0 + 0 + + + + + textranslate + NavStby10K + + 0.01 + 10 + 0.0001 + + 1 + 0 + 0 + + + + + + + translate + NavVolume + + 0.002 + + 1 + 0 + 0 + + + + + + + + + knob + CommVolume + + -270 + + 1 + 0 + 0 + +
+ 0.0188947 + -0.0620002 + -0.0139999 +
+ + + property-adjust + + 0.1 + 0.0 + 1.0 + false + + + property-assign + + 1 + + + + 0.05 + + + + + property-assign + + 0 + + + + 0.05 + + + + + + + + knob + CommKHz + + -360 + + 1 + 0 + 0 + +
+ 0.0320882 + -0.022 + -0.012 +
+ + + + + + property-adjust + + 0.025 + 0.0 + 1.0 + 0.025 + true + decimal + + + + + + knob + CommMHz + + -7 + + 1 + 0 + 0 + +
+ 0.0320882 + -0.022 + -0.012 +
+ + + + + + property-adjust + + 1 + 118.0 + 137.0 + true + integer + + + + + + pick + CommToggle + true + + + false + + property-assign + + 1 + + + property-swap + + + + + + property-assign + + 0 + + + + + + + + + knob + NavVolume + + -270 + + 1 + 0 + 0 + +
+ 0.0188946 + 0.0180001 + -0.0139999 +
+ + + property-adjust + + 0.1 + 0.0 + 1.0 + false + + + + + + knob + NavKHz + + -360 + + 1 + 0 + 0 + +
+ 0.0320882 + 0.058 + -0.012 +
+ + + + + + property-adjust + + 0.025 + 0.0 + 1.0 + true + decimal + + + + + + knob + NavMHz + + -7 + + 1 + 0 + 0 + +
+ 0.0320882 + 0.058 + -0.012 +
+ + + + + + property-adjust + + 1 + 108.0 + 118.0 + true + + + + + + pick + NavToggle + true + + + false + + property-assign + + 1 + + + property-swap + + + + + + property-assign + + 0 + + + + + + + + + textosg + literal + COMM 2 / NAV 2 + true + Helvetica.txf + 0.014 + 1.0 + yz-plane + 0.06 + 0.15 + + 64 + 64 + + center-center + + 0.015 + 0.000 + 0.015 + + + + + material + textosg + + 0.8 + 0.8 + 0.0 + + + + + select + textosg + + sim/panel-hotspots + + + + + \ No newline at end of file diff --git a/Effects/tree.eff b/Effects/tree.eff index b12badec0..bdd18cdc7 100644 --- a/Effects/tree.eff +++ b/Effects/tree.eff @@ -41,19 +41,16 @@ /sim/rendering/shaders/skydome /sim/rendering/random-vegetation - - - 2.0 - - - - GL_ARB_shader_objects - GL_ARB_shading_language_100 - GL_ARB_vertex_shader - GL_ARB_fragment_shader - GL_ARB_multisample - - + /sim/rendering/multi-sample-buffers + + 1.0 + /sim/rendering/multi-samples + + GL_ARB_shader_objects + GL_ARB_shading_language_100 + GL_ARB_vertex_shader + GL_ARB_fragment_shader + GL_ARB_multisample @@ -328,6 +325,11 @@ /sim/rendering/random-vegetation + /sim/rendering/multi-sample-buffers + + 1.0 + /sim/rendering/multi-samples + GL_ARB_multisample GL_ARB_vertex_shader GL_ARB_fragment_shader diff --git a/Nasal/multiplayer.nas b/Nasal/multiplayer.nas index 546df7e41..4be079a17 100644 --- a/Nasal/multiplayer.nas +++ b/Nasal/multiplayer.nas @@ -160,10 +160,11 @@ var dialog = { # # "private" var font = { name: "FIXED_8x13" }; - me.header = ["chat", " callsign", "model", "brg", func dialog.dist_hdr, func dialog.alt_hdr ~ " ", "ignore" ~ " "]; + me.header = ["chat", " callsign"," code"," model", " brg", func dialog.dist_hdr, func dialog.alt_hdr ~ " ", "ignore" ~ " "]; me.columns = [ { type: "button", legend: "", halign: "right", callback: "multiplayer.compose_message", "pref-height": 14, "pref-width": 14}, { type: "text", property: "callsign", format: " %s", label: "-----------", halign: "fill" }, + { type: "text", property: "id-code", format: " %s", label: "-----", halign: "fill" }, { type: "text", property: "model-short", format: "%s", label: "--------------", halign: "fill" }, { type: "text", property: "bearing-to", format: " %3.0f", label: "----", halign: "right", font: font }, { type: "text", property: func dialog.dist_node, format:" %8.2f", label: "---------", halign: "right", font: font }, @@ -240,22 +241,22 @@ var dialog = { var color = mp.node.getNode("model-installed").getValue() ? me.fg[odd = !odd] : me.fg[2]; foreach (var column; me.columns) { var w = nil; - if (column.type == "button") { - w = content.addChild("button"); - w.node.setValues(column); - w.setBinding("nasal", column.callback ~ "(\"" ~ mp.callsign ~ ", \");"); + if (column.type == "button") { + w = content.addChild("button"); + w.node.setValues(column); + w.setBinding("nasal", column.callback ~ "(\"" ~ mp.callsign ~ ", \");"); w.node.setValues({ row: row, col: col}); - } else { - var p = typeof(column.property) == "func" ? column.property() : column.property; - if (column.type == "text") { - w = content.addChild("text"); - w.node.setValues(column); - } elsif (column.type == "checkbox") { - w = content.addChild("checkbox"); - w.setBinding("nasal", column.callback ~ "(getprop(\"" ~ mp.root ~ "/" ~ column.argprop ~ "\"))"); - } + } else { + var p = typeof(column.property) == "func" ? column.property() : column.property; + if (column.type == "text") { + w = content.addChild("text"); + w.node.setValues(column); + } elsif (column.type == "checkbox") { + w = content.addChild("checkbox"); + w.setBinding("nasal", column.callback ~ "(getprop(\"" ~ mp.root ~ "/" ~ column.argprop ~ "\"))"); + } w.node.setValues({ row: row, col: col, live: 1, property: mp.root ~ "/" ~ p }); - } + } w.setColor(color[0], color[1], color[2], color[3]); col += 1; } @@ -279,7 +280,11 @@ var dialog = { var z = n.getNode("position/global-z").getValue(); var ac = geo.Coord.new().set_xyz(x, y, z); var distance = nil; + var idcode = "----"; + idcode = me.IDCode(n.getNode("instrumentation/transponder/transmitted-id").getValue()); + call(func distance = self.distance_to(ac), nil, var err = []); + if ((size(err))or(distance==nil)) { # Oops, have errors. Bogus position data (and distance==nil). if (me.cs_warnings[mp.callsign]!=1) { @@ -301,6 +306,7 @@ var dialog = { "distance-to-nm": distance * M2NM, "position/altitude-m": n.getNode("position/altitude-ft").getValue() * FT2M, "controls/invisible": contains(ignore, mp.callsign), + "id-code": idcode }); } } @@ -364,6 +370,24 @@ var dialog = { else me.del(); }, + IDCode: func(code){ + + var idcode= "----"; + + if (code != nil ) + { + if (code < 0) + { + idcode = "----"; + } + else + { + idcode = sprintf("%04d", code); + } + } + + return idcode; + }, }; @@ -373,7 +397,7 @@ var dialog = { # "/sim/signals/multiplayer-updated" whenever an aircraft # joined or left. Available data containers are: # -# multiplayer.model.data: hash, key := /ai/models/* path +# multiplayer.model.data: hash, key := /ai/models/~ path # multiplayer.model.callsign hash, key := callsign # multiplayer.model.list vector, sorted alphabetically (ASCII, case insensitive) # diff --git a/Textures/Trees/coniferous.dds b/Textures/Trees/coniferous.dds index 55ff01c16..14f3928f4 100644 Binary files a/Textures/Trees/coniferous.dds and b/Textures/Trees/coniferous.dds differ diff --git a/Textures/Trees/coniferous.png b/Textures/Trees/coniferous.png index 7d8582d2a..405cfa6a2 100644 Binary files a/Textures/Trees/coniferous.png and b/Textures/Trees/coniferous.png differ diff --git a/Textures/Trees/deciduous.dds b/Textures/Trees/deciduous.dds index 713c1496d..3a80cdee4 100644 Binary files a/Textures/Trees/deciduous.dds and b/Textures/Trees/deciduous.dds differ diff --git a/Textures/Trees/deciduous.png b/Textures/Trees/deciduous.png index 588df5403..2ae60b10b 100644 Binary files a/Textures/Trees/deciduous.png and b/Textures/Trees/deciduous.png differ diff --git a/Textures/Trees/mixed.dds b/Textures/Trees/mixed.dds index 33cf0a806..b6c3f12b9 100644 Binary files a/Textures/Trees/mixed.dds and b/Textures/Trees/mixed.dds differ diff --git a/Textures/Trees/mixed.png b/Textures/Trees/mixed.png index 58bf7ac38..5badb6ec6 100644 Binary files a/Textures/Trees/mixed.png and b/Textures/Trees/mixed.png differ diff --git a/Textures/Trees/tropical-alt.dds b/Textures/Trees/tropical-alt.dds index bf6581d2a..3b19e349e 100644 Binary files a/Textures/Trees/tropical-alt.dds and b/Textures/Trees/tropical-alt.dds differ diff --git a/Textures/Trees/tropical-alt.png b/Textures/Trees/tropical-alt.png index 4fad49e3d..0c8828132 100644 Binary files a/Textures/Trees/tropical-alt.png and b/Textures/Trees/tropical-alt.png differ diff --git a/Textures/Trees/tropical.dds b/Textures/Trees/tropical.dds index 6a783349c..cea985902 100644 Binary files a/Textures/Trees/tropical.dds and b/Textures/Trees/tropical.dds differ diff --git a/Textures/Trees/tropical.png b/Textures/Trees/tropical.png index 41623f68f..7eabc3c62 100644 Binary files a/Textures/Trees/tropical.png and b/Textures/Trees/tropical.png differ diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml index b12171d17..5d02efa8d 100644 --- a/gui/dialogs/radios.xml +++ b/gui/dialogs/radios.xml @@ -2,740 +2,762 @@ - radios - 550 - false - - - - - - - - vbox + radios + 550 + false - - hbox - 1 + + + - - + var poweroften = [1, 10, 100, 1000]; + var idcode = getprop('/instrumentation/transponder/id-code'); - 1 + if (idcode != nil) + { + for (var i = 0; i < 4 ; i = i+1) + { + setprop("/instrumentation/transponder/inputs/digit[" ~ i ~ "]", math.mod(idcode/poweroften[i], 10) ); + } + } - - + ]]> + + - + vbox - - table + + hbox + + 1 + - - - 0 - 1 - - + + + - - 0 - 4 - - + + 1 + - - 0 - 6 - - + + - - - 0 - 7 - - + - - 1 - 0 - right - - + + table - - com1-selected - 1 - 1 - 75 - 25 - - true - /instrumentation/comm[0]/frequencies/selected-mhz - - dialog-apply - com1-selected - - + + + 0 + 1 + + - + + 0 + 4 + + - - com1-standby - 1 - 4 - 75 - 25 - - true - /instrumentation/comm[0]/frequencies/standby-mhz - - dialog-apply - com1-standby - - + + 0 + 6 + + - - 2 - 0 - right - - + + + 0 + 7 + + - - com2-selected - 2 - 1 - 75 - 25 - - true - /instrumentation/comm[1]/frequencies/selected-mhz - - dialog-apply - com2-selected - - + + 1 + 0 + right + + - + + com1-selected + 1 + 1 + 75 + 25 + + true + /instrumentation/comm[0]/frequencies/selected-mhz + + dialog-apply + com1-selected + + - - com2-standby - 2 - 4 - 75 - 25 - - true - /instrumentation/comm[1]/frequencies/standby-mhz - - dialog-apply - com2-standby - - + - - 3 - 0 - right - - + + com1-standby + 1 + 4 + 75 + 25 + + true + /instrumentation/comm[0]/frequencies/standby-mhz + + dialog-apply + com1-standby + + - - nav1-selected - 3 - 1 - 75 - 25 - - true - /instrumentation/nav[0]/frequencies/selected-mhz - - dialog-apply - nav1-selected - - + + 2 + 0 + right + + - + + com2-selected + 2 + 1 + 75 + 25 + + true + /instrumentation/comm[1]/frequencies/selected-mhz + + dialog-apply + com2-selected + + - - nav1-standby - 3 - 4 - 75 - 25 - - true - /instrumentation/nav[0]/frequencies/standby-mhz - - dialog-apply - nav1-standby - - + - - nav1-radial - 3 - 6 - 75 - 25 - - true - /instrumentation/nav[0]/radials/selected-deg - - dialog-apply - nav1-radial - - + + com2-standby + 2 + 4 + 75 + 25 + + true + /instrumentation/comm[1]/frequencies/standby-mhz + + dialog-apply + com2-standby + + - - 4 - 0 - right - - + + 3 + 0 + right + + - - nav2-selected - 4 - 1 - 75 - 25 - - true - /instrumentation/nav[1]/frequencies/selected-mhz - - dialog-apply - nav2-selected - - + + nav1-selected + 3 + 1 + 75 + 25 + + true + /instrumentation/nav[0]/frequencies/selected-mhz + + dialog-apply + nav1-selected + + - + - - nav2-standby - 4 - 4 - 75 - 25 - - true - /instrumentation/nav[1]/frequencies/standby-mhz - - dialog-apply - nav2-standby - - + + nav1-standby + 3 + 4 + 75 + 25 + + true + /instrumentation/nav[0]/frequencies/standby-mhz + + dialog-apply + nav1-standby + + - - nav2-radial - 4 - 6 - 75 - 25 - - true - /instrumentation/nav[1]/radials/selected-deg - - dialog-apply - nav2-radial - - + + nav1-radial + 3 + 6 + 75 + 25 + + true + /instrumentation/nav[0]/radials/selected-deg + + dialog-apply + nav1-radial + + - - 5 - 0 - right - - + + 4 + 0 + right + + - - adf-selected - 5 - 1 - 75 - 25 - - true - /instrumentation/adf/frequencies/selected-khz - - dialog-apply - adf-selected - - + + nav2-selected + 4 + 1 + 75 + 25 + + true + /instrumentation/nav[1]/frequencies/selected-mhz + + dialog-apply + nav2-selected + + - + - - adf-standby - 5 - 4 - 75 - 25 - - true - /instrumentation/adf/frequencies/standby-khz - - dialog-apply - adf-standby - - + + nav2-standby + 4 + 4 + 75 + 25 + + true + /instrumentation/nav[1]/frequencies/standby-mhz + + dialog-apply + nav2-standby + + - - adf-radial - 5 - 6 - 75 - 25 - - true - /instrumentation/adf/rotation-deg - - dialog-apply - adf-radial - - + + nav2-radial + 4 + 6 + 75 + 25 + + true + /instrumentation/nav[1]/radials/selected-deg + + dialog-apply + nav2-radial + + - - 6 - 0 - right - - + + 5 + 0 + right + + - - dme-selected - 6 - 1 - 75 - 25 - - true - /instrumentation/dme/frequencies/selected-mhz - - dialog-apply - dme-selected - - + + adf-selected + 5 + 1 + 75 + 25 + + true + /instrumentation/adf/frequencies/selected-khz + + dialog-apply + adf-selected + + + + + + + adf-standby + 5 + 4 + 75 + 25 + + true + /instrumentation/adf/frequencies/standby-khz + + dialog-apply + adf-standby + + + + + adf-radial + 5 + 6 + 75 + 25 + + true + /instrumentation/adf/rotation-deg + + dialog-apply + adf-radial + + + + + 6 + 0 + right + + + + + dme-selected + 6 + 1 + 75 + 25 + + true + /instrumentation/dme/frequencies/selected-mhz + + dialog-apply + dme-selected + + - + - + - hbox + hbox - - - + + + - - tacan-1 - 45 - 25 - true - /instrumentation/tacan/frequencies/selected-channel[1] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - - dialog-apply - tacan-1 - - - - - tacan-2 - 45 - 25 - true - /instrumentation/tacan/frequencies/selected-channel[2] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - - dialog-apply - tacan-2 - - + + tacan-1 + 45 + 25 + true + /instrumentation/tacan/frequencies/selected-channel[1] + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + dialog-apply + tacan-1 + + + + + tacan-2 + 45 + 25 + true + /instrumentation/tacan/frequencies/selected-channel[2] + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + dialog-apply + tacan-2 + + - - tacan-3 - 45 - 25 - true - /instrumentation/tacan/frequencies/selected-channel[3] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - - dialog-apply - tacan-3 - - + + tacan-3 + 45 + 25 + true + /instrumentation/tacan/frequencies/selected-channel[3] + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + + dialog-apply + tacan-3 + + - - tacan-4 - 45 - 25 - true - /instrumentation/tacan/frequencies/selected-channel[4] - X - Y - - dialog-apply - tacan-4 - - + + tacan-4 + 45 + 25 + true + /instrumentation/tacan/frequencies/selected-channel[4] + X + Y + + dialog-apply + tacan-4 + + - - true - + + true + - + + + + + + - - - - - - hbox - - - - - - Tponder-1 - 45 - 25 - true - /instrumentation/transponder/inputs/digit[3] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - dialog-apply - Tponder-1 - - - - - Tponder-2 - 45 - 25 - true - /instrumentation/transponder/inputs/digit[2] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - dialog-apply - Tponder-2 - - - - Tponder-3 - 45 - 25 - true - /instrumentation/transponder/inputs/digit[1] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - dialog-apply - Tponder-3 - - - - Tponder-4 - 45 - 25 - true - /instrumentation/transponder/inputs/digit[0] - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - dialog-apply - Tponder-4 - - - - true - + + hbox + + + - - - - - - Tponder-5 - 120 - 25 - true - /sim/gui/dialogs/radios/transponder-mode - OFF - STANDBY - TEST - GROUND - ON - ALTITUDE - - dialog-apply - Tponder-5 - - - nasal - - - - - - - - - - - hbox - 6 - - true - + ]]> + + + - + + + - - true - - + + + + hbox + 6 + + true + + + + + + true + +