Merge branch 'master' of gitorious.org:fg/fgdata

Aircraft/Instruments-3d/flaps/flaps.ac

@@ -1,13 +1,12 @@
 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 "ac3dmat14" rgb 0.8 0.8 0.8  amb 0.2 0.2 0.2  emis 0 0 0  spec 0 0 0  shi 10  trans 0
 MATERIAL "WhiteLightOff" rgb 1 1 1  amb 1 1 1  emis 0 0 0  spec 0 0 0  shi 72  trans 0
 OBJECT world
 kids 3
 OBJECT poly
 name "rect"
 loc 0 -0.0136416 0.00484141
-texture "flaps.rgb"
+texture "flaps.png"
 crease 45.000000
 numvert 4
 0 -0.0403456 -0.0189484
@@ -46,84 +45,84 @@ numvert 16
 -0.00802631 -0.000999995 -0.00122597
 numsurf 12
 SURF 0x30
-mat 2
+mat 1
 refs 4
 7 0 0
 6 1 0
 5 1 1
 4 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 0 0 0
 3 1 0
 2 1 1
 1 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 3 0 0
 4 1 0
 5 1 1
 2 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 1 0 0
 6 1 0
 7 1 1
 0 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 0 0 0
 7 1 0
 4 1 1
 3 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 2 0 0
 5 1 0
 6 1 1
 1 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 15 0 0
 14 1 0
 13 1 1
 12 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 8 0 0
 11 1 0
 10 1 1
 9 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 11 0 0
 12 1 0
 13 1 1
 10 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 9 0 0
 14 1 0
 15 1 1
 8 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 8 0 0
 15 1 0
 12 1 1
 11 0 1
 SURF 0x30
-mat 2
+mat 1
 refs 4
 10 0 0
 13 1 0
@@ -133,6 +132,7 @@ kids 0
 OBJECT poly
 name "FlapSwitch"
 loc 0.0267165 0.0384582 -0.000771669
+texture "manilla.png"
 crease 45.000000
 numvert 20
 0.0355965 -0.0038875 -0.0105119
@@ -166,10 +166,10 @@ refs 4
 SURF 0x10
 mat 1
 refs 4
-1 0.603516 0.175781
+1 0.989715 0.969592
-2 0.603516 0.0878903
+2 -0.00300926 0.996381
-5 0.691406 0.0878903
+5 0.0211005 0.720806
-6 0.691406 0.175781
+6 0.996856 0.894456
 SURF 0x10
 mat 1
 refs 4
@@ -180,17 +180,17 @@ refs 4
 SURF 0x10
 mat 1
 refs 4
-3 0.603516 0.175781
+3 -0.00605563 1.00611
-0 0.603516 0.0878903
+0 0.986668 0.979323
-7 0.691406 0.0878903
+7 0.993809 0.904188
-4 0.691406 0.175781
+4 0.018054 0.730537
 SURF 0x10
 mat 1
 refs 4
-6 0.691406 0.175781
+6 0.308594 0.175781
-5 0.691406 0.0878903
+5 0.308594 0.0878903
-4 0.603516 0.0878903
+4 0.396484 0.0878903
-7 0.603516 0.175781
+7 0.396484 0.175781
 SURF 0x30
 mat 1
 refs 4
@@ -234,10 +234,10 @@ refs 4
 10 1 1
 11 0 1
 SURF 0x20
-mat 0
+mat 1
 refs 4
-19 0 0
+19 0.994515 -0.00785261
-18 0 0
+18 0.994515 1.00635
-17 0 0
+17 -0.0110846 1.00635
-16 0 0
+16 -0.0110846 -0.00785267
 kids 0

Aircraft/c172p/Models/Yoke/yoke.xml

@@ -34,14 +34,9 @@
    <type>select</type>
    <object-name>Yoke</object-name>
    <condition>
-     <and>
+     <not>
-       <not>
+       <property>sim/model/hide-yoke</property>
-         <property>sim/model/hide-yoke</property>
+     </not>
-       </not>
-       <not>
-         <property>/sim/panel-hotspots</property>
-       </not>
-    </and>
    </condition>
  </animation>