Update of /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models In directory baron.flightgear.org:/tmp/cvs-serv4354/Models Modified Files: Citation-X.xml CitationX.ac cabin.ac cabin.xml flightdeck.ac flightdeck.xml Added Files: registration.xml Log Message: added reg numbers , MP animation updates --- NEW FILE "registration.xml" --- <?xml version="1.0"?> <PropertyList> <params> <size>1.0</size> <alignment>yz-plane</alignment> <color> <red type="double">0.0</red> <green type="double">0.0</green> <blue type="double">0.0</blue> </color> </params> <text> <alignment>center-center</alignment> <axis-alignment alias="../../params/alignment"/> <type type="string">text-value</type> <property type="string">sim/multiplay/generic/string[0]</property> <format type="string">%.7s</format> <font>arial_black.txf</font> <character-size alias="../../params/size"/> <character-aspect-ratio type="double">2.0</character-aspect-ratio> <draw-alignment type="bool">false</draw-alignment> <font-resolution> <width type="int">128</width> <height type="int">128</height> </font-resolution> </text> <animation> <type>material</type> <emission> <red>0</red> <green>0</green> <blue>0</blue> </emission> <ambient> <red alias="../../../params/color/red"/> <green alias="../../../params/color/green"/> <blue alias="../../../params/color/blue"/> </ambient> <diffuse> <red alias="../../../params/color/red"/> <green alias="../../../params/color/green"/> <blue alias="../../../params/color/blue"/> </diffuse> <specular> <red alias="../../../params/color/red"/> <green alias="../../../params/color/green"/> <blue alias="../../../params/color/blue"/> </specular> </animation> </PropertyList> Index: Citation-X.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/Citation-X.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- Citation-X.xml 25 Jul 2009 22:03:56 -0000 1.16 +++ Citation-X.xml 31 Aug 2009 02:03:39 -0000 1.17 @@ -40,9 +40,53 @@ <texture>livery1.png</texture> </animation> + <model><!-- LH tail reg--> + <path>Aircraft/CitationX/Models/registration.xml</path> + <offsets> + <x-m>7.0</x-m> + <y-m>-0.14</y-m> + <z-m>1.910</z-m> + <roll-deg>0</roll-deg> + <pitch-deg>0</pitch-deg> + <heading-deg>2</heading-deg> + </offsets> + <overlay> + <params> + <size>1.0</size> + <alignment>xz-plane</alignment> + <color> + <red>0.02</red> + <green>0.02</green> + <blue>0.02</blue> + </color> + </params> + </overlay> + </model> + + <model><!-- RH tail reg--> + <path>Aircraft/CitationX/Models/registration.xml</path> + <offsets> + <x-m>7.0</x-m> + <y-m>0.14</y-m> + <z-m>1.910</z-m> + <roll-deg>0</roll-deg> + <pitch-deg>0</pitch-deg> + <heading-deg>-2</heading-deg> + </offsets> + <overlay> + <params> + <size>1.0</size> + <alignment>reversed-xz-plane</alignment> + <color> + <red>0.02</red> + <green>0.02</green> + <blue>0.02</blue> + </color> + </params> + </overlay> + </model> - - <model> + <!--model> <name>shadow</name> <path>Aircraft/CitationX/Models/shadow.xml</path> <offsets> @@ -51,15 +95,15 @@ <z-m>-2.2</z-m> <pitch-deg>0</pitch-deg> </offsets> - </model> + </model--> - <animation> + <!--animation> <type>select</type> <object-name>shadow</object-name> <condition> <property>sim/rendering/shadows-ac</property> </condition> - </animation> + </animation--> <model> <name>cabin</name> @@ -139,7 +183,7 @@ <animation> <type>rotate</type> <object-name>Cabin.lwrdoor</object-name> - <property>controls/cabin-door/position-norm</property> + <property>sim/multiplay/generic/float</property> <interpolation> <entry><ind>0.0</ind><dep>0.0</dep></entry> <entry><ind>1.0</ind><dep>155.0</dep></entry> @@ -159,7 +203,7 @@ <animation> <type>translate</type> <object-name>Cabin.door</object-name> - <property>controls/cabin-door/position-norm</property> + <property>sim/multiplay/generic/float</property> <factor>0.4</factor> <axis> <x>0.0</x> @@ -171,7 +215,7 @@ <animation> <type>rotate</type> <object-name>Cabin.door</object-name> - <property>controls/cabin-door/position-norm</property> + <property>sim/multiplay/generic/float</property> <interpolation> <entry><ind>0.0</ind><dep>0.0</dep></entry> <entry><ind>1.0</ind><dep>140.0</dep></entry> @@ -443,7 +487,7 @@ <type>rotate</type> <object-name>UprReverser</object-name> <object-name>UprReverser.001</object-name> - <property>sim/multiplay/generic/float[0]</property> + <property>sim/multiplay/generic/float[2]</property> <factor>74</factor> <center> <x-m>5.368</x-m> @@ -461,7 +505,7 @@ <type>rotate</type> <object-name>LwrReverser</object-name> <object-name>LwrReverser.001</object-name> - <property>sim/multiplay/generic/float[0]</property> + <property>sim/multiplay/generic/float[2]</property> <factor>-72</factor> <center> <x-m>5.368</x-m> @@ -964,7 +1008,7 @@ <object-name>redlamp.on</object-name> <condition> <greater-than> - <property>systems/electrical/outputs/nav-lights</property> + <property>sim/multiplay/generic/int[6]</property> <value>1</value> </greater-than> </condition> @@ -976,7 +1020,7 @@ <object-name>redlamp.off</object-name> <condition> <less-than> - <property>systems/electrical/outputs/nav-lights</property> + <property>sim/multiplay/generic/int[6]</property> <value>1.001</value> </less-than> </condition> Index: CitationX.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/CitationX.ac,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- CitationX.ac 25 Jul 2009 22:03:56 -0000 1.16 +++ CitationX.ac 31 Aug 2009 02:03:39 -0000 1.17 @@ -3,8 +3,8 @@ MATERIAL "illum" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0 MATERIAL "gloss" rgb 0.9 0.9 0.9 amb 0.9 0.9 0.9 emis 0 0 0 spec 1 1 1 shi 64 trans 0 MATERIAL "Black.003" rgb 0.5 0.5 0.5 amb 0.5 0.5 0.5 emis 0 0 0 spec 0 0 0 shi 0 trans 0 -MATERIAL "shade" rgb 0.2 0.2 0.2 amb 0 0 0 emis 0.1 0.1 0.1 spec 0 0 0 shi 0 trans 0 -MATERIAL "transp" rgb 0.5 0.5 0.5 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 32 trans 0.3 +MATERIAL "shade" rgb 0.2 0.2 0.2 amb 0.2 0.2 0.2 emis 0.1 0.1 0.1 spec 0 0 0 shi 0 trans 0 +MATERIAL "transp" rgb 0.5 0.5 0.5 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 trans 0.3 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 "dark" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0.1 0.1 0.1 spec 0.1 0.1 0.1 shi 5 trans 0 OBJECT world @@ -5179,12 +5179,12 @@ 5.126903 1.464524 0.071541 5.129965 1.463782 -0.074923 5.333643 1.346756 -0.16607 -8.626725 2.549154 -0.107846 -8.621057 2.549446 0.105232 -7.032528 2.577668 0.163029 +8.626725 2.549154 -0.094907 +8.621057 2.549446 0.092267 +7.032528 2.577668 0.143038 6.832669 2.693768 0.07154 6.835731 2.693026 -0.074923 -7.039409 2.576001 -0.166069 +7.039409 2.576001 -0.146052 7.422418 2.916256 0.163029 7.222559 3.032357 0.07154 7.225621 3.031615 -0.074923 Index: cabin.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/cabin.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cabin.ac 25 Jul 2009 22:03:57 -0000 1.1 +++ cabin.ac 31 Aug 2009 02:03:43 -0000 1.2 @@ -1,6 +1,6 @@ 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 "dark.001" rgb 0.665008 0.665008 0.665008 amb 1 1 1 emis 0.1 0.1 0.1 spec 0.6 0.6 0.6 shi 17 trans 0 +MATERIAL "dark.001" rgb 0.665008 0.665008 0.665008 amb 0.665008 0.665008 0.665008 emis 0.1 0.1 0.1 spec 0.6 0.6 0.6 shi 17 trans 0 OBJECT world kids 6 OBJECT poly Index: cabin.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/cabin.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cabin.xml 25 Jul 2009 22:03:57 -0000 1.1 +++ cabin.xml 31 Aug 2009 02:03:44 -0000 1.2 @@ -7,7 +7,7 @@ <animation> <type>translate</type> <object-name>Cabin.inrdoor</object-name> - <property>controls/cabin-door/position-norm</property> + <property>sim/multiplay/generic/float</property> <interpolation> <entry><ind>0.0</ind><dep>0.0</dep></entry> <entry><ind>1.0</ind><dep>0.4</dep></entry> @@ -22,7 +22,7 @@ <animation> <type>rotate</type> <object-name>Cabin.inrdoor</object-name> - <property>controls/cabin-door/position-norm</property> + <property>sim/multiplay/generic/float</property> <interpolation> <entry><ind>0.0</ind><dep>0.0</dep></entry> <entry><ind>1.0</ind><dep>140.0</dep></entry> Index: flightdeck.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/flightdeck.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- flightdeck.ac 25 Jul 2009 22:03:57 -0000 1.1 +++ flightdeck.ac 31 Aug 2009 02:03:45 -0000 1.2 @@ -2,18 +2,18 @@ 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 "gloss" rgb 0.9 0.9 0.9 amb 0.9 0.9 0.9 emis 0 0 0 spec 1 1 1 shi 64 trans 0 MATERIAL "DKgrey" rgb 0.1 0.1 0.1 amb 0.1 0.1 0.1 emis 0 0 0 spec 0.340523 0.340523 0.340523 shi 32 trans 0 -MATERIAL "Red" rgb 0.7 0.2 0.2 amb 0.303268 0.303268 0.303268 emis 0 0 0 spec 0.908092 0.723033 0.723033 shi 32 trans 0 -MATERIAL "whiteswitch" rgb 0.8 0.8 0.8 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 32 trans 0 +MATERIAL "Red" rgb 0.7 0.2 0.2 amb 0.7 0.2 0.2 emis 0 0 0 spec 0.908092 0.723033 0.723033 shi 32 trans 0 +MATERIAL "whiteswitch" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0 0 0 spec 1 1 1 shi 32 trans 0 MATERIAL "illum" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0 0 0 shi 0 trans 0 MATERIAL "Black" rgb 0 0 0 amb 0 0 0 emis 0 0 0 spec 0 0 0 shi 32 trans 0 MATERIAL "dark" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0.1 0.1 0.1 spec 0.1 0.1 0.1 shi 5 trans 0 -MATERIAL "greenswitch" rgb 0.131303 0.514088 0.199519 amb 0.316329 0.316329 0.316329 emis 0 0 0 spec 1 1 1 shi 32 trans 0 -MATERIAL "instr-lights.001" rgb 0.8 0.8 0.8 amb 0.9 0.9 0.9 emis 1 1 1 spec 0 0 0 shi 32 trans 0 -MATERIAL "BlkMetal" rgb 0.057032 0.057032 0.057032 amb 0.122222 0.122222 0.122222 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 trans 0 -MATERIAL "dark.001" rgb 0.665008 0.665008 0.665008 amb 1 1 1 emis 0.1 0.1 0.1 spec 0.6 0.6 0.6 shi 17 trans 0 -MATERIAL "BlkMetal.002" rgb 0.1 0.1 0.1 amb 0.066666 0.066666 0.066666 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 trans 0 -MATERIAL "LIT" rgb 0.780308 0.696197 0.573169 amb 1 1 1 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0 -MATERIAL "Material.002" rgb 0.852252 0.518829 0.202954 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 32 trans 0 +MATERIAL "greenswitch" rgb 0.131303 0.514088 0.199519 amb 0.131303 0.514088 0.199519 emis 0 0 0 spec 1 1 1 shi 32 trans 0 +MATERIAL "instr-lights.001" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 1 1 1 spec 0 0 0 shi 32 trans 0 +MATERIAL "BlkMetal" rgb 0.057032 0.057032 0.057032 amb 0.057032 0.057032 0.057032 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 trans 0 +MATERIAL "dark.001" rgb 0.665008 0.665008 0.665008 amb 0.665008 0.665008 0.665008 emis 0.1 0.1 0.1 spec 0.6 0.6 0.6 shi 17 trans 0 +MATERIAL "BlkMetal.002" rgb 0.1 0.1 0.1 amb 0.1 0.1 0.1 emis 0 0 0 spec 0.5 0.5 0.5 shi 32 trans 0 +MATERIAL "LIT" rgb 0.780308 0.696197 0.573169 amb 0.780308 0.696197 0.573169 emis 0.7 0.7 0.7 spec 0 0 0 shi 0 trans 0 +MATERIAL "Material.002" rgb 0.852252 0.518829 0.202954 amb 0.852252 0.518829 0.202954 emis 0 0 0 spec 1 1 1 shi 32 trans 0 OBJECT world kids 116 OBJECT group Index: flightdeck.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/CitationX/Models/flightdeck.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- flightdeck.xml 25 Jul 2009 22:03:57 -0000 1.1 +++ flightdeck.xml 31 Aug 2009 02:03:46 -0000 1.2 @@ -6,6 +6,52 @@ <!-- Instruments --> + <model><!-- Pilot reg label--> + <path>Aircraft/CitationX/Models/registration.xml</path> + <offsets> + <x-m>-7.828</x-m> + <y-m>-0.246</y-m> + <z-m>0.219</z-m> + <roll-deg>0</roll-deg> + <pitch-deg>-10</pitch-deg> + <heading-deg>0</heading-deg> + </offsets> + <overlay> + <params> + <size>0.04</size> + <alignment>yz-plane</alignment> + <color> + <red>0.8</red> + <green>0.8</green> + <blue>0.8</blue> + </color> + </params> + </overlay> + </model> + + <model><!-- CoPilot reg label--> + <path>Aircraft/CitationX/Models/registration.xml</path> + <offsets> + <x-m>-7.828</x-m> + <y-m>0.267</y-m> + <z-m>0.219</z-m> + <roll-deg>0</roll-deg> + <pitch-deg>-10</pitch-deg> + <heading-deg>0</heading-deg> + </offsets> + <overlay> + <params> + <size>0.04</size> + <alignment>yz-plane</alignment> + <color> + <red>0.8</red> + <green>0.8</green> + <blue>0.8</blue> + </color> + </params> + </overlay> + </model> + <model> <path>Aircraft/CitationX/Models/Instruments/ALT.xml</path> <offsets> |