* Melchior FRANZ -- Sunday 19 October 2008:
> Patch attached  ... 

Oh, and uncomment the <nasal><load>/<unload> part, so that
the livery is correctly transmitted via MP. And the <file>
property only needs to be there, but it's not actually 
read, so it doesn't have to get initialized. But that's just
cosmetics. New patch. Tested in MP.

m.
Index: pc7-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/pc7/pc7-set.xml,v
retrieving revision 1.11
diff -u -p -r1.11 pc7-set.xml
--- pc7-set.xml	19 Oct 2008 11:20:00 -0000	1.11
+++ pc7-set.xml	19 Oct 2008 18:58:23 -0000
@@ -56,7 +56,7 @@ David Culp,  [EMAIL PROTECTED]
   <model>
    <path>Aircraft/pc7/Models/pc7.xml</path>
    <livery>
-    <file type="string">default</file>
+    <file type="string"/>
    </livery>
   </model>
 
Index: Models/pc7.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/pc7/Models/pc7.xml,v
retrieving revision 1.12
diff -u -p -r1.12 pc7.xml
--- Models/pc7.xml	19 Oct 2008 14:29:44 -0000	1.12
+++ Models/pc7.xml	19 Oct 2008 18:58:23 -0000
@@ -7,7 +7,6 @@
   <pitch-deg>-4</pitch-deg>
  </offsets>
 
-<!--
  <nasal>
   <load>
    var livery_update = aircraft.livery_update.new("Aircraft/pc7/Models/Liveries");
@@ -16,7 +15,6 @@
    livery_update.stop();
   </unload>
  </nasal>
--->
 
 <!--
  <animation>
@@ -370,18 +368,17 @@
  </axis>
 </animation>
 
-<!--
 <animation>
  <type>material</type>
- <object>right_flap</object>
- <object>right_aileron</object>
- <object>left_flap</object>
- <object>left_aileron</object>
- <object>wing</object>
- <object>hull</object>
- <object>hstab</object>
- <object>rudder</object>
- <object>elevator</object>
+ <object-name>right_flap</object-name>
+ <object-name>right_aileron</object-name>
+ <object-name>left_flap</object-name>
+ <object-name>left_aileron</object-name>
+ <object-name>wing</object-name>
+ <object-name>hull</object-name>
+ <object-name>hstab</object-name>
+ <object-name>rudder</object-name>
+ <object-name>elevator</object-name>
  <property-base>sim/model/livery</property-base>
  <texture-prop>texture</texture-prop>
  <texture>pc7_scheme.rgb</texture>
@@ -389,20 +386,19 @@
 
 <animation>
  <type>material</type>
- <object>lha_marker</object>
- <object>rwl_marker</object>
- <object>lwu_marker</object>
- <object>rha_marker</object>
- <object>lhf_marker</object>
- <object>rhf_marker</object>
- <object>lht_marker</object>
- <object>rht_marker</object>
- <object>lwu_marker</object>
- <object>rwl_marker</object>
+ <object-name>lha_marker</object-name>
+ <object-name>rwl_marker</object-name>
+ <object-name>lwu_marker</object-name>
+ <object-name>rha_marker</object-name>
+ <object-name>lhf_marker</object-name>
+ <object-name>rhf_marker</object-name>
+ <object-name>lht_marker</object-name>
+ <object-name>rht_marker</object-name>
+ <object-name>lwu_marker</object-name>
+ <object-name>rwl_marker</object-name>
  <property-base>sim/model/livery-logo</property-base>
  <texture-prop>texture</texture-prop>
  <texture>pc7_trans.rgb</texture>
 </animation>
--->
 
 </PropertyList>
Index: Models/Liveries/swiss.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/pc7/Models/Liveries/swiss.xml,v
retrieving revision 1.1
diff -u -p -r1.1 swiss.xml
--- Models/Liveries/swiss.xml	19 Oct 2008 14:29:45 -0000	1.1
+++ Models/Liveries/swiss.xml	19 Oct 2008 18:58:23 -0000
@@ -1,4 +1,4 @@
-?xml version="1.0"?>
+<?xml version="1.0"?>
 
 <PropertyList>
  <sim>
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel

Reply via email to