Menu
▾
▴
[Flightgear-cvslogs] CVS: data/Aircraft/A-6E/Models A-6E-model.xml, 1.4, 1.5 ldg-controls.ac, 1.1, 1.2 ldg-controls.xml, NONE, 1.1
|
From: Melchior F. <mf...@fl...> - 2007-06-29 16:57:52
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/A-6E/Models In directory baron:/tmp/cvs-serv26563/Models Modified Files: A-6E-model.xml ldg-controls.ac Added Files: ldg-controls.xml Log Message: Alexis BORY: "Added landing gear panel, tuned position light dist-scale." Index: A-6E-model.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/A-6E/Models/A-6E-model.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C 2 -r1.4 -r1.5 *** A-6E-model.xml 18 Jun 2007 20:02:53 -0000 1.4 --- A-6E-model.xml 29 Jun 2007 16:46:18 -0000 1.5 *************** *** 185,188 **** --- 185,197 ---- <model> + <path>Aircraft/A-6E/Models/ldg-controls.xml</path> + <offsets> + <x-m>2.6057</x-m> + <y-m>-0.6771</y-m> + <z-m>0.8116</z-m> + </offsets> + </model> + + <model> <path>Aircraft/A-6E/Models/engine-gauges.xml</path> <offsets> *************** *** 2036,2039 **** --- 2045,2053 ---- <!-- ############## Position External Lighting ############## --> + <light-params> + <position-factor>4</position-factor> + <position-factor-dim>2</position-factor-dim> + <colision-factor>8</colision-factor> + </light-params> <!-- position-tail --> <animation> *************** *** 2082,2088 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>6</x-factor> ! <y-factor>6</y-factor> ! <z-factor>6</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2096,2102 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor"/> ! <y-factor alias="../../light-params/position-factor"/> ! <z-factor alias="../../light-params/position-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2094,2099 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> --- 2108,2113 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2.5</dep></entry> ! <entry><ind>16000</ind><dep>7</dep></entry> </interpolation> </animation> *************** *** 2144,2150 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>3.5</x-factor> ! <y-factor>3.5</y-factor> ! <z-factor>3.5</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2158,2164 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor-dim"/> ! <y-factor alias="../../light-params/position-factor-dim"/> ! <z-factor alias="../../light-params/position-factor-dim"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2156,2161 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> --- 2170,2175 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2.5</dep></entry> ! <entry><ind>16000</ind><dep>7</dep></entry> </interpolation> </animation> *************** *** 2197,2203 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>6</x-factor> ! <y-factor>6</y-factor> ! <z-factor>6</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2211,2217 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor"/> ! <y-factor alias="../../light-params/position-factor"/> ! <z-factor alias="../../light-params/position-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2248,2254 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>3.5</x-factor> ! <y-factor>3.5</y-factor> ! <z-factor>3.5</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2262,2268 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor-dim"/> ! <y-factor alias="../../light-params/position-factor-dim"/> ! <z-factor alias="../../light-params/position-factor-dim"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2301,2307 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>6</x-factor> ! <y-factor>6</y-factor> ! <z-factor>6</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2315,2321 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor"/> ! <y-factor alias="../../light-params/position-factor"/> ! <z-factor alias="../../light-params/position-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2352,2358 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>3.5</x-factor> ! <y-factor>3.5</y-factor> ! <z-factor>3.5</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2366,2372 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/position-factor-dim"/> ! <y-factor alias="../../light-params/position-factor-dim"/> ! <z-factor alias="../../light-params/position-factor-dim"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2407,2413 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2421,2427 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2419,2424 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2433,2438 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> *************** *** 2458,2464 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2472,2478 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2470,2475 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2484,2489 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> *************** *** 2504,2510 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2518,2524 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2516,2521 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2530,2535 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> *************** *** 2549,2555 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2563,2569 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2561,2566 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2575,2580 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> *************** *** 2595,2601 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2609,2615 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2607,2612 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2621,2626 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> *************** *** 2640,2646 **** <y-min>1</y-min> <z-min>1</z-min> ! <x-factor>8</x-factor> ! <y-factor>8</y-factor> ! <z-factor>8</z-factor> <x-offset>1</x-offset> <y-offset>1</y-offset> --- 2654,2660 ---- <y-min>1</y-min> <z-min>1</z-min> ! <x-factor alias="../../light-params/colision-factor"/> ! <y-factor alias="../../light-params/colision-factor"/> ! <z-factor alias="../../light-params/colision-factor"/> <x-offset>1</x-offset> <y-offset>1</y-offset> *************** *** 2652,2657 **** <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>4</dep></entry> ! <entry><ind>50000</ind><dep>500</dep></entry> </interpolation> </animation> --- 2666,2671 ---- <interpolation> <entry><ind>0</ind><dep>1</dep></entry> ! <entry><ind>500</ind><dep>2</dep></entry> ! <entry><ind>50000</ind><dep>300</dep></entry> </interpolation> </animation> Index: ldg-controls.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/A-6E/Models/ldg-controls.ac,v retrieving revision 1.1 retrieving revision 1.2 diff -C 2 -r1.1 -r1.2 *** ldg-controls.ac 18 Jun 2007 20:02:54 -0000 1.1 --- ldg-controls.ac 29 Jun 2007 16:46:18 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- AC3Db MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0 + MATERIAL "ac3dmat12" rgb 0.266667 0.266667 0.266667 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.2 shi 128 trans 0 OBJECT world kids 1 *************** *** 8,1624 **** kids 6 OBJECT poly [...4668 lines suppressed...] ! 27 0.96465 0.0181508 SURF 0x10 mat 0 refs 3 ! 26 0.990853 0.0486033 ! 64 0.96465 0.0181508 ! 65 0.990853 0.0486033 SURF 0x10 mat 0 refs 3 ! 64 0.96465 0.0181508 ! 28 0.91829 0.00364982 ! 63 0.91829 0.00364982 SURF 0x10 mat 0 refs 3 ! 28 0.91829 0.00364982 ! 64 0.96465 0.0181508 ! 27 0.96465 0.0181508 kids 0 --- NEW FILE --- <?xml version="1.0"?> <PropertyList> <path>ldg-controls.ac</path> <animation> <type>rotate</type> <object-name>handle</object-name> <property>sim/model/A-6E/controls/gear/ld-gear-handle-anim</property> <interpolation> <entry><ind>-1</ind><dep>-36</dep></entry> <entry><ind>-0.5</ind><dep>0</dep></entry> <entry><ind>0</ind><dep>36</dep></entry> </interpolation> <center> <x-m>-0.0221</x-m> <y-m>0</y-m> <z-m>-0.0050</z-m> </center> <axis> <x>0</x> <y>-1</y> <z>0</z> </axis> </animation> <animation> <type>rotate</type> <object-name>switch</object-name> <property>sim/model/A-6E/controls/gear/ld-gear-handle-anim</property> <interpolation> <entry><ind>-1</ind><dep>-30</dep></entry> <entry><ind>-0.60</ind><dep>30</dep></entry> <entry><ind>0</ind><dep>30</dep></entry> </interpolation> <center> <x-m>-0.0019</x-m> <y-m>0</y-m> <z-m>-0.0474</z-m> </center> <axis> <x>0</x> <y>-1</y> <z>0</z> </axis> </animation> <animation> <type>select</type> <object-name>lamp-on</object-name> <condition> <greater-than> <property>gear/gear[0]/position-norm</property> <value>0</value> </greater-than> <less-than> <property>gear/gear[0]/position-norm</property> <value>1</value> </less-than> <greater-than> <property>gear/gear[1]/position-norm</property> <value>0</value> </greater-than> <less-than> <property>gear/gear[1]/position-norm</property> <value>1</value> </less-than> <greater-than> <property>gear/gear[2]/position-norm</property> <value>0</value> </greater-than> <less-than> <property>gear/gear[2]/position-norm</property> <value>1</value> </less-than> <property>sim/model/A-6E/lighting/warn-fast-lights-switch/state</property> </condition> </animation> <!-- lighting --> <animation> <object-name>mount</object-name> <type>material</type> <emission> <factor-prop>controls/lighting/panel-norm</factor-prop> <red>0.45</red> <green>0.34</green> <blue>0.18</blue> </emission> </animation> <animation> <object-name>handle</object-name> <type>material</type> <emission> <factor-prop>controls/lighting/panel-norm</factor-prop> <red>0.45</red> <green>0.34</green> <blue>0.18</blue> </emission> </animation> <animation> <object-name>switch</object-name> <type>material</type> <emission> <factor-prop>controls/lighting/panel-norm</factor-prop> <red>0.45</red> <green>0.34</green> <blue>0.18</blue> </emission> </animation> <animation> <object-name>lamp-on</object-name> <type>material</type> <emission> <red>1.0</red> <green>1.0</green> <blue>1.0</blue> </emission> </animation> <animation> <object-name>ldg-controls</object-name> <type>noshadow</type> </animation> <animation> <type>range</type> <min-m>0</min-m> <max-m>35</max-m> </animation> </PropertyList> |