diff --git a/Aircraft/Instruments-3d/primus-1000/AP-control.ac b/Aircraft/Instruments-3d/primus-1000/AP-control.ac index 4f6995aa6..c25818b1a 100644 --- a/Aircraft/Instruments-3d/primus-1000/AP-control.ac +++ b/Aircraft/Instruments-3d/primus-1000/AP-control.ac @@ -2,39 +2,69 @@ AC3Db MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 MATERIAL "illum" rgb 1 1 1 amb 0 0 0 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0 MATERIAL "gloss" rgb 1 1 1 amb 0 0 0 emis 0 0 0 spec 0.504136 0.504136 0.504136 shi 32 trans 0 +MATERIAL "DefaultWhite" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0.5 0.5 0.5 shi 64 trans 0 OBJECT world -kids 4 +kids 5 OBJECT poly -name "YD-on" +name "AP-on" data 9 -Plane.012 +Plane.009 texture "fmc.rgb" texrep 1 1 -crease 30 -numvert 4 -0.002644 -0.014275 -0.013809 -0.002644 -0.022559 -0.013809 -0.002644 -0.022559 0.001318 -0.002644 -0.014275 0.001318 -numsurf 1 +crease 30.000000 +numvert 8 +0.002614 -0.013861 0.005622 +0.002614 -0.022973 0.005622 +0.002614 -0.022973 0.022261 +0.002614 -0.013861 0.022261 +0.002435 -0.013861 0.005622 +0.002435 -0.013861 0.022261 +0.002435 -0.022973 0.022261 +0.002435 -0.022973 0.005622 +numsurf 5 SURF 0x00 mat 1 refs 4 -0 0.734375 0.39453125 -3 0.62890625 0.39453125 -2 0.62890625 0.3359375 -1 0.734375 0.3359375 +0 0.755626916885 0.395578712225 +3 0.627848625183 0.395578712225 +2 0.627848625183 0.330695718527 +1 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +3 0.755626916885 0.395578712225 +0 0.627848625183 0.395578712225 +4 0.627848625183 0.330695718527 +5 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +2 0.755626916885 0.395578712225 +3 0.627848625183 0.395578712225 +5 0.627848625183 0.330695718527 +6 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +1 0.755626916885 0.395578712225 +2 0.627848625183 0.395578712225 +6 0.627848625183 0.330695718527 +7 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +0 0.755626916885 0.395578712225 +1 0.627848625183 0.395578712225 +7 0.627848625183 0.330695718527 +4 0.755626916885 0.330695718527 kids 0 -OBJECT group -name "APcontrol" -kids 2 OBJECT poly -name "APcontrol_0" +name "APcontrol" data 4 Cube texture "bezels.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 8 0.000154 0.032227 -0.070473 0.000154 -0.032227 -0.070473 @@ -82,12 +112,12 @@ refs 4 7 0.0 0.4765625 kids 0 OBJECT poly -name "APcontrol_1" -data 4 -Cube +name "Pitch.trim" +data 8 +Cube.001 texture "bezels.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 10 0.002544 0.016204 0.033209 0.007425 0.008899 0.033209 @@ -156,33 +186,12 @@ refs 4 4 0.73046875 0.171875 kids 0 OBJECT poly -name "AP-on" -data 9 -Plane.009 -texture "fmc.rgb" -texrep 1 1 -crease 30 -numvert 4 -0.002644 -0.014275 0.006378 -0.002644 -0.022559 0.006378 -0.002644 -0.022559 0.021505 -0.002644 -0.014275 0.021505 -numsurf 1 -SURF 0x00 -mat 1 -refs 4 -0 0.734375 0.39453125 -3 0.62890625 0.39453125 -2 0.62890625 0.3359375 -1 0.734375 0.3359375 -kids 0 -OBJECT poly -name "APknob" +name "Roll.trim" data 8 Cylinder texture "bezels.rgb" texrep 1 1 -crease 45 +crease 45.000000 numvert 20 0.003007 0.015083 -0.032656 0.003007 0.015157 -0.04679 @@ -206,108 +215,161 @@ numvert 20 0.022238 -0.01765 -0.033402 numsurf 15 SURF 0x10 -mat 0 +mat 3 refs 4 0 0.86328125 0.3125 8 0.86328125 0.3125 9 0.8984375 0.234375 1 0.8984375 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 1 0.8984375 0.234375 9 0.8984375 0.234375 10 0.86328125 0.15625 2 0.86328125 0.15625 SURF 0x10 -mat 0 +mat 3 refs 4 2 0.86328125 0.15625 10 0.86328125 0.15625 11 0.78515625 0.125 3 0.78515625 0.125 SURF 0x10 -mat 0 +mat 3 refs 4 3 0.78515625 0.125 11 0.78515625 0.125 12 0.70703125 0.15625 4 0.70703125 0.15625 SURF 0x10 -mat 0 +mat 3 refs 4 4 0.70703125 0.15625 12 0.70703125 0.15625 13 0.67578125 0.234375 5 0.67578125 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 5 0.67578125 0.234375 13 0.67578125 0.234375 14 0.70703125 0.3125 6 0.70703125 0.3125 SURF 0x10 -mat 0 +mat 3 refs 4 6 0.70703125 0.3125 14 0.70703125 0.3125 15 0.78515625 0.34765625 7 0.78515625 0.34765625 SURF 0x10 -mat 0 +mat 3 refs 4 8 0.86328125 0.3125 0 0.86328125 0.3125 7 0.78515625 0.34765625 15 0.78515625 0.34765625 SURF 0x10 -mat 0 +mat 3 refs 4 8 0.86328125 0.3125 15 0.78515625 0.34765625 14 0.70703125 0.3125 13 0.67578125 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 9 0.8984375 0.234375 12 0.70703125 0.15625 11 0.78515625 0.125 10 0.86328125 0.15625 SURF 0x10 -mat 0 +mat 3 refs 4 12 0.86328125 0.3125 9 0.67578125 0.234375 16 0.70703125 0.15625 17 0.8984375 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 8 0.86328125 0.3125 13 0.67578125 0.234375 19 0.70703125 0.15625 18 0.8984375 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 13 0.86328125 0.3125 12 0.67578125 0.234375 17 0.70703125 0.15625 19 0.8984375 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 9 0.86328125 0.3125 8 0.67578125 0.234375 18 0.70703125 0.15625 16 0.8984375 0.234375 SURF 0x10 -mat 0 +mat 3 refs 4 18 0.86328125 0.3125 19 0.67578125 0.234375 17 0.70703125 0.15625 16 0.8984375 0.234375 kids 0 +OBJECT poly +name "YD-on" +data 5 +Plane +texture "fmc.rgb" +texrep 1 1 +crease 30.000000 +numvert 8 +0.002614 -0.013861 -0.014997 +0.002614 -0.022973 -0.014997 +0.002614 -0.022973 0.001643 +0.002614 -0.013861 0.001643 +0.002435 -0.013861 -0.014997 +0.002435 -0.013861 0.001643 +0.002435 -0.022973 0.001643 +0.002435 -0.022973 -0.014997 +numsurf 5 +SURF 0x00 +mat 1 +refs 4 +0 0.755626916885 0.395578712225 +3 0.627848625183 0.395578712225 +2 0.627848625183 0.330695718527 +1 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +3 0.755626916885 0.395578712225 +0 0.627848625183 0.395578712225 +4 0.627848625183 0.330695718527 +5 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +2 0.755626916885 0.395578712225 +3 0.627848625183 0.395578712225 +5 0.627848625183 0.330695718527 +6 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +1 0.755626916885 0.395578712225 +2 0.627848625183 0.395578712225 +6 0.627848625183 0.330695718527 +7 0.755626916885 0.330695718527 +SURF 0x00 +mat 1 +refs 4 +0 0.755626916885 0.395578712225 +1 0.627848625183 0.395578712225 +7 0.627848625183 0.330695718527 +4 0.755626916885 0.330695718527 +kids 0 diff --git a/Aircraft/Instruments-3d/primus-1000/AP-control.xml b/Aircraft/Instruments-3d/primus-1000/AP-control.xml index aa764cdb7..4749ff9c6 100644 --- a/Aircraft/Instruments-3d/primus-1000/AP-control.xml +++ b/Aircraft/Instruments-3d/primus-1000/AP-control.xml @@ -4,18 +4,24 @@ Author : Syd Adams Primus 1000 Autopilot Controller --> - AP-control.ac - - select - AP-on - YD-on - - - autopilot/locks/passive-mode - - - + + select + AP-on + + + autopilot/locks/passive-mode + + + + + + select + YD-on + + controls/flight/yaw-damper + + diff --git a/Aircraft/Instruments-3d/primus-1000/AP-hotspots.xml b/Aircraft/Instruments-3d/primus-1000/AP-hotspots.xml index 9096e5c9c..ea8e1d7c6 100644 --- a/Aircraft/Instruments-3d/primus-1000/AP-hotspots.xml +++ b/Aircraft/Instruments-3d/primus-1000/AP-hotspots.xml @@ -28,6 +28,16 @@ P1000 AP controller hotspots -24 16 10 + + + + gear/gear[1]/wow + + + gear/gear[2]/wow + + + property-toggle autopilot/locks/passive-mode @@ -43,7 +53,7 @@ P1000 AP controller hotspots 10 property-toggle - autopilot/locks/passive-mode + controls/flight/yaw-damper