-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Attached is a patch that fixes some absolute property paths in bf109, as
mentioned before on the mailing list this breaks over mp.
Regards,
Arvid Norlander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
iD8DBQFHVWKYWmK6ng/aMNkRCvsOAKCj1FQp7XH8db2a0Jsql3AoQy3MGwCePFsX
56CDUF9jSVswIxD6w4NWHA4=
=cvHd
-----END PGP SIGNATURE-----
? bf109-property-path.patch
Index: Models/Bf-109g.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bf109/Models/Bf-109g.xml,v
retrieving revision 1.2
diff -u -p -r1.2 Bf-109g.xml
--- Models/Bf-109g.xml 28 Nov 2007 08:35:01 -0000 1.2
+++ Models/Bf-109g.xml 4 Dec 2007 14:20:37 -0000
@@ -408,7 +408,7 @@
<animation>
<type>rotate</type>
<object-name>Stick</object-name>
- <property>/controls/flight/elevator</property>
+ <property>controls/flight/elevator</property>
<factor>-10</factor>
<center>
<x-m>3.14</x-m>
@@ -425,7 +425,7 @@
<animation>
<type>rotate</type>
<object-name>Stick</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>-10</factor>
<center>
<x-m>3.14</x-m>
@@ -445,7 +445,7 @@
<object-name>Propeller1</object-name>
<condition>
<less-than>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<value>1000</value>
</less-than>
</condition>
@@ -456,7 +456,7 @@
<object-name>Propturn</object-name>
<condition>
<greater-than>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<value>1000</value>
</greater-than>
</condition>
@@ -465,7 +465,7 @@
<animation>
<type>spin</type>
<object-name>Propturn</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>-0.01</factor>
<center>
<x-m>3.40</x-m>
@@ -483,7 +483,7 @@
<type>spin</type>
<object-name>Propeller1</object-name>
<object-name>Prop</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>-0.479</factor>
<center>
<x-m>3.40</x-m>
@@ -500,7 +500,7 @@
<animation>
<type>rotate</type>
<object-name>leftgear</object-name>
- <property>/gear/gear[0]/position-norm</property>
+ <property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -526,7 +526,7 @@
<animation>
<type>rotate</type>
<object-name>leftwheelstop</object-name>
- <property>/gear/gear[0]/position-norm</property>
+ <property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -552,7 +552,7 @@
<animation>
<type>rotate</type>
<object-name>rightgear</object-name>
- <property>/gear/gear[1]/position-norm</property>
+ <property>gear/gear[1]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -582,7 +582,7 @@
<animation>
<type>rotate</type>
<object-name>rightwheelstop</object-name>
- <property>/gear/gear[1]/position-norm</property>
+ <property>gear/gear[1]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -642,7 +642,7 @@
<object-name>rightwheel</object-name>
<condition>
<greater-than>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<value>0.0</value>
</greater-than>
</condition>
@@ -653,7 +653,7 @@
<object-name>leftwheel</object-name>
<condition>
<greater-than>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<value>0.0</value>
</greater-than>
</condition>
@@ -666,7 +666,7 @@
<animation>
<type>rotate</type>
<object-name>rightcoolflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>57.0</factor>
<center>
@@ -685,7 +685,7 @@
<animation>
<type>rotate</type>
<object-name>leftcoolflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>57.0</factor>
<center>
@@ -704,7 +704,7 @@
<animation>
<type>rotate</type>
<object-name>leftflap</object-name>
- <property>/controls/engines/engine[0]/cowl-flaps-norm</property>
+ <property>controls/engines/engine[0]/cowl-flaps-norm</property>
<factor>-20.0</factor>
<center>
@@ -725,7 +725,7 @@
<animation>
<type>rotate</type>
<object-name>rightflap</object-name>
- <property>/controls/engines/engine[0]/cowl-flaps-norm</property>
+ <property>controls/engines/engine[0]/cowl-flaps-norm</property>
<factor>20.0</factor>
<center>
@@ -766,7 +766,7 @@
<animation>
<type>rotate</type>
<object-name>leftoutflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>47.0</factor>
<center>
@@ -785,7 +785,7 @@
<animation>
<type>rotate</type>
<object-name>rightaileron</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>-15.0</factor>
<center>
@@ -806,7 +806,7 @@
<animation>
<type>rotate</type>
<object-name>LeftAileron</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>15.0</factor>
<center>
@@ -826,7 +826,7 @@
<animation>
<type>rotate</type>
<object-name>Rudder</object-name>
- <property>/surface-positions/rudder-pos-norm</property>
+ <property>surface-positions/rudder-pos-norm</property>
<factor>30.0</factor>
<center>
@@ -845,7 +845,7 @@
<animation>
<type>rotate</type>
<object-name>LeftElevator</object-name>
- <property>/surface-positions/elevator-pos-norm</property>
+ <property>surface-positions/elevator-pos-norm</property>
<interpolation>
<entry>
<ind>-1.0</ind>
@@ -892,7 +892,7 @@
<animation>
<type>translate</type>
<object-name>leftwheel</object-name>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -917,7 +917,7 @@
<animation>
<type>translate</type>
<object-name>rightwheel</object-name>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -942,7 +942,7 @@
<animation>
<type>spin</type>
<object-name>leftwheel</object-name>
- <property>/velocities/uBody-fps</property>
+ <property>velocities/uBody-fps</property>
<factor>-1.5</factor>
<center>
<x-m>2.0325</x-m>
@@ -959,7 +959,7 @@
<animation>
<type>spin</type>
<object-name>rightwheel</object-name>
- <property>/velocities/uBody-fps</property>
+ <property>velocities/uBody-fps</property>
<factor>-1.5</factor>
<center>
<x-m>2.0325</x-m>
@@ -978,7 +978,7 @@
<object-name>rightwheelstop</object-name>
<condition>
<equals>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<value>0.0</value>
</equals>
</condition>
@@ -989,7 +989,7 @@
<object-name>leftwheelstop</object-name>
<condition>
<equals>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<value>0.0</value>
</equals>
</condition>
@@ -998,7 +998,7 @@
<animation>
<type>translate</type>
<object-name>leftslat</object-name>
- <property>/surface-positions/slat-pos-norm</property>
+ <property>surface-positions/slat-pos-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -1019,7 +1019,7 @@
<animation>
<type>translate</type>
<object-name>rightslat</object-name>
- <property>/surface-positions/slat-pos-norm</property>
+ <property>surface-positions/slat-pos-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
Index: Models/bf109g-model.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bf109/Models/bf109g-model.xml,v
retrieving revision 1.4
diff -u -p -r1.4 bf109g-model.xml
--- Models/bf109g-model.xml 5 Jul 2007 07:36:48 -0000 1.4
+++ Models/bf109g-model.xml 4 Dec 2007 14:20:37 -0000
@@ -409,7 +409,7 @@
<type>rotate</type>
<object-name>Stick</object-name>
<object-name>rhand</object-name>
- <property>/controls/flight/elevator</property>
+ <property>controls/flight/elevator</property>
<factor>-10</factor>
<center>
<x-m>3.14</x-m>
@@ -428,7 +428,7 @@
<object-name>Stick</object-name>
<object-name>rhand</object-name>
<object-name>rarm2</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>-10</factor>
<center>
<x-m>3.14</x-m>
@@ -448,7 +448,7 @@
<object-name>Propeller1</object-name>
<condition>
<less-than>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<value>1000</value>
</less-than>
</condition>
@@ -459,7 +459,7 @@
<object-name>Propturn</object-name>
<condition>
<greater-than>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<value>1000</value>
</greater-than>
</condition>
@@ -468,7 +468,7 @@
<animation>
<type>spin</type>
<object-name>Propturn</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>-0.01</factor>
<center>
<x-m>3.40</x-m>
@@ -486,7 +486,7 @@
<type>spin</type>
<object-name>Propeller1</object-name>
<object-name>Prop</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>-0.479</factor>
<center>
<x-m>3.40</x-m>
@@ -503,7 +503,7 @@
<animation>
<type>rotate</type>
<object-name>leftgear</object-name>
- <property>/gear/gear[0]/position-norm</property>
+ <property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -529,7 +529,7 @@
<animation>
<type>rotate</type>
<object-name>leftwheelstop</object-name>
- <property>/gear/gear[0]/position-norm</property>
+ <property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -555,7 +555,7 @@
<animation>
<type>rotate</type>
<object-name>rightgear</object-name>
- <property>/gear/gear[1]/position-norm</property>
+ <property>gear/gear[1]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -585,7 +585,7 @@
<animation>
<type>rotate</type>
<object-name>rightwheelstop</object-name>
- <property>/gear/gear[1]/position-norm</property>
+ <property>gear/gear[1]/position-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -646,7 +646,7 @@
<object-name>rightwheel</object-name>
<condition>
<greater-than>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<value>0.0</value>
</greater-than>
</condition>
@@ -657,7 +657,7 @@
<object-name>leftwheel</object-name>
<condition>
<greater-than>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<value>0.0</value>
</greater-than>
</condition>
@@ -670,7 +670,7 @@
<animation>
<type>rotate</type>
<object-name>rightcoolflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>57.0</factor>
<center>
@@ -689,7 +689,7 @@
<animation>
<type>rotate</type>
<object-name>leftcoolflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>57.0</factor>
<center>
@@ -708,7 +708,7 @@
<animation>
<type>rotate</type>
<object-name>leftflap</object-name>
- <property>/controls/engines/engine[0]/cowl-flaps-norm</property>
+ <property>controls/engines/engine[0]/cowl-flaps-norm</property>
<factor>-20.0</factor>
<center>
@@ -729,7 +729,7 @@
<animation>
<type>rotate</type>
<object-name>rightflap</object-name>
- <property>/controls/engines/engine[0]/cowl-flaps-norm</property>
+ <property>controls/engines/engine[0]/cowl-flaps-norm</property>
<factor>20.0</factor>
<center>
@@ -770,7 +770,7 @@
<animation>
<type>rotate</type>
<object-name>leftoutflap</object-name>
- <property>/surface-positions/flap-pos-norm</property>
+ <property>surface-positions/flap-pos-norm</property>
<factor>47.0</factor>
<center>
@@ -789,7 +789,7 @@
<animation>
<type>rotate</type>
<object-name>rightaileron</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>-15.0</factor>
<center>
@@ -810,7 +810,7 @@
<animation>
<type>rotate</type>
<object-name>LeftAileron</object-name>
- <property>/controls/flight/aileron</property>
+ <property>controls/flight/aileron</property>
<factor>15.0</factor>
<center>
@@ -830,7 +830,7 @@
<animation>
<type>rotate</type>
<object-name>Rudder</object-name>
- <property>/surface-positions/rudder-pos-norm</property>
+ <property>surface-positions/rudder-pos-norm</property>
<factor>30.0</factor>
<center>
@@ -849,7 +849,7 @@
<animation>
<type>rotate</type>
<object-name>LeftElevator</object-name>
- <property>/surface-positions/elevator-pos-norm</property>
+ <property>surface-positions/elevator-pos-norm</property>
<interpolation>
<entry>
<ind>-1.0</ind>
@@ -896,7 +896,7 @@
<animation>
<type>translate</type>
<object-name>leftwheel</object-name>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -921,7 +921,7 @@
<animation>
<type>translate</type>
<object-name>rightwheel</object-name>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -946,7 +946,7 @@
<animation>
<type>spin</type>
<object-name>leftwheel</object-name>
- <property>/velocities/uBody-fps</property>
+ <property>velocities/uBody-fps</property>
<factor>-1.5</factor>
<center>
<x-m>2.0325</x-m>
@@ -963,7 +963,7 @@
<animation>
<type>spin</type>
<object-name>rightwheel</object-name>
- <property>/velocities/uBody-fps</property>
+ <property>velocities/uBody-fps</property>
<factor>-1.5</factor>
<center>
<x-m>2.0325</x-m>
@@ -982,7 +982,7 @@
<object-name>rightwheelstop</object-name>
<condition>
<equals>
- <property>/gear/gear[1]/compression-norm</property>
+ <property>gear/gear[1]/compression-norm</property>
<value>0.0</value>
</equals>
</condition>
@@ -993,7 +993,7 @@
<object-name>leftwheelstop</object-name>
<condition>
<equals>
- <property>/gear/gear[0]/compression-norm</property>
+ <property>gear/gear[0]/compression-norm</property>
<value>0.0</value>
</equals>
</condition>
@@ -1002,7 +1002,7 @@
<animation>
<type>translate</type>
<object-name>leftslat</object-name>
- <property>/surface-positions/slat-pos-norm</property>
+ <property>surface-positions/slat-pos-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
@@ -1023,7 +1023,7 @@
<animation>
<type>translate</type>
<object-name>rightslat</object-name>
- <property>/surface-positions/slat-pos-norm</property>
+ <property>surface-positions/slat-pos-norm</property>
<interpolation>
<entry>
<ind>0.0</ind>
Index: Models/pdisk.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bf109/Models/pdisk.xml,v
retrieving revision 1.1
diff -u -p -r1.1 pdisk.xml
--- Models/pdisk.xml 5 Jun 2007 22:09:32 -0000 1.1
+++ Models/pdisk.xml 4 Dec 2007 14:20:37 -0000
@@ -38,7 +38,7 @@
<object-name>noshadow.fpdisk</object-name>
<condition>
<greater-than>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<value>1700</value>
</greater-than>
</condition>
@@ -47,7 +47,7 @@
<animation>
<type>spin</type>
<object-name>noshadow.spdisk</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>0.35</factor>
<center>
<x-m>0.0</x-m>
@@ -64,7 +64,7 @@
<animation>
<type>spin</type>
<object-name>noshadow.fpdisk</object-name>
- <property>/engines/engine[0]/rpm</property>
+ <property>engines/engine[0]/rpm</property>
<factor>0.01</factor>
<center>
<x-m>0.0</x-m>
Index: Models/pilot.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/bf109/Models/pilot.xml,v
retrieving revision 1.1
diff -u -p -r1.1 pilot.xml
--- Models/pilot.xml 11 Sep 2007 11:54:18 -0000 1.1
+++ Models/pilot.xml 4 Dec 2007 14:20:37 -0000
@@ -181,7 +181,7 @@
<object-name>arm1.R</object-name>
<object-name>arm2.R</object-name>
<object-name>hand.R</object-name>
- <property>/controls/flight/elevator</property>
+ <property>controls/flight/elevator</property>
<factor>18</factor>
<center>
@@ -200,7 +200,7 @@
<type>rotate</type>
<object-name>arm2.R</object-name>
<object-name>hand.R</object-name>
- <property>/controls/flight/elevator</property>
+ <property>controls/flight/elevator</property>
<factor>-27</factor>
<center>
@@ -219,7 +219,7 @@
<animation>
<type>rotate</type>
<object-name>hand.R</object-name>
- <property>/controls/flight/elevator</property>
+ <property>controls/flight/elevator</property>
<factor>-8</factor>
<center>
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
