Hi All,
Please find below a patch for the vulcan to fix the liveries on plib.
I'd be grateful if someone would commit it to CVS.
Thanks
-Stuart
Index: vulcanb2-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/vulcanb2-set.xml,v
retrieving revision 1.8
diff -u -r1.8 vulcanb2-set.xml
--- vulcanb2-set.xml 13 Jul 2007 20:30:20 -0000 1.8
+++ vulcanb2-set.xml 7 Oct 2007 18:41:48 -0000
@@ -24,9 +24,11 @@
<model>
<path archive="y">Aircraft/vulcanb2/Models/vulcanb2.xml</path>
- <vulcanb2>
- <texture>skin.rgb</texture>
- </vulcanb2>
+ <livery>
+ <material>
+ <texture>XM597.rgb</texture>
+ </material>
+ </livery>
<offsets>
<x-m>-15.0</x-m>
<y-m>0.0</y-m>
@@ -36,7 +38,6 @@
<!-- Initial variant and texture. Controlled by aircraft dialog. -->
<variant>XM597</variant>
- <texture>XM597.rgb</texture>
<!-- Initial armament. Controlled by aircraft dialog -->
<armament>BlackBuck6</armament>
Index: vulcanb2.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/vulcanb2.xml,v
retrieving revision 1.3
diff -u -r1.3 vulcanb2.xml
--- vulcanb2.xml 17 Apr 2007 21:10:12 -0000 1.3
+++ vulcanb2.xml 4 Oct 2007 20:34:36 -0000
@@ -76,6 +76,14 @@
<y> 0.00 </y>
<z> -29.97 </z>
</location>
+ <pointmass name="dummy">
+ <weight unit="LBS">1</weight>
+ <location name="dumm2" unit="IN">
+ <x> 659.38</x>
+ <y> 0.0</y>
+ <z> -29.97</z>
+ </location>
+ </pointmass>
</mass_balance>
<ground_reactions>
Index: Dialogs/config.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/Dialogs/config.xml,v
retrieving revision 1.2
diff -u -r1.2 config.xml
--- Dialogs/config.xml 7 Jan 2007 18:04:31 -0000 1.2
+++ Dialogs/config.xml 5 Aug 2007 17:59:03 -0000
@@ -60,7 +60,7 @@
<pref-width>4</pref-width>
</empty>
<text>
- <label>Armament </label>
+ <label>Armament</label>
</text>
<combo>
<property>/sim/armament</property>
Index: Models/vulcanb2.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/Models/vulcanb2.ac,v
retrieving revision 1.4
diff -u -r1.4 vulcanb2.ac
--- Models/vulcanb2.ac 31 Oct 2006 20:55:25 -0000 1.4
+++ Models/vulcanb2.ac 5 Aug 2007 18:39:42 -0000
@@ -28,7 +28,7 @@
name "LeftGearHinge"
data 4
Cube
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -88,7 +88,7 @@
name "BrakeLowerRight"
data 8
Cube.004
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 24
@@ -248,7 +248,7 @@
name "RightGearDoorRear"
data 12
Door 4 H.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -308,7 +308,7 @@
name "Cylinder"
data 12
Cylinder.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 33
@@ -559,7 +559,7 @@
name "LeftGearPistonHead"
data 18
Gear 2 strut H.005
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -5152,7 +5152,7 @@
name "RightGearWheel1"
data 12
Cylinder.004
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 264
@@ -7858,7 +7858,7 @@
name "RightGearWheel2"
data 12
Cylinder.003
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 264
@@ -10564,7 +10564,7 @@
name "OuterElevonLeft"
data 8
Mesh.022
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 13
@@ -10679,7 +10679,7 @@
name "Nacelle.004"
data 15
Nacelle 1 H.005
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 66
@@ -11283,7 +11283,7 @@
name "Rudder"
data 8
Mesh.017
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 12
@@ -11390,7 +11390,7 @@
name "RightGearStrut"
data 8
Cylinder
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 48
@@ -11616,7 +11616,7 @@
name "RightGearHinge"
data 8
Cube.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -11676,7 +11676,7 @@
name "RightGearDoor"
data 8
Door 3 H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -11736,7 +11736,7 @@
name "LeftGearBogey"
data 18
Gear 4 strut H.003
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 14
@@ -11874,7 +11874,7 @@
name "InsideCanopy"
data 10
Sphere.004
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 97
@@ -12629,7 +12629,7 @@
name "ChuteDoor_1"
data 10
Sphere.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 158
@@ -13781,7 +13781,7 @@
name "Nacelle.003"
data 15
Nacelle 1 H.004
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 66
@@ -14385,7 +14385,7 @@
name "Nacelle"
data 15
Nacelle 1 H.006
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 66
@@ -14989,7 +14989,7 @@
name "LeftGearPistonBody"
data 18
Gear 2 strut H.004
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -15071,7 +15071,7 @@
name "Mesh"
data 8
Mesh.018
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 17
@@ -15192,7 +15192,7 @@
name "OuterElevonRight"
data 8
Mesh.019
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 13
@@ -15539,7 +15539,7 @@
name "TailScraper"
data 10
Sphere.002
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 79
@@ -16120,7 +16120,7 @@
name "RightGearLeg"
data 14
Gear 4 strut H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 24
@@ -16287,7 +16287,7 @@
name "BrakeUpperOuter"
data 8
Cube.007
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 48
@@ -16597,7 +16597,7 @@
name "LeftGearWheel1"
data 12
Cylinder.005
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 264
@@ -19303,7 +19303,7 @@
name "LeftGearWheel2"
data 12
Cylinder.006
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 264
@@ -22036,7 +22036,7 @@
name "InnerElevonLeft_1"
data 4
Mesh
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 22
@@ -22242,7 +22242,7 @@
name "LeftGearDoorRear"
data 8
Door 4 H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -22302,7 +22302,7 @@
name "RightGearBogey"
data 18
Gear 4 strut H.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 14
@@ -22440,7 +22440,7 @@
name "NoseWheel"
data 12
Cylinder.007
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 132
@@ -23798,7 +23798,7 @@
name "NoseWheelStrut"
data 14
Gear 1 strut H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 36
@@ -24066,7 +24066,7 @@
name "LeftGearLeg"
data 18
Gear 4 strut H.002
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 24
@@ -24233,7 +24233,7 @@
name "LadderUpper"
data 8
Mesh.021
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 72
@@ -24693,7 +24693,7 @@
name "LeftGearDoor"
data 12
Door 3 H.002
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -24753,7 +24753,7 @@
name "Nacelle.001"
data 11
Nacelle 1 H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 66
@@ -25357,7 +25357,7 @@
name "RightBBDoor"
data 12
BombBayDoorL
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -25474,7 +25474,7 @@
name "VStab"
data 13
VStab 1 H.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 34
@@ -25730,7 +25730,7 @@
name "Fuselage"
data 8
Mesh.025
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 237
@@ -27852,7 +27852,7 @@
name "InnerElevonRight_1"
data 8
Mesh.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 21
@@ -28050,7 +28050,7 @@
name "LeftGearStrut"
data 12
Cylinder.002
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 48
@@ -28276,7 +28276,7 @@
name "BombAimer"
data 10
Sphere.003
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 97
@@ -29031,7 +29031,7 @@
name "ECMAriel"
data 8
Cube.002
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -29091,7 +29091,7 @@
name "RightGearPistonHead"
data 14
Gear 2 strut H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -29173,7 +29173,7 @@
name "NoseDoorRight"
data 8
Door 7 H
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -29233,7 +29233,7 @@
name "NoseDoorLeft"
data 12
Door 7 H.001
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 8
@@ -29293,7 +29293,7 @@
name "LadderLower"
data 8
Mesh.027
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 56
@@ -29653,7 +29653,7 @@
name "RightGearPistonBody"
data 18
Gear 2 strut H.003
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -29735,7 +29735,7 @@
name "Wing"
data 8
Mesh.029
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 407
@@ -33784,7 +33784,7 @@
name "LeftBBDoor"
data 11
BomBayDoorR
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 16
@@ -33901,7 +33901,7 @@
name "BrakeUpperInner"
data 8
Cube.006
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 48
@@ -34211,7 +34211,7 @@
name "BrakeLowerLeft"
data 8
Cube.005
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 24
@@ -34371,7 +34371,7 @@
name "GearCover1"
data 5
Plane
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 32
@@ -34581,7 +34581,7 @@
name "CockpitDoor"
data 8
Mesh.031
-texture "//XM597.rgb"
+texture "XM597.rgb"
texrep 1 1
crease 30
numvert 19
Index: Models/vulcanb2.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/Models/vulcanb2.xml,v
retrieving revision 1.4
diff -u -r1.4 vulcanb2.xml
--- Models/vulcanb2.xml 12 Jul 2007 20:39:14 -0000 1.4
+++ Models/vulcanb2.xml 8 Oct 2007 19:59:21 -0000
@@ -1430,73 +1430,10 @@
<!-- Texture controlled by variant -->
<animation>
<type>material</type>
- <object-name>LeftGearHinge</object-name>
- <object-name>BrakeLowerRight</object-name>
- <object-name>RightGearDoorRear</object-name>
- <object-name>OuterElevonLeft</object-name>
- <object-name>Nacelle.004</object-name>
- <object-name>Rudder</object-name>
- <object-name>RightGearHinge</object-name>
- <object-name>RightGearDoor</object-name>
- <object-name>ChuteDoor_1</object-name>
- <object-name>Nacelle.003</object-name>
- <object-name>Nacelle</object-name>
- <object-name>Mesh</object-name>
- <object-name>OuterElevonRight</object-name>
- <object-name>ChuteDoor_0</object-name>
- <!-- <object-name>Cube</object-name> -->
- <object-name>TailScraper</object-name>
- <object-name>BrakeUpperOuter</object-name>
- <object-name>InnerElevonLeft</object-name>
- <object-name>InnerElevonLeft_0</object-name>
- <object-name>InnerElevonLeft_1</object-name>
- <object-name>LeftGearDoorRear</object-name>
- <object-name>LeftGearDoor</object-name>
- <object-name>Nacelle.001</object-name>
- <object-name>RightBBDoor</object-name>
- <object-name>VStab</object-name>
<object-name>Fuselage</object-name>
- <object-name>InnerElevonRight</object-name>
- <object-name>InnerElevonRight_0</object-name>
- <object-name>InnerElevonRight_1</object-name>
- <object-name>BombAimer</object-name>
- <object-name>ECMAriel</object-name>
- <object-name>NoseDoorRight</object-name>
- <object-name>NoseDoorLeft</object-name>
- <object-name>Wing</object-name>
- <object-name>LeftBBDoor</object-name>
- <object-name>BrakeUpperInner</object-name>
- <object-name>BrakeLowerLeft</object-name>
- <object-name>GearCover1</object-name>
- <object-name>CockpitDoor</object-name>
- <texture-prop>/sim/texture</texture-prop>
- <!-- Objects that don't (normally) change with texture -->
- <!--
- <object-name>Cylinder</object-name>
- <object-name>LeftGearPistonHead</object-name>
- <object-name>Chute</object-name>
- <object-name>RightGearStrut</object-name>
- <object-name>RightGearWheel1</object-name>
- <object-name>RightGearWheel2</object-name>
- <object-name>RightGearPistonBody</object-name>
- <object-name>RightGearLeg</object-name>
- <object-name>LeftGearPistonBody</object-name>
- <object-name>LadderLower</object-name>
- <object-name>RightGearPistonHead</object-name>
- <object-name>LeftGearStrut</object-name>
- <object-name>RightGearBogey</object-name>
- <object-name>NoseWheel</object-name>
- <object-name>NoseWheelStrut</object-name>
- <object-name>LeftGearLeg</object-name>
- <object-name>LeftGearWheel1</object-name>
- <object-name>LeftGearWheel2</object-name>
- <object-name>LadderUpper</object-name>
- <object-name>LeftGearBogey</object-name>
- <object-name>InsideCanopy</object-name>
-
-
- -->
-
+ <property-base>sim/model/livery/material</property-base>
+ <texture-prop>texture</texture-prop>
+ <global>true</global>
</animation>
</PropertyList>
Index: Nasal/vulcanb2.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/vulcanb2/Nasal/vulcanb2.nas,v
retrieving revision 1.4
diff -u -r1.4 vulcanb2.nas
--- Nasal/vulcanb2.nas 12 Jul 2007 20:39:14 -0000 1.4
+++ Nasal/vulcanb2.nas 5 Aug 2007 18:08:24 -0000
@@ -250,7 +250,7 @@
# Update the aircraft texture based on the variant
setlistener("sim/variant", func {
- setprop("sim/texture", cmdarg().getValue() ~ ".rgb");
+ setprop("sim/model/livery/material/texture", cmdarg().getValue() ~
".rgb");
});
# Add listener for bomb impact
___________________________________________________________
Want ideas for reducing your carbon footprint? Visit Yahoo! For Good
http://uk.promotions.yahoo.com/forgood/environment.html
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
