From: Erik H. <eh...@ba...> - 2008-08-24 18:00:27
|
Update of /var/cvs/FlightGear-0.9/data/Aircraft/f16/Models In directory baron.flightgear.org:/tmp/cvs-serv5891/Models Modified Files: cockpit.ac f16.ac f16.xml f16trans.rgb Log Message: reinstall the HUD glass. Index: cockpit.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f16/Models/cockpit.ac,v retrieving revision 1.8 retrieving revision 1.9 diff -C 2 -r1.8 -r1.9 *** cockpit.ac 19 Aug 2008 21:16:35 -0000 1.8 --- cockpit.ac 24 Aug 2008 18:00:29 -0000 1.9 *************** *** 5,19 **** MATERIAL "ac3dmat12" rgb 0.266667 0.266667 0.266667 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.5 0.5 0.5 shi 10 trans 0 MATERIAL "ac3dmat13" rgb 0.533333 0.533333 0.533333 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.5 0.5 0.5 shi 10 trans 0 - MATERIAL "ac3dmat0" rgb 0.157 0.157 0.157 amb 0.055 0.059 0.059 emis 0 0 0 spec 0.102 0.102 0.102 shi 5 trans 0 - MATERIAL "ac3dmat14" rgb 0.651 0.651 0.651 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.349 0.349 0.349 shi 80 trans 0 MATERIAL "ac3dmat13" rgb 0.533 0.533 0.533 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.2 0.2 0.208 shi 100 trans 0 MATERIAL "ac3dmat13" rgb 1 1 1 amb 1 1 1 emis 0 0 0 spec 0 0 0 shi 0 trans 0 ! MATERIAL "ac3dmat1" rgb 1 1 1 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.502 0.502 0.502 shi 10 trans 0.408 MATERIAL "ac3dmat0" rgb 0.192 0.157 0.165 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.169 0.169 0.169 shi 71 trans 0 MATERIAL "ac3dmat12" rgb 0.102 0.102 0.102 amb 0.2 0.2 0.2 emis 0 0 0 spec 0.749 0.749 0.749 shi 15 trans 0 ! MATERIAL "ac3dmat13" rgb 0.325 0.251 0.075 amb 0.125 0.125 0.031 emis 0 0 0 spec 0.145 0.145 0.145 shi 3 trans 0 [...3005 lines suppressed...] + 3 0.997642 0.945119 + SURF 0x0 + mat 15 + refs 3 + 0 0 0.945119 + 3 0.997642 0.945119 + 4 0.00434325 4.04622e-07 + SURF 0x0 + mat 15 + refs 3 + 2 0.652821 1 + 3 0.997642 0.945119 + 0 0 0.945119 + SURF 0x0 + mat 15 + refs 3 + 1 0.346244 1 + 2 0.652821 1 + 0 0 0.945119 + kids 0 Index: f16.ac =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f16/Models/f16.ac,v retrieving revision 1.60 retrieving revision 1.61 diff -C 2 -r1.60 -r1.61 *** f16.ac 19 Aug 2008 21:16:35 -0000 1.60 --- f16.ac 24 Aug 2008 18:00:29 -0000 1.61 *************** *** 20,24 **** MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 0 trans 0.467 OBJECT world ! kids 88 OBJECT poly name "fuselage_bottom" --- 20,24 ---- MATERIAL "ac3dmat1" rgb 1 1 1 amb 0 0 0 emis 1 1 1 spec 0 0 0 shi 0 trans 0.467 OBJECT world ! kids 103 OBJECT poly [...3264 lines suppressed...] + 20 0.961908 0.570545 + SURF 0x30 + mat 13 + refs 3 + 14 0.972987 0.493735 + 20 0.961908 0.570545 + 15 0.665243 0.652263 + SURF 0x30 + mat 13 + refs 3 + 17 0.873201 0.849415 + 6 0.900937 0.825196 + 21 0.900937 0.825196 + SURF 0x30 + mat 13 + refs 3 + 11 0.928673 0.800977 + 21 0.900937 0.825196 + 6 0.900937 0.825196 + kids 0 Index: f16.xml =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f16/Models/f16.xml,v retrieving revision 1.44 retrieving revision 1.45 diff -C 2 -r1.44 -r1.45 *** f16.xml 11 Aug 2008 19:51:24 -0000 1.44 --- f16.xml 24 Aug 2008 18:00:30 -0000 1.45 *************** *** 3,11 **** <PropertyList> ! <path>f16.ac</path> <offsets> ! <z-m>0.15</z-m> ! <pitch-deg>0.3</pitch-deg> ! </offsets> <!-- group all position lights --> --- 3,20 ---- <PropertyList> ! <model> ! <name>Cockpit</name> ! <path>Aircraft/f16/Models/cockpit.xml</path> ! </model> ! ! <model> ! <name>Aircraft Body</name> ! <path>Aircraft/f16/Models/f16.ac</path> ! </model> ! <offsets> ! <z-m>0.15</z-m> ! <pitch-deg>0.3</pitch-deg> ! </offsets> <!-- group all position lights --> *************** *** 27,30 **** --- 36,40 ---- <!-- disable shadows for these objects --> + <!-- <animation> <type>noshadow</type> *************** *** 50,62 **** <alpha-factor>0.01</alpha-factor> </animation> <!-- Submodels --> <model> - <name>Cockpit</name> - <path>Aircraft/f16/Models/cockpit.xml</path> - </model> - - <model> <name>LExtTank</name> <path>Aircraft/f16/Models/fueltank.ac</path> --- 60,68 ---- <alpha-factor>0.01</alpha-factor> </animation> + --> <!-- Submodels --> <model> <name>LExtTank</name> <path>Aircraft/f16/Models/fueltank.ac</path> *************** *** 119,124 **** ! <!-- Visible up to 10km (6mi) --> ! <!-- <animation> <type>range</type> --- 125,129 ---- ! <!-- Visible up to 10km (6 miles) --> <animation> <type>range</type> *************** *** 126,139 **** <max-m>10000</max-m> </animation> - --> <!-- fuselage animations --> - <animation> <type>rotate</type> <object-name>canopy_frame</object-name> ! <object-name>canopy_glass_inside</object-name> ! <object-name>canopy_glass_outside</object-name> <property>sim/model/f16/canopy/position-norm</property> <factor>30.0</factor> --- 131,141 ---- <max-m>10000</max-m> </animation> <!-- fuselage animations --> <animation> <type>rotate</type> <object-name>canopy_frame</object-name> ! <object-name>canopy_glass_fwd</object-name> <property>sim/model/f16/canopy/position-norm</property> <factor>30.0</factor> *************** *** 452,456 **** </animation> - <!-- <animation> <type>translate</type> --- 454,457 ---- *************** *** 465,469 **** </axis> </animation> - --> <animation> --- 466,469 ---- Index: f16trans.rgb =================================================================== RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/f16/Models/f16trans.rgb,v retrieving revision 1.5 retrieving revision 1.6 diff -C 2 -r1.5 -r1.6 Binary files /tmp/cvs6uvGvd and /tmp/cvsG0KC3E differ |