diff --git a/Aircraft/Instruments-3d/alt/alt.ac b/Aircraft/Instruments-3d/alt/alt.ac index 843b380a3..7ea1df54c 100644 --- a/Aircraft/Instruments-3d/alt/alt.ac +++ b/Aircraft/Instruments-3d/alt/alt.ac @@ -2,8 +2,53 @@ AC3Db MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0 MATERIAL "illum" rgb 0.988889 0.988889 0.988889 amb 0.201149 0.201149 0.201149 emis 0.7 0.7 0.7 spec 0 0 0 shi 32 trans 0 MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.149 0.149 0.149 spec 0.502 0.502 0.502 shi 64 trans 0 +MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1 OBJECT world -kids 6 +kids 8 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-L" +loc -1.86265e-09 -0.023009 0.00619765 +crease 180.000000 +numvert 4 +0 -0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 0.00702053 0.0302027 +numsurf 1 +SURF 0x30 +mat 3 +refs 4 +3 0 1 +1 0 0 +0 0.125 0 +2 0.125 1 +kids 0 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-R" +loc -1.86265e-09 -0.023009 -0.00165454 +crease 180.000000 +numvert 4 +0 0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 -0.00702053 0.0226521 +numsurf 1 +SURF 0x30 +mat 3 +refs 4 +0 0 1 +2 0 0 +3 0.125 0 +1 0.125 1 +kids 0 OBJECT poly name "Needle10000" crease 45.000000 @@ -87,7 +132,7 @@ refs 3 kids 0 OBJECT poly name "Face" -texture "altimeter.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/altimeter.rgb" crease 45.000000 numvert 4 0 0.04 -0.04 @@ -108,7 +153,7 @@ name "inhg" loc -0.000238663 0.000547649 0.00323039 data 12 Cylinder.015 -texture "altimeter.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/altimeter.rgb" crease 30.000000 numvert 6 0.001139 -0.00614271 -0.0291783 @@ -136,7 +181,7 @@ kids 0 OBJECT poly name "disk" loc 0 -0.0305765 0.0300321 -texture "knob.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/alt/knob.rgb" crease 101.000000 numvert 20 0.01 0.00396059 0.00479285 diff --git a/Aircraft/Instruments-3d/alt/alt.xml b/Aircraft/Instruments-3d/alt/alt.xml index 9481a55f2..1e50dbd90 100644 --- a/Aircraft/Instruments-3d/alt/alt.xml +++ b/Aircraft/Instruments-3d/alt/alt.xml @@ -123,6 +123,71 @@ + + + + pick + click-L + false + + decrease calibrate fine + + true + + property-adjust + /instrumentation/altimeter/setting-inhg + -0.01 + 26.0 + 33.0 + false + + + + decrease calibrate coarse + + true + + property-adjust + /instrumentation/altimeter/setting-inhg + -0.1 + 26.0 + 33.0 + false + + + + + + pick + click-R + false + + increase calibrate fine + + true + + property-adjust + /instrumentation/altimeter/setting-inhg + 0.01 + 26.0 + 33.0 + false + + + + increase calibrate coarse + + true + + property-adjust + /instrumentation/altimeter/setting-inhg + 0.1 + 26.0 + 33.0 + false + + + diff --git a/Aircraft/Instruments-3d/hi/hi.ac b/Aircraft/Instruments-3d/hi/hi.ac index 8715d1f77..fd597e928 100644 --- a/Aircraft/Instruments-3d/hi/hi.ac +++ b/Aircraft/Instruments-3d/hi/hi.ac @@ -1,12 +1,101 @@ AC3Db MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0 +MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1 MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.15 0.15 0.15 spec 0.5 0.5 0.5 shi 64 trans 0 OBJECT world -kids 5 +kids 9 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-bug-R" +loc -1.86265e-09 -0.022778 -0.0612388 +crease 180.000000 +numvert 4 +0 -0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 0.00702053 0.0302027 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +3 0 1 +1 0 0 +0 0.125 0 +2 0.125 1 +kids 0 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-bug-L" +loc -1.86265e-09 -0.022778 -0.0533867 +crease 180.000000 +numvert 4 +0 0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 -0.00702053 0.0226521 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +0 0 1 +2 0 0 +3 0.125 0 +1 0.125 1 +kids 0 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-offset-L" +loc -1.86265e-09 -0.0223161 0.00573575 +crease 180.000000 +numvert 4 +0 -0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 0.00702053 0.0302027 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +3 0 1 +1 0 0 +0 0.125 0 +2 0.125 1 +kids 0 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-offset-R" +loc -1.86265e-09 -0.0223161 -0.00211644 +crease 180.000000 +numvert 4 +0 0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 -0.00702053 0.0226521 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +0 0 1 +2 0 0 +3 0.125 0 +1 0.125 1 +kids 0 OBJECT poly name "Face" loc 0.000119331 0 0 -texture "hi01.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi01.rgb" crease 45.000000 numvert 6 -0.001458 0.04 -0.04 @@ -17,14 +106,14 @@ numvert 6 -0.001458 0 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0.935547 0.935547 3 0.0566406 0.935547 4 0.0566406 0.496094 5 0.935547 0.496094 SURF 0x0 -mat 1 +mat 2 refs 4 4 0.0566406 0.496094 2 0.0566406 0.0566406 @@ -33,7 +122,7 @@ refs 4 kids 0 OBJECT poly name "Front" -texture "hi02.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi02.rgb" crease 45.000000 numvert 6 0 0.04 -0.04 @@ -44,14 +133,14 @@ numvert 6 0 0 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0.994141 0.994141 3 -0.00195312 0.994141 4 -0.00195312 0.496094 5 0.994141 0.496094 SURF 0x0 -mat 1 +mat 2 refs 4 4 -0.00195312 0.496094 2 -0.00195312 -0.00195312 @@ -61,7 +150,7 @@ kids 0 OBJECT poly name "OBS-Knob" loc 0 -0.0297401 0.0293165 -texture "knob.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/knob.rgb" crease 101.000000 numvert 20 0.01 9.31323e-09 0 @@ -260,7 +349,7 @@ kids 0 OBJECT poly name "Hdg-Knob" loc 0 -0.0300775 -0.0298089 -texture "knob.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/knob.rgb" crease 101.000000 numvert 20 0.01 0.00396059 0.00479285 @@ -459,7 +548,7 @@ kids 0 OBJECT poly name "HdgBug" loc 0.00155131 0 0 -texture "hi03.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/hi/hi03.rgb" crease 45.000000 numvert 6 -0.0011 0 -0.04 @@ -470,14 +559,14 @@ numvert 6 -0.0011 0.04 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 1 0.0520455 0.498392 3 0.0520455 0.0589381 4 0.930952 0.0589381 0 0.930952 0.498392 SURF 0x0 -mat 1 +mat 2 refs 4 5 0.930952 0.937845 2 0.0520455 0.937845 diff --git a/Aircraft/Instruments-3d/hi/hi.xml b/Aircraft/Instruments-3d/hi/hi.xml index 0d1c73f52..5717c216e 100644 --- a/Aircraft/Instruments-3d/hi/hi.xml +++ b/Aircraft/Instruments-3d/hi/hi.xml @@ -63,6 +63,136 @@ + + + pick + click-bug-L + false + + small decrease + + true + + property-adjust + /autopilot/settings/heading-bug-deg + -1 + 0 + 360 + 1 + + + + large decrease + + true + + property-adjust + /autopilot/settings/heading-bug-deg + -5 + 0 + 360 + 1 + + + + + + pick + click-bug-R + false + + small increase + + true + + property-adjust + /autopilot/settings/heading-bug-deg + 1 + 0 + 360 + 1 + + + + large increase + + true + + property-adjust + /autopilot/settings/heading-bug-deg + 5 + 0 + 360 + 1 + + + + + + + pick + click-offset-L + false + + small decrease + + true + + property-adjust + /instrumentation/heading-indicator/offset-deg + -1 + 0 + 360 + 1 + + + + large decrease + + true + + property-adjust + /instrumentation/heading-indicator/offset-deg + -5 + 0 + 360 + 1 + + + + + + pick + click-offset-R + false + + small increase + + true + + property-adjust + /instrumentation/heading-indicator/offset-deg + 1 + 0 + 360 + 1 + + + + large increase + + true + + property-adjust + /instrumentation/heading-indicator/offset-deg + 5 + 0 + 360 + 1 + + + + diff --git a/Aircraft/Instruments-3d/radio_stack/RadioStack.ac b/Aircraft/Instruments-3d/radio_stack/RadioStack.ac new file mode 100644 index 000000000..fe0e0249b --- /dev/null +++ b/Aircraft/Instruments-3d/radio_stack/RadioStack.ac @@ -0,0 +1,23 @@ +AC3Db +MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0 +OBJECT world +kids 1 +OBJECT poly +name "RadioStack" +loc 0.000486599 0.0488634 -0.00024706 +texture "/usr/local/FlightGear-0.9/data/Aircraft/pa24-250/Models/radio_stack/panel-tex02.rgb" +crease 45.000000 +numvert 4 +0 0.0861044 -0.0861038 +0 0.0861044 0.0865063 +0 -0.183125 0.0865063 +0 -0.183125 -0.0861038 +numsurf 1 +SURF 0x20 +mat 0 +refs 4 +0 0 1 +1 1 1 +2 1 0 +3 0 0 +kids 0 diff --git a/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb b/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb new file mode 100755 index 000000000..bf45befec Binary files /dev/null and b/Aircraft/Instruments-3d/radio_stack/panel-tex02.rgb differ diff --git a/Aircraft/Instruments-3d/radio_stack/radio-panel.xml b/Aircraft/Instruments-3d/radio_stack/radio-panel.xml new file mode 100644 index 000000000..3910d9dc7 --- /dev/null +++ b/Aircraft/Instruments-3d/radio_stack/radio-panel.xml @@ -0,0 +1,76 @@ + + + + + + + Radio-Panel +Aircraft/pa24-250/Panel/transparent-bg.rgb + 512 + 1024 + + + + + DME Display + 120 + 450 + 200 + 100 --> + + + + Marker Beacon Indicators + 64 + 1000 + 100 + 50 + + + + ADF Radio + 256 + 900 + 512 + 150 + + + + + NavCom 1 Radio + 256 + 750 + 512 + 150 + + + + NavCom 2 Radio + + /instrumentation/comm[1]/frequencies/selected-mhz + /instrumentation/comm[1]/frequencies/standby-mhz + /instrumentation/nav[1]/frequencies/selected-mhz + /instrumentation/nav[1]/frequencies/standby-mhz + /instrumentation/nav[1]/volume + /instrumentation/nav[1]/ident + /systems/electrical/outputs/nav[1] + + 256 + 600 + 512 + 150 + + + + KAP140 Autopilot + 256 + 300 + 512 + 150 + + + + + + + diff --git a/Aircraft/Instruments-3d/radio_stack/radio-stack.xml b/Aircraft/Instruments-3d/radio_stack/radio-stack.xml new file mode 100644 index 000000000..eceb117df --- /dev/null +++ b/Aircraft/Instruments-3d/radio_stack/radio-stack.xml @@ -0,0 +1,25 @@ + + + + RadioStack.ac + + Aircraft/Instruments-3d/radio_stack/radio-panel.xml + + 0 + -0.085 + -0.135 + + + 0 + 0.085 + -0.135 + + + 0 + -0.085 + 0.135 + + + + + diff --git a/Aircraft/Instruments-3d/vor/vor.ac b/Aircraft/Instruments-3d/vor/vor.ac index 8cdd787b4..bfcf6af22 100644 --- a/Aircraft/Instruments-3d/vor/vor.ac +++ b/Aircraft/Instruments-3d/vor/vor.ac @@ -1,8 +1,53 @@ AC3Db MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 0 +MATERIAL "ac3dmat6" rgb 0 1 0 amb 0.2 0.2 0.2 emis 0 0 0 spec 0 0 0 shi 10 trans 1 MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0.15 0.15 0.15 spec 0.5 0.5 0.5 shi 64 trans 0 OBJECT world -kids 9 +kids 11 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-R" +loc -1.86265e-09 -0.0216233 -0.00396401 +crease 180.000000 +numvert 4 +0 -0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 0.00702053 0.0302027 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +3 0 1 +1 0 0 +0 0.125 0 +2 0.125 1 +kids 0 +OBJECT group +name "clicks" +loc 0.00569378 -0.00756817 0.00125835 +kids 1 +OBJECT poly +name "click-L" +loc -1.86265e-09 -0.0216233 0.00388818 +crease 180.000000 +numvert 4 +0 0.00702053 0.0302027 +0 0.00702053 0.0226521 +0 -0.00702053 0.0302027 +0 -0.00702053 0.0226521 +numsurf 1 +SURF 0x30 +mat 1 +refs 4 +0 0 1 +2 0 0 +3 0.125 0 +1 0.125 1 +kids 0 OBJECT poly name "GlidescopeNeedle" crease 45.000000 @@ -15,14 +60,14 @@ numvert 6 -0.003005 0.000533 0.029784 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0 0 3 0 0 4 0 0 2 0 0 SURF 0x0 -mat 1 +mat 2 refs 4 0 0 0 2 0 0 @@ -41,14 +86,14 @@ numvert 6 -0.003005 0.004974 -0.000532 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0 0 2 0 0 5 0 0 4 0 0 SURF 0x0 -mat 1 +mat 2 refs 4 1 0 0 4 0 0 @@ -57,7 +102,7 @@ refs 4 kids 0 OBJECT poly name "Face" -texture "vor02.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/vor02.rgb" crease 45.000000 numvert 6 -0.004518 0.04 -0.04 @@ -68,14 +113,14 @@ numvert 6 -0.004518 0 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0.966797 0.958984 3 0.00976562 0.958984 4 0.00976562 0.480469 5 0.966797 0.480469 SURF 0x0 -mat 1 +mat 2 refs 4 1 0.966797 0 5 0.966797 0.480469 @@ -84,7 +129,7 @@ refs 4 kids 0 OBJECT poly name "Ring" -texture "vor01.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/vor01.rgb" crease 45.000000 numvert 6 -0.001596 0.04 -0.04 @@ -95,14 +140,14 @@ numvert 6 -0.001596 0 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0.998047 1 3 0 1 4 0 0.5 5 0.998047 0.5 SURF 0x0 -mat 1 +mat 2 refs 4 1 0.998047 0 5 0.998047 0.5 @@ -111,7 +156,7 @@ refs 4 kids 0 OBJECT poly name "Front" -texture "vor03.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/vor03.rgb" crease 45.000000 numvert 6 0 0.04 -0.04 @@ -122,14 +167,14 @@ numvert 6 0 0 -0.04 numsurf 2 SURF 0x0 -mat 1 +mat 2 refs 4 0 0.998047 1 3 0 1 4 0 0.5 5 0.998047 0.5 SURF 0x0 -mat 1 +mat 2 refs 4 1 0.998047 0 5 0.998047 0.5 @@ -139,7 +184,7 @@ kids 0 OBJECT poly name "TO" loc -0.00674026 0.0040441 -0.0124104 -texture "TO-FR.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/TO-FR.rgb" crease 45.000000 numvert 4 0 -0.00271994 -0.00739644 @@ -158,7 +203,7 @@ kids 0 OBJECT poly name "NAV" loc -0.0063754 0.0042357 -0.0122067 -texture "TO-FR.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/TO-FR.rgb" crease 45.000000 numvert 4 0 0.00239354 -0.00417537 @@ -177,7 +222,7 @@ kids 0 OBJECT poly name "FR" loc -0.00589943 0.00404461 -0.0128874 -texture "TO-FR.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/TO-FR.rgb" crease 45.000000 numvert 4 0 -0.00299626 -0.00718548 @@ -196,7 +241,7 @@ kids 0 OBJECT poly name "disk" loc 0 -0.0292413 0.0272215 -texture "knob.rgb" +texture "/usr/local/FlightGear-0.9/data/Aircraft/Instruments-3d/vor/knob.rgb" crease 101.000000 numvert 20 0.01 0.00396059 0.00479285 diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml index 6adc5380b..624b902af 100644 --- a/Aircraft/Instruments-3d/vor/vor.xml +++ b/Aircraft/Instruments-3d/vor/vor.xml @@ -130,6 +130,71 @@ + + + pick + click-L + false + + small decrease + + true + + property-adjust + /instrumentation/nav/radials/selected-deg + -1 + 0 + 360 + 1 + + + + large decrease + + true + + property-adjust + /instrumentation/nav/radials/selected-deg + -5 + 0 + 360 + 1 + + + + + + pick + click-R + false + + small increase + + true + + property-adjust + /instrumentation/nav/radials/selected-deg + 1 + 0 + 360 + 1 + + + + large increase + + true + + property-adjust + /instrumentation/nav/radials/selected-deg + 5 + 0 + 360 + 1 + + + + Alpha Order Group Face diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml index 8264114a6..64887b1c2 100644 --- a/Aircraft/Instruments-3d/vor/vor2.xml +++ b/Aircraft/Instruments-3d/vor/vor2.xml @@ -130,6 +130,71 @@ + + + pick + click-L + false + + small decrease + + true + + property-adjust + /instrumentation/nav[1]/radials/selected-deg + -1 + 0 + 360 + 1 + + + + large decrease + + true + + property-adjust + /instrumentation/nav[1]/radials/selected-deg + -5 + 0 + 360 + 1 + + + + + + pick + click-R + false + + small increase + + true + + property-adjust + /instrumentation/nav[1]/radials/selected-deg + 1 + 0 + 360 + 1 + + + + large increase + + true + + property-adjust + /instrumentation/nav[1]/radials/selected-deg + 5 + 0 + 360 + 1 + + + + Alpha Order Group Face diff --git a/Aircraft/c172p/Systems/KAP140.xml b/Aircraft/c172p/Systems/KAP140.xml index 8e545329c..55df74516 100644 --- a/Aircraft/c172p/Systems/KAP140.xml +++ b/Aircraft/c172p/Systems/KAP140.xml @@ -111,7 +111,7 @@ true - /autopilot/internal/heading-bug-error-deg --> + /autopilot/internal/heading-bug-error-deg @@ -267,4 +267,4 @@ - \ No newline at end of file +