diff --git a/AircraftConfig/welcome.xml b/AircraftConfig/welcome.xml index b9aab4fe..c5873359 100644 --- a/AircraftConfig/welcome.xml +++ b/AircraftConfig/welcome.xml @@ -37,7 +37,7 @@ center - + center diff --git a/Models/FlightDeck/a320.flightdeck.xml b/Models/FlightDeck/a320.flightdeck.xml index 32b6e638..5ae457db 100644 --- a/Models/FlightDeck/a320.flightdeck.xml +++ b/Models/FlightDeck/a320.flightdeck.xml @@ -413,7 +413,7 @@ LECAM - Aircraft/A320Family/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml + Aircraft/A320Family/Models/Instruments/Lower-ECAM/Lower-ECAM.xml -0.53631 0 diff --git a/Models/FlightDeck/res/horizon.png b/Models/FlightDeck/res/horizon.png index 2a214424..3e1049c6 100644 Binary files a/Models/FlightDeck/res/horizon.png and b/Models/FlightDeck/res/horizon.png differ diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml deleted file mode 100644 index f7ac6f6d..00000000 --- a/Models/Instruments/Lower-ECAM/Lower-ECAM-EIS1.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - res-EIS1/empty.ac - - - - - /instrumentation/efis/ecam/display-mode - ENG - - - eng-eis1.xml - - - - - - /instrumentation/efis/ecam/display-mode - APU - - - apu.xml - - - - osgtxt-common.xml - - - diff --git a/Models/Instruments/Lower-ECAM/Lower-ECAM.xml b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml new file mode 100644 index 00000000..98251b51 --- /dev/null +++ b/Models/Instruments/Lower-ECAM/Lower-ECAM.xml @@ -0,0 +1,46 @@ + + + + res/empty.ac + + + + + /options/EIS2 + + /instrumentation/efis/ecam/display-mode + ENG + + + + eng-eis1.xml + + + + + + /options/EIS2 + + /instrumentation/efis/ecam/display-mode + ENG + + + + eng-eis2.xml + + + + + + /instrumentation/efis/ecam/display-mode + APU + + + apu.xml + + + + osgtxt-common.xml + + + diff --git a/Models/Instruments/Lower-ECAM/eng-eis2.xml b/Models/Instruments/Lower-ECAM/eng-eis2.xml new file mode 100644 index 00000000..5bb3253f --- /dev/null +++ b/Models/Instruments/Lower-ECAM/eng-eis2.xml @@ -0,0 +1,348 @@ + + + + res-EIS2/eng/eng.ac + + + + + + rotate + qt1 + /engines/engine[0]/oil-qt-actual + + 0-90 + 25 90 + +
+ 0 + -0.03862 + 0.03153 +
+ + -1 + 0 + 0 + +
+ + + rotate + qt2 + /engines/engine[1]/oil-qt-actual + + 0-90 + 25 90 + +
+ 0 + 0.03863 + 0.03153 +
+ + -1 + 0 + 0 + +
+ + + + rotate + psi1 + psi1r + /engines/engine[0]/oil-psi-actual + + 0-90 + 150 0 + 300 90 + +
+ 0 + -0.03862 + 0.01068 +
+ + -1 + 0 + 0 + +
+ + + select + psi1 + txt.psi1 + + + /engines/engine[0]/oil-psi-actual + 60 + + + + + + select + psi1r + txt.psi1r + + + /engines/engine[0]/oil-psi-actual + 60 + + + + + + rotate + psi2 + psi2r + /engines/engine[1]/oil-psi-actual + + 0-90 + 150 0 + 300 90 + +
+ 0 + 0.03863 + 0.01068 +
+ + -1 + 0 + 0 + +
+ + + select + psi2 + txt.psi2 + + + /engines/engine[1]/oil-psi-actual + 60 + + + + + + select + psi2r + txt.psi2r + + + /engines/engine[1]/oil-psi-actual + 60 + + + + + + + + + txt.qty1 + + 0.0004 + -0.03862 + 0.033 + + center-center + yz-plane + number-value + %2.1f + /engines/engine/oil-qt-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + txt.qty2 + + 0.0004 + 0.03863 + 0.033 + + center-center + yz-plane + number-value + %2.1f + /engines/engine[1]/oil-qt-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + txt.psi1 + + 0.0004 + -0.03862 + 0.01208 + + center-center + yz-plane + number-value + %3.0f + /engines/engine/oil-psi-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + txt.psi2 + + 0.0004 + 0.03863 + 0.01208 + + center-center + yz-plane + number-value + %3.0f + /engines/engine[1]/oil-psi-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + txt.psi1r + + 0.0004 + -0.03862 + 0.01208 + + center-center + yz-plane + number-value + %3.0f + /engines/engine/oil-psi-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + txt.psi2r + + 0.0004 + 0.03863 + 0.01208 + + center-center + yz-plane + number-value + %3.0f + /engines/engine[1]/oil-psi-actual + false + helvetica_bold.txf + true + false + false + 0.005 + + 32 + 32 + + + + + + + + material + txt.qty1 + txt.qty2 + txt.psi1 + txt.psi2 + + 0 + 0.543 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0.543 + 0 + + + + + + material + txt.psi1r + txt.psi2r + + 1 + 0 + 0 + + + 0 + 0 + 0 + + + 0 + 0 + 0 + + + 1 + 0 + 0 + + + +
diff --git a/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.ac b/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.ac index a4ae3932..25f9d9c9 100644 --- a/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.ac +++ b/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.ac @@ -4,101 +4,17 @@ MATERIAL "ac3dmat1" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 1 1 1 shi 0 trans 0 OBJECT world kids 7 OBJECT poly -name "psi2r" -loc 0.000492332 0.00615884 -0.000827477 -data 10 -enginepane -texture "needler.png" -crease 30.000002 -numvert 4 -0 0.009191 0.000477958 -0 -0.00841424 0.000477958 -0 -0.00841424 -0.000478942 -0 0.009191 -0.000478942 -numsurf 1 -SURF 0x0 -mat 1 -refs 4 -3 1.00067 0.999407 -0 4.45843e-005 0.999407 -1 4.45843e-005 0.000756443 -2 1.00067 0.000756443 -kids 0 -OBJECT poly -name "psi1r" -loc 0.000492332 0.00615884 0.0555814 -data 10 -enginepane -texture "needler.png" -crease 30.000002 -numvert 4 -0 0.009191 -0.000478942 -0 -0.00841424 -0.000478942 -0 -0.00841424 0.000477958 -0 0.009191 0.000477958 -numsurf 1 -SURF 0x0 -mat 1 -refs 4 -0 1.00067 0.999407 -3 4.45843e-005 0.999407 -2 4.45843e-005 0.000756443 -1 1.00067 0.000756443 -kids 0 -OBJECT poly -name "psi2" -loc 0.000492332 0.00615884 -0.000827477 -data 10 -enginepane -texture "needle.png" -crease 30.000002 -numvert 4 -0 0.009191 -0.000478942 -0 -0.00841424 -0.000478942 -0 -0.00841424 0.000477958 -0 0.009191 0.000477958 -numsurf 1 -SURF 0x0 -mat 1 -refs 4 -0 1.00067 0.999407 -3 4.45843e-005 0.999407 -2 4.45843e-005 0.000756443 -1 1.00067 0.000756443 -kids 0 -OBJECT poly -name "psi1" -loc 0.000492332 0.00615884 0.0555814 -data 10 -enginepane -texture "needle.png" -crease 30.000002 -numvert 4 -0 0.009191 0.000477958 -0 -0.00841424 0.000477958 -0 -0.00841424 -0.000478942 -0 0.009191 -0.000478942 -numsurf 1 -SURF 0x0 -mat 1 -refs 4 -3 1.00067 0.999407 -0 4.45843e-005 0.999407 -1 4.45843e-005 0.000756443 -2 1.00067 0.000756443 -kids 0 -OBJECT poly name "qt2" -loc 0.000492332 0.0346585 -0.000827477 +loc 0.000492332 0.0449377 -0.0386285 data 10 enginepane texture "needle.png" crease 30.000002 numvert 4 -0 0.009191 0.000477958 -0 -0.00841424 0.000477958 -0 -0.00841424 -0.000478942 -0 0.009191 -0.000478942 +0 0.00407054 0.000477958 +0 -0.00372652 0.000477958 +0 -0.00372652 -0.000478942 +0 0.00407054 -0.000478942 numsurf 1 SURF 0x0 mat 1 @@ -110,16 +26,16 @@ refs 4 kids 0 OBJECT poly name "qt1" -loc 0.000492332 0.0346585 0.0555814 +loc 0.000492332 0.0449377 0.0386212 data 10 enginepane texture "needle.png" crease 30.000002 numvert 4 -0 0.009191 -0.000478942 -0 -0.00841424 -0.000478942 -0 -0.00841424 0.000477958 -0 0.009191 0.000477958 +0 0.00407054 -0.000478942 +0 -0.00372652 -0.000478942 +0 -0.00372652 0.000477958 +0 0.00407054 0.000477958 numsurf 1 SURF 0x0 mat 1 @@ -130,6 +46,90 @@ refs 4 1 1.00067 0.000756443 kids 0 OBJECT poly +name "psi2r" +loc 0.000492332 0.0240888 -0.0386285 +data 10 +enginepane +texture "needler.png" +crease 30.000002 +numvert 4 +0 0.00407054 0.000477958 +0 -0.00372652 0.000477958 +0 -0.00372652 -0.000478942 +0 0.00407054 -0.000478942 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +3 1.00067 0.999407 +0 4.45843e-005 0.999407 +1 4.45843e-005 0.000756443 +2 1.00067 0.000756443 +kids 0 +OBJECT poly +name "psi1r" +loc 0.000492332 0.0240888 0.0386212 +data 10 +enginepane +texture "needler.png" +crease 30.000002 +numvert 4 +0 0.00407054 -0.000478942 +0 -0.00372652 -0.000478942 +0 -0.00372652 0.000477958 +0 0.00407054 0.000477958 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +0 1.00067 0.999407 +3 4.45843e-005 0.999407 +2 4.45843e-005 0.000756443 +1 1.00067 0.000756443 +kids 0 +OBJECT poly +name "psi2" +loc 0.000492332 0.0240888 -0.0386285 +data 10 +enginepane +texture "needle.png" +crease 30.000002 +numvert 4 +0 0.00407054 -0.000478942 +0 -0.00372652 -0.000478942 +0 -0.00372652 0.000477958 +0 0.00407054 0.000477958 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +0 1.00067 0.999407 +3 4.45843e-005 0.999407 +2 4.45843e-005 0.000756443 +1 1.00067 0.000756443 +kids 0 +OBJECT poly +name "psi1" +loc 0.000492332 0.0240888 0.0386212 +data 10 +enginepane +texture "needle.png" +crease 30.000002 +numvert 4 +0 0.00407054 0.000477958 +0 -0.00372652 0.000477958 +0 -0.00372652 -0.000478942 +0 0.00407054 -0.000478942 +numsurf 1 +SURF 0x0 +mat 1 +refs 4 +3 1.00067 0.999407 +0 4.45843e-005 0.999407 +1 4.45843e-005 0.000756443 +2 1.00067 0.000756443 +kids 0 +OBJECT poly name "face" loc 1.6424e-005 -0.0851298 -0.51126 texture "eng.png" diff --git a/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.png b/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.png index f1bf5c58..5a842dc2 100644 Binary files a/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.png and b/Models/Instruments/Lower-ECAM/res-EIS2/eng/eng.png differ