CVS: data/Aircraft/B-1B/Models b1b_body_front.png, NONE, 1.1 b1b_body_rear.png, NONE, 1.1 glass_shader.png, NONE, 1.1 halos.rgb, NONE, 1.1 instruments.xml~, NONE, 1.1 poslightgreen.ac, NONE, 1.1 poslightleft.ac, NONE, 1.1 window_green_tp.png, NONE, 1.1 window_red_tp.png, NONE, 1.1 B-1B.xml, 1.9, 1.10 b1b.ac, 1.8, 1.9 b1b_trans.ac, 1.5, 1.6 b1b_trans.xml, 1.9, 1.10 bone-body.png, 1.3, 1.4 instruments.xml, 1.5, 1.6 interior.png, 1.3, 1.4 landing_cone.xml, 1.1, 1.2 landing_cone1.ac, 1.1, 1.2 landing_spot.xml, 1.1, 1.2 posgreen.xml, 1.1, 1.2 posred.xml, 1.1, 1.2 strobe.ac, 1.1, 1.2 strobe.xml, 1.1, 1.2 aircraft_wash.xml, 1.2, NONE green.rgb, 1.1, NONE landing_spot_rwy.ac, 1.1, NONE landing_spot_rwy.xml, 1.1, NONE posgreen.ac, 1.1, NONE posred.ac, 1.1, NONE red.rgb, 1.1, NONE
Martin Spott <[email protected]>
| Newsgroups | gmane.games.flightgear.cvc |
|---|---|
| Message-ID | <[email protected]> |
Update of /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models
In directory baron.flightgear.org:/tmp/cvs-serv7610/Models
Modified Files:
B-1B.xml b1b.ac b1b_trans.ac b1b_trans.xml bone-body.png
instruments.xml interior.png landing_cone.xml landing_cone1.ac
landing_spot.xml posgreen.xml posred.xml strobe.ac strobe.xml
Added Files:
b1b_body_front.png b1b_body_rear.png glass_shader.png
halos.rgb instruments.xml~ poslightgreen.ac poslightleft.ac
window_green_tp.png window_red_tp.png
Removed Files:
aircraft_wash.xml green.rgb landing_spot_rwy.ac
landing_spot_rwy.xml posgreen.ac posred.ac red.rgb
Log Message:
Markus Zojer - B-1B easter update:
- terrain following script rewritten
- guided ordonance system rewritten
- exterior model texture improvenments
- new instruments(IKB + MFD) for WSO position
- cdu-900 prototype for nav/com input/display
- radar now sorts for distance, displays closest
--- NEW BINARY FILE "b1b_body_front.png" ---
--- NEW BINARY FILE "b1b_body_rear.png" ---
--- NEW BINARY FILE "glass_shader.png" ---
--- NEW BINARY FILE "halos.rgb" ---
--- NEW FILE "instruments.xml~" ---
<?xml version="1.0"?>
<!--
more to come :-)
-->
<PropertyList>
<path>Instruments-3d/sweep_scale.ac</path>
<offsets>
<x-m>-0.42</x-m>
<y-m>0.15</y-m>
<z-m>-0.297</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
<animation>
<type>select</type>
<object-name>fuel_cov.007</object-name>
<condition>
<greater-than>
<property>controls/engines/engine[0]/afterburner</property>
<value>1.0</value>
</greater-than>
</condition>
</animation>
<!-- cockpit -->
<model>
<name>pfdb1-copilot</name>
<path>Aircraft/B-1B/Models/Instruments-3d/pfdb1.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.435</y-m>
<z-m>1.197</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>hud alt-copilot</name>
<path>Aircraft/B-1B/Models/Instruments-3d/hud_alt.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.828</y-m>
<z-m>1.185</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>hud mach-copilot</name>
<path>Aircraft/B-1B/Models/Instruments-3d/hud_mach.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.853</y-m>
<z-m>1.185</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>cautionind-copilot</name>
<path>Aircraft/B-1B/Models/Instruments-3d/caution_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.800</y-m>
<z-m>1.235</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>pfdb1</name>
<path>Aircraft/B-1B/Models/Instruments-3d/pfdb1.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.675</y-m>
<z-m>1.197</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>hud alt</name>
<path>Aircraft/B-1B/Models/Instruments-3d/hud_alt.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.288</y-m>
<z-m>1.185</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>hud mach</name>
<path>Aircraft/B-1B/Models/Instruments-3d/hud_mach.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.253</y-m>
<z-m>1.185</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>eng</name>
<path>Aircraft/B-1B/Models/Instruments-3d/eng_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.210</y-m>
<z-m>1.210</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>cg mac</name>
<path>Aircraft/B-1B/Models/Instruments-3d/mac_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.205</y-m>
<z-m>1.210</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fcgms</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fcgms.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.270</y-m>
<z-m>1.210</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>radaralt</name>
<path>Aircraft/B-1B/Models/Instruments-3d/radar_alt.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.530</y-m>
<z-m>1.315</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>hsi</name>
<path>Aircraft/B-1B/Models/Instruments-3d/nd.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.675</y-m>
<z-m>0.998</z-m>
<pitch-deg>-1</pitch-deg>
</offsets>
</model>
<model>
<name>clock</name>
<path>Aircraft/Instruments-3d/clock/clock.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.895</y-m>
<z-m>1.110</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>gearind</name>
<path>Aircraft/B-1B/Models/Instruments-3d/gear_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.325</y-m>
<z-m>0.920</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>cautionind</name>
<path>Aircraft/B-1B/Models/Instruments-3d/caution_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.330</y-m>
<z-m>1.235</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fltdir</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fltdir.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.584</y-m>
<z-m>0.855</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>reporter-lights</name>
<path>Aircraft/B-1B/Models/Instruments-3d/rep_lights.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.584</y-m>
<z-m>0.855</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fireind</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fire_ind.xml</path>
<offsets>
<x-m>-18.180</x-m>
<y-m>0.154</y-m>
<z-m>1.242</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>apmode</name>
<path>Aircraft/B-1B/Models/Instruments-3d/apmode.xml</path>
<offsets>
<x-m>-18.150</x-m>
<y-m>-0.620</y-m>
<z-m>0.920</z-m>
<roll-deg>-22</roll-deg>
</offsets>
</model>
<model>
<name>alt</name>
<path>Aircraft/Instruments-3d/alt-2/alt2-3d.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.346</y-m>
<z-m>1.170</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>vsi</name>
<path>Aircraft/Instruments-3d/vsi-6/vsi-3d.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.432</y-m>
<z-m>1.170</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>ai</name>
<path>Aircraft/Instruments-3d/attitude-indicator.xml</path>
<offsets>
<x-m>-18.200</x-m>
<y-m>-0.433</y-m>
<z-m>1.270</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>sweep</name>
<path>Aircraft/B-1B/Models/Instruments-3d/sweep_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.336</y-m>
<z-m>1.025</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>bomb doors</name>
<path>Aircraft/B-1B/Models/Instruments-3d/nuc.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.336</y-m>
<z-m>1.025</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>terrain_flw</name>
<path>Aircraft/B-1B/Models/Instruments-3d/terflw_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.105</y-m>
<z-m>0.910</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>display big</name>
<path>Aircraft/B-1B/Models/Instruments-3d/display_big.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.105</y-m>
<z-m>0.900</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fuel indicator</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fuel_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.110</y-m>
<z-m>1.013</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fuel valves</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fuelvalves.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.050</y-m>
<z-m>1.120</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>fuel positions</name>
<path>Aircraft/B-1B/Models/Instruments-3d/fuelpos_ind.xml</path>
<offsets>
<x-m>-18.210</x-m>
<y-m>0.035</y-m>
<z-m>0.993</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<!-- left console -->
<model>
<name>sweep lever</name>
<path>Aircraft/B-1B/Models/Instruments-3d/sweep_lever.xml</path>
<offsets>
<x-m>-17.770</x-m>
<y-m>-1.075</y-m>
<z-m>0.770</z-m>
<pitch-deg>0</pitch-deg>
<heading-deg>-5</heading-deg>
</offsets>
</model>
<model>
<name>throttle2</name>
<path>Aircraft/B-1B/Models/Instruments-3d/throttle_left.xml</path>
<offsets>
<x-m>-17.550</x-m>
<y-m>-0.823</y-m>
<z-m>0.870</z-m>
<pitch-deg>-90</pitch-deg>
<roll-deg>-5</roll-deg>
</offsets>
</model>
<model>
<name>alter throt left</name>
<path>Aircraft/B-1B/Models/Instruments-3d/alter_throt_l.xml</path>
<offsets>
<x-m>-17.620</x-m>
<y-m>-1.266</y-m>
<z-m>0.907</z-m>
<pitch-deg>-90</pitch-deg>
<roll-deg>-3</roll-deg>
</offsets>
</model>
<!-- middle console -->
<model>
<name>engine switch</name>
<path>Aircraft/B-1B/Models/Instruments-3d/eng_switch.xml</path>
<offsets>
<x-m>-17.650</x-m>
<y-m>0.270</y-m>
<z-m>0.710</z-m>
<pitch-deg>-90</pitch-deg>
</offsets>
</model>
<model>
<name>cdu900</name>
<path>Aircraft/B-1B/Models/Instruments-3d/cdu900.xml</path>
<offsets>
<x-m>-17.960</x-m>
<y-m>-0.137</y-m>
<z-m>0.710</z-m>
<pitch-deg>-90</pitch-deg>
</offsets>
</model>
<model>
<name>tacan sw</name>
<path>Aircraft/B-1B/Models/Instruments-3d/ARN-118-tacan.xml</path>
<offsets>
<x-m>-18.000</x-m>
<y-m>-0.290</y-m>
<z-m>0.720</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>throttle</name>
<path>Aircraft/B-1B/Models/Instruments-3d/throttle.xml</path>
<offsets>
<x-m>-17.730</x-m>
<y-m>0.185</y-m>
<z-m>0.710</z-m>
<pitch-deg>-90</pitch-deg>
</offsets>
</model>
<model>
<name>alter throt</name>
<path>Aircraft/B-1B/Models/Instruments-3d/alter_throt.xml</path>
<offsets>
<x-m>-17.830</x-m>
<y-m>-0.263</y-m>
<z-m>0.710</z-m>
<pitch-deg>-90</pitch-deg>
</offsets>
</model>
<!-- overhead panel -->
<model>
<name>overhead panel</name>
<path>Aircraft/B-1B/Models/Instruments-3d/overhead_panel.xml</path>
<offsets>
<x-m>-17.920</x-m>
<y-m>-0.126</y-m>
<z-m>1.780</z-m>
<pitch-deg>75</pitch-deg>
</offsets>
</model>
<!-- WSO instruments xxxxxxxxxxxxxxxxxxxxxxxxx -->
<model>
<name>DSO nd</name>
<path>Aircraft/B-1B/Models/Instruments-3d/nd.xml</path>
<condition>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
</condition>
<offsets>
<x-m>-15.700</x-m>
<y-m>-0.800</y-m>
<z-m>1.380</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
</model>
<model>
<name>DSO screen1</name>
<path>Aircraft/B-1B/Models/Instruments-3d/nd_big.ac</path>
<condition>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
</condition>
<offsets>
<x-m>-15.790</x-m>
<y-m>-0.790</y-m>
<z-m>1.650</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>DSO screen2</name>
<path>Aircraft/B-1B/Models/Instruments-3d/nd_big.ac</path>
<condition>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
</condition>
<offsets>
<x-m>-15.790</x-m>
<y-m>-0.530</y-m>
<z-m>1.650</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>DSO alt</name>
<path>Aircraft/Instruments-3d/alt-2/alt2-3d.xml</path>
<condition>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
</condition>
<offsets>
<x-m>-15.770</x-m>
<y-m>-0.720</y-m>
<z-m>1.830</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>DSO ai</name>
<path>Aircraft/Instruments-3d/attitude-indicator.xml</path>
<condition>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
</condition>
<offsets>
<x-m>-15.770</x-m>
<y-m>-0.620</y-m>
<z-m>1.830</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<!-- OSO instrumentation -->
<model>
<name>OSO mfd</name>
<path>Aircraft/B-1B/Models/Instruments-3d/wso_mfd.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.715</x-m>
<y-m>0.370</y-m>
<z-m>1.385</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
</model>
<model>
<name>OSO sms</name>
<path>Aircraft/B-1B/Models/Instruments-3d/sms.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.710</x-m>
<y-m>0.660</y-m>
<z-m>1.380</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
</model>
<model>
<name>OSO smsmonitor</name>
<path>Aircraft/B-1B/Models/Instruments-3d/sms_monitor.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.793</x-m>
<y-m>0.615</y-m>
<z-m>1.640</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>OSO ikb</name>
<path>Aircraft/B-1B/Models/Instruments-3d/ikb.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.710</x-m>
<y-m>0.492</y-m>
<z-m>1.380</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
</model>
<model>
<name>OSO bombnav</name>
<path>Aircraft/B-1B/Models/Instruments-3d/bombnav.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.794</x-m>
<y-m>0.283</y-m>
<z-m>1.635</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>OSO targetmonitor</name>
<path>Aircraft/B-1B/Models/Instruments-3d/target_monitor.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.793</x-m>
<y-m>0.380</y-m>
<z-m>1.640</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>OSO alt</name>
<path>Aircraft/Instruments-3d/alt-2/alt2-3d.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.770</x-m>
<y-m>0.470</y-m>
<z-m>1.830</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
<model>
<name>OSO ai</name>
<path>Aircraft/Instruments-3d/attitude-indicator.xml</path>
<condition>
<or>
<equals>
<property>sim/current-view/name</property>
<value>OSO view</value>
</equals>
<equals>
<property>sim/current-view/name</property>
<value>DSO/OSO centered view</value>
</equals>
</or>
</condition>
<offsets>
<x-m>-15.770</x-m>
<y-m>0.370</y-m>
<z-m>1.830</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
</PropertyList>
--- NEW FILE "poslightgreen.ac" ---
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 "flash" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 1 1 1 spec 1 1 1 shi 32 trans 0
OBJECT world
kids 1
OBJECT poly
name "right_poslight"
data 9
Plane.045
texture "halos.rgb"
texrep 1 1
crease 30.000000
numvert 9
-0.749251 -0.070441 -0.017944
0.75074 -0.070439 -0.012624
0.750742 -1.570439 -0.012632
-0.749249 -1.570441 -0.017951
1.00074 -0.820438 -0.011741
0.000744 0.17956 -0.015282
-0.999249 -0.820442 -0.018834
0.000747 -1.82044 -0.015294
0.000745 -0.82044 -0.015288
numsurf 4
SURF 0x00
mat 1
refs 4
5 0.325205773115 0.505338072777
0 0.478933334351 0.620633721352
6 0.478933334351 0.812793254852
8 0.2483420223 0.735929369926
SURF 0x00
mat 1
refs 4
6 0.478933334351 0.812793254852
3 0.363637715578 0.966520786285
7 0.171478182077 0.966520786285
8 0.2483420223 0.735929369926
SURF 0x00
mat 1
refs 4
7 0.171478182077 0.966520786285
2 0.0177506059408 0.851225018501
4 0.0177506506443 0.659065544605
8 0.2483420223 0.735929369926
SURF 0x00
mat 1
refs 4
4 0.0177506506443 0.659065544605
1 0.133046343923 0.505338013172
5 0.325205773115 0.505338072777
8 0.2483420223 0.735929369926
kids 0
--- NEW FILE "poslightleft.ac" ---
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 "flash" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 1 1 1 spec 1 1 1 shi 32 trans 0
OBJECT world
kids 1
OBJECT poly
name "left_poslight"
data 9
Plane.044
texture "halos.rgb"
texrep 1 1
crease 30.000000
numvert 9
-0.75549 -0.069654 0.007472
0.7445 -0.069652 0.012792
0.744502 -1.569652 0.012784
-0.755488 -1.569654 0.007464
0.9945 -0.819651 0.013675
-0.005496 0.180347 0.010134
-1.005488 -0.819655 0.006581
-0.005492 -1.819653 0.010122
-0.005494 -0.819653 0.010128
numsurf 4
SURF 0x00
mat 1
refs 4
5 0.317341446877 0.00464344816282
0 0.471069008112 0.119939088821
6 0.471069008112 0.31209859252
8 0.240477710962 0.235234767199
SURF 0x00
mat 1
refs 4
6 0.471069008112 0.31209859252
3 0.355773389339 0.465826123953
7 0.16361387074 0.465826123953
8 0.240477710962 0.235234767199
SURF 0x00
mat 1
refs 4
7 0.16361387074 0.465826123953
2 0.00988629180938 0.350530415773
4 0.00988633651286 0.158370926976
8 0.240477710962 0.235234767199
SURF 0x00
mat 1
refs 4
4 0.00988633651286 0.158370926976
1 0.125182032585 0.00464340345934
5 0.317341446877 0.00464344816282
8 0.240477710962 0.235234767199
kids 0
--- NEW BINARY FILE "window_green_tp.png" ---
--- NEW BINARY FILE "window_red_tp.png" ---
Index: B-1B.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/B-1B.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- B-1B.xml 23 Jan 2010 09:47:57 -0000 1.9
+++ B-1B.xml 30 Mar 2010 21:44:58 -0000 1.10
@@ -52,10 +52,23 @@
</offsets>
</model>
+<!-- pushback -->
+
+<model>
+ <name>Pushback</name>
+ <path>Models\Airport\Pushback\Goldhofert.xml</path>
+ <offsets>
+ <x-m>-18.0</x-m>
+ <y-m>0</y-m>
+ <z-m>-4.2</z-m>
+ </offsets>
+</model>
+
<!-- correct wing position -->
<animation>
<type>translate</type>
<object-name>wing_right</object-name>
+ <object-name>wing_right.001</object-name>
<object-name>slat_right</object-name>
<object-name>slat_right_up</object-name>
<object-name>flap_right1</object-name>
@@ -91,6 +104,7 @@
<animation>
<type>translate</type>
<object-name>wing_left</object-name>
+ <object-name>wing_left.001</object-name>
<object-name>slat_left</object-name>
<object-name>slat_left_up</object-name>
<object-name>flap_left1</object-name>
@@ -127,6 +141,7 @@
<animation>
<type>rotate</type>
<object-name>wing_right</object-name>
+ <object-name>wing_right.001</object-name>
<property>rotors/main/blade[0]/position-deg</property>
<interpolation>
@@ -601,6 +616,7 @@
<animation>
<type>rotate</type>
<object-name>wing_left</object-name>
+ <object-name>wing_left.001</object-name>
<property>rotors/main/blade[0]/position-deg</property>
<interpolation>
@@ -1229,6 +1245,8 @@
<object-name>landing_spot</object-name>
<object-name>landing_spot.001</object-name>
<object-name>landing_spot.002</object-name>
+ <object-name>landing_spot.003</object-name>
+ <object-name>landing_spot.004</object-name>
<condition>
<greater-than>
<property>gear/gear[0]/position-norm</property>
@@ -1282,6 +1300,8 @@
<object-name>landing_spot</object-name>
<object-name>landing_spot.001</object-name>
<object-name>landing_spot.002</object-name>
+ <object-name>landing_spot.003</object-name>
+ <object-name>landing_spot.004</object-name>
<property>gear/gear[0]/position-norm</property>
<interpolation>
<entry>
@@ -3187,7 +3207,7 @@
<object-name>gbu-31.005</object-name>
<object-name>gbu-31.006</object-name>
<object-name>gbu-31.007</object-name>
- <property>armament/bay-fwd/rot-launcher-pos-anim</property>
+ <property>armament/bay0/launcher-pos-anim</property>
<interpolation>
<entry>
@@ -3217,7 +3237,7 @@
<object-name>gbu-31</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack0</property>
+ <property>armament/bay0/rack0</property>
<value>1.0</value>
</equals>
</condition>
@@ -3227,7 +3247,7 @@
<object-name>gbu-31.001</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack1</property>
+ <property>armament/bay0/rack1</property>
<value>1.0</value>
</equals>
</condition>
@@ -3237,7 +3257,7 @@
<object-name>gbu-31.002</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack2</property>
+ <property>armament/bay0/rack2</property>
<value>1.0</value>
</equals>
</condition>
@@ -3247,7 +3267,7 @@
<object-name>gbu-31.003</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack3</property>
+ <property>armament/bay0/rack3</property>
<value>1.0</value>
</equals>
</condition>
@@ -3257,7 +3277,7 @@
<object-name>gbu-31.004</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack4</property>
+ <property>armament/bay0/rack4</property>
<value>1.0</value>
</equals>
</condition>
@@ -3267,7 +3287,7 @@
<object-name>gbu-31.005</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack5</property>
+ <property>armament/bay0/rack5</property>
<value>1.0</value>
</equals>
</condition>
@@ -3277,7 +3297,7 @@
<object-name>gbu-31.006</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack6</property>
+ <property>armament/bay0/rack6</property>
<value>1.0</value>
</equals>
</condition>
@@ -3287,7 +3307,7 @@
<object-name>gbu-31.007</object-name>
<condition>
<equals>
- <property>armament/bay-fwd/rack7</property>
+ <property>armament/bay0/rack7</property>
<value>1.0</value>
</equals>
</condition>
@@ -3305,7 +3325,7 @@
<object-name>gbu-31.010</object-name>
<object-name>gbu-31.009</object-name>
<object-name>gbu-31.008</object-name>
- <property>armament/bay-intmd/rot-launcher-pos-anim</property>
+ <property>armament/bay1/launcher-pos-anim</property>
<interpolation>
<entry>
@@ -3335,7 +3355,7 @@
<object-name>gbu-31.015</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack0</property>
+ <property>armament/bay1/rack0</property>
<value>1.0</value>
</equals>
</condition>
@@ -3345,7 +3365,7 @@
<object-name>gbu-31.014</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack1</property>
+ <property>armament/bay1/rack1</property>
<value>1.0</value>
</equals>
</condition>
@@ -3355,7 +3375,7 @@
<object-name>gbu-31.013</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack2</property>
+ <property>armament/bay1/rack2</property>
<value>1.0</value>
</equals>
</condition>
@@ -3365,7 +3385,7 @@
<object-name>gbu-31.012</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack3</property>
+ <property>armament/bay1/rack3</property>
<value>1.0</value>
</equals>
</condition>
@@ -3375,7 +3395,7 @@
<object-name>gbu-31.011</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack4</property>
+ <property>armament/bay1/rack4</property>
<value>1.0</value>
</equals>
</condition>
@@ -3385,7 +3405,7 @@
<object-name>gbu-31.010</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack5</property>
+ <property>armament/bay1/rack5</property>
<value>1.0</value>
</equals>
</condition>
@@ -3395,7 +3415,7 @@
<object-name>gbu-31.009</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack6</property>
+ <property>armament/bay1/rack6</property>
<value>1.0</value>
</equals>
</condition>
@@ -3405,7 +3425,7 @@
<object-name>gbu-31.008</object-name>
<condition>
<equals>
- <property>armament/bay-intmd/rack7</property>
+ <property>armament/bay1/rack7</property>
<value>1.0</value>
</equals>
</condition>
@@ -3422,7 +3442,7 @@
<object-name>gbu-31.021</object-name>
<object-name>gbu-31.022</object-name>
<object-name>gbu-31.023</object-name>
- <property>armament/bay-aft/rot-launcher-pos-anim</property>
+ <property>armament/bay2/launcher-pos-anim</property>
<interpolation>
<entry>
@@ -3452,7 +3472,7 @@
<object-name>gbu-31.016</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack0</property>
+ <property>armament/bay2/rack0</property>
<value>1.0</value>
</equals>
</condition>
@@ -3462,7 +3482,7 @@
<object-name>gbu-31.017</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack1</property>
+ <property>armament/bay2/rack1</property>
<value>1.0</value>
</equals>
</condition>
@@ -3472,7 +3492,7 @@
<object-name>gbu-31.018</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack2</property>
+ <property>armament/bay2/rack2</property>
<value>1.0</value>
</equals>
</condition>
@@ -3482,7 +3502,7 @@
<object-name>gbu-31.019</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack3</property>
+ <property>armament/bay2/rack3</property>
<value>1.0</value>
</equals>
</condition>
@@ -3492,7 +3512,7 @@
<object-name>gbu-31.020</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack4</property>
+ <property>armament/bay2/rack4</property>
<value>1.0</value>
</equals>
</condition>
@@ -3502,7 +3522,7 @@
<object-name>gbu-31.021</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack5</property>
+ <property>armament/bay2/rack5</property>
<value>1.0</value>
</equals>
</condition>
@@ -3512,7 +3532,7 @@
<object-name>gbu-31.022</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack6</property>
+ <property>armament/bay2/rack6</property>
<value>1.0</value>
</equals>
</condition>
@@ -3522,7 +3542,7 @@
<object-name>gbu-31.023</object-name>
<condition>
<equals>
- <property>armament/bay-aft/rack7</property>
+ <property>armament/bay2/rack7</property>
<value>1.0</value>
</equals>
</condition>
@@ -3599,58 +3619,27 @@
</action>
</animation>
- <!-- afterburner flame
-
- <animation>
- <type>select</type>
- <object-name>eng_flame</object-name>
- <object-name>eng_flame.001</object-name>
- <object-name>eng_flame.002</object-name>
- <object-name>eng_flame.003</object-name>
- <condition>
- <greater-than>
- <property>controls/engines/engine[0]/afterburner</property>
- <value>0.0</value>
- </greater-than>
- </condition>
- </animation>
+<!-- glass cockpit shaders -->
- <animation>
- <type>noshadow</type>
- <object-name>eng_flame</object-name>
- <object-name>eng_flame.001</object-name>
- <object-name>eng_flame.002</object-name>
- <object-name>eng_flame.003</object-name>
+<animation>
+ <type>shader</type>
+ <shader>chrome</shader>
+ <texture>Aircraft/B-1B/Models/window_green_tp.png</texture>
+ <object-name>window_left_front</object-name>
+ <object-name>window_right_front</object-name>
+ <object-name>window_left_top</object-name>
+ <object-name>window_right_top</object-name>
</animation>
<animation>
- <type>blend</type>
- <object-name>eng_flame</object-name>
- <object-name>eng_flame.001</object-name>
- <object-name>eng_flame.002</object-name>
- <object-name>eng_flame.003</object-name>
- <property>controls/engines/engine[0]/throttle</property>
- <offset>0.95</offset>
- <factor>-0.20</factor>
-</animation>-->
-
- <!-- engine fire
-
- <animation>
- <type>noshadow</type>
- <object-name>eng_left_ex</object-name>
- <object-name>eng_right_ex</object-name>
- </animation>
-
- <animation>
- <type>blend</type>
- <object-name>eng_left_ex</object-name>
- <object-name>eng_right_ex</object-name>
- <property>engines/engine[0]/thrust-lbs</property>
- <offset>0.9</offset>
- <factor>-0.000033</factor>
- </animation>-->
-
+ <type>shader</type>
+ <shader>chrome</shader>
+ <texture>Aircraft/B-1B/Models/window_red_tp.png</texture>
+ <object-name>window_left_side</object-name>
+ <object-name>window_right_side</object-name>
+ <object-name>window_left_aft</object-name>
+ <object-name>window_right_aft</object-name>
+</animation>
</PropertyList>
Index: b1b.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/b1b.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- b1b.ac 23 Jan 2010 09:48:06 -0000 1.8
+++ b1b.ac 30 Mar 2010 21:45:47 -0000 1.9
@@ -1,15 +1,723 @@
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 "white" rgb 0.8 0.8 0.8 amb 0.792421 0.792421 0.792421 emis 0 0 0 spec 1 1 1 shi 25 trans 0
-MATERIAL "default" rgb 1 1 1 amb 0.81 0.81 0.81 emis 0 0 0 spec 1 1 1 shi 32 trans 0
+MATERIAL "white" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0 0 0 spec 1 1 1 shi 25 trans 0
+MATERIAL "default" rgb 1 1 1 amb 0.85 0.85 0.85 emis 0 0 0 spec 1 1 1 shi 32 trans 0
MATERIAL "Glass" rgb 0.42724 0.42724 0.42724 amb 0.9 0.9 0.9 emis 0 0 0 spec 1 1 1 shi 32 trans 0.313333
+MATERIAL "sapphire" rgb 0 0.451019 1 amb 0.9 0.9 0.9 emis 0 0 0 spec 1 1 1 shi 32 trans 0.485845
MATERIAL "sapphire.green" rgb 0.536416 1 0.682544 amb 0 0 0 emis 1 1 1 spec 1 1 1 shi 32 trans 0.597779
-MATERIAL "sapphire" rgb 0 0.451019 1 amb 0.9 0.9 0.9 emis 0 0 0 spec 1 1 1 shi 32 trans 0.609979
MATERIAL "rubber_white" rgb 1 1 1 amb 0.701526 0.701526 0.701526 emis 0 0 0 spec 1 1 1 shi 32 trans 0
[...534415 lines suppressed...]
+mat 2
+refs 2
+4125 0 0
+4127 0 0
+SURF 0x02
+mat 2
+refs 2
+4127 0 0
+4128 0 0
+SURF 0x02
+mat 2
+refs 2
+4127 0 0
+5662 0 0
+SURF 0x02
+mat 2
+refs 2
+4131 0 0
+5662 0 0
kids 0
Index: b1b_trans.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/b1b_trans.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- b1b_trans.ac 23 Jan 2010 09:49:08 -0000 1.5
+++ b1b_trans.ac 30 Mar 2010 21:47:27 -0000 1.6
@@ -1,3726 +1,3129 @@
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 "white" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0 0 0 spec 0.5 0.5 0.5 shi 25 trans 0
-MATERIAL "burn" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 0 0 0 spec 1 1 1 shi 32 trans 0.451938
-MATERIAL "burn.eng" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 0.765623 0.765623 0.765623 spec 1 1 1 shi 32 trans 0.087877
-MATERIAL "glass" rgb 0.650974 0.889542 0.848377 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 32 trans 0.816
+MATERIAL "glass.001" rgb 0.650974 0.889542 0.848377 amb 1 1 1 emis 0 0 0 spec 1 1 1 shi 32 trans 0.816
+MATERIAL "burn.eng.001" rgb 0.8 0.8 0.8 amb 0.5 0.5 0.5 emis 0.765623 0.765623 0.765623 spec 1 1 1 shi 32 trans 0.087877
+MATERIAL "white.001" rgb 0.8 0.8 0.8 amb 0.8 0.8 0.8 emis 0 0 0 spec 0.5 0.5 0.5 shi 25 trans 0
OBJECT world
-kids 11
[...5568 lines suppressed...]
-45 0.676268875599 0.416282296181
-46 0.673544466496 0.500704944134
-SURF 0x10
-mat 2
-refs 4
-11 0.753470361233 0.504309594631
-10 0.749754607677 0.417304873466
-46 0.767260551453 0.416365116835
-47 0.772859811783 0.503268718719
-SURF 0x10
-mat 2
-refs 4
-1 0.753470361233 0.504309594631
-11 0.73406213522 0.504929244518
-47 0.732231736183 0.41786429286
-37 0.749754607677 0.417304873466
+23 0.736942589283 0.0352637842298
+56 0.663572490215 0.133360341191
+24 0.725497961044 0.0276653170586
kids 0
Index: b1b_trans.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/b1b_trans.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- b1b_trans.xml 23 Jan 2010 09:49:28 -0000 1.9
+++ b1b_trans.xml 30 Mar 2010 21:47:35 -0000 1.10
@@ -6,37 +6,15 @@
<path>b1b_trans.ac</path>
- <!-- landing light
- <model>
- <name>light2</name>
- <path>Aircraft/B-1B/Models/blast/lights.xml</path>
- <condition>
- <equals>
- <property>gear/gear[0]/position-norm</property>
[...2022 lines suppressed...]
+ <type>select</type>
+ <object-name>contrail_eng23</object-name>
+ <condition>
+ <or>
+ <greater-than>
+ <property>/engines/engine[2]/n2</property>
+ <value>50</value>
+ </greater-than>
+ <greater-than>
+ <property>/engines/engine[3]/n2</property>
+ <value>50</value>
+ </greater-than>
+ </or>
+ </condition>
+</animation>
-</particlesystem>
</PropertyList>
\ No newline at end of file
Index: bone-body.png
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/bone-body.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsyzU1VG and /tmp/cvsJarxY0 differ
Index: instruments.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/instruments.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- instruments.xml 23 Jan 2010 09:49:54 -0000 1.5
+++ instruments.xml 30 Mar 2010 21:48:19 -0000 1.6
@@ -134,7 +134,7 @@
<offsets>
<x-m>-18.210</x-m>
<y-m>-0.270</y-m>
- <z-m>1.210</z-m>
+ <z-m>1.160</z-m>
<pitch-deg>0</pitch-deg>
</offsets>
</model>
@@ -353,10 +353,34 @@
<name>sweep lever</name>
<path>Aircraft/B-1B/Models/Instruments-3d/sweep_lever.xml</path>
<offsets>
- <x-m>-17.680</x-m>
- <y-m>-1.050</y-m>
- <z-m>0.780</z-m>
+ <x-m>-17.770</x-m>
+ <y-m>-1.075</y-m>
+ <z-m>0.770</z-m>
<pitch-deg>0</pitch-deg>
+ <heading-deg>-5</heading-deg>
+ </offsets>
+ </model>
+
+ <model>
+ <name>throttle2</name>
+ <path>Aircraft/B-1B/Models/Instruments-3d/throttle_left.xml</path>
+ <offsets>
+ <x-m>-17.550</x-m>
+ <y-m>-0.823</y-m>
+ <z-m>0.870</z-m>
+ <pitch-deg>-90</pitch-deg>
+ <roll-deg>-5</roll-deg>
+ </offsets>
+ </model>
+ <model>
+ <name>alter throt left</name>
+ <path>Aircraft/B-1B/Models/Instruments-3d/alter_throt_l.xml</path>
+ <offsets>
+ <x-m>-17.620</x-m>
+ <y-m>-1.266</y-m>
+ <z-m>0.907</z-m>
+ <pitch-deg>-90</pitch-deg>
+ <roll-deg>-3</roll-deg>
</offsets>
</model>
@@ -395,12 +419,22 @@
<name>throttle</name>
<path>Aircraft/B-1B/Models/Instruments-3d/throttle.xml</path>
<offsets>
- <x-m>-17.700</x-m>
+ <x-m>-17.730</x-m>
<y-m>0.185</y-m>
<z-m>0.710</z-m>
<pitch-deg>-90</pitch-deg>
</offsets>
</model>
+ <model>
+ <name>alter throt</name>
+ <path>Aircraft/B-1B/Models/Instruments-3d/alter_throt.xml</path>
+ <offsets>
+ <x-m>-17.830</x-m>
+ <y-m>-0.263</y-m>
+ <z-m>0.710</z-m>
+ <pitch-deg>-90</pitch-deg>
+ </offsets>
+ </model>
<!-- overhead panel -->
@@ -415,6 +449,7 @@
</offsets>
</model>
+
<!-- WSO instruments xxxxxxxxxxxxxxxxxxxxxxxxx -->
<model>
@@ -502,9 +537,10 @@
</offsets>
</model>
+<!-- OSO instrumentation -->
<model>
- <name>OSO radar</name>
- <path>Aircraft/B-1B/Models/Instruments-3d/nd.xml</path>
+ <name>OSO mfd</name>
+ <path>Aircraft/B-1B/Models/Instruments-3d/wso_mfd.xml</path>
<condition>
<or>
<equals>
@@ -518,9 +554,9 @@
</or>
</condition>
<offsets>
- <x-m>-15.700</x-m>
- <y-m>0.385</y-m>
- <z-m>1.380</z-m>
+ <x-m>-15.715</x-m>
+ <y-m>0.370</y-m>
+ <z-m>1.385</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
</model>
@@ -541,8 +577,8 @@
</or>
</condition>
<offsets>
- <x-m>-15.700</x-m>
- <y-m>0.645</y-m>
+ <x-m>-15.710</x-m>
+ <y-m>0.660</y-m>
<z-m>1.380</z-m>
<pitch-deg>-35</pitch-deg>
</offsets>
@@ -572,6 +608,29 @@
</model>
<model>
+ <name>OSO ikb</name>
+ <path>Aircraft/B-1B/Models/Instruments-3d/ikb.xml</path>
+ <condition>
+ <or>
+ <equals>
+ <property>sim/current-view/name</property>
+ <value>OSO view</value>
+ </equals>
+ <equals>
+ <property>sim/current-view/name</property>
+ <value>DSO/OSO centered view</value>
+ </equals>
+ </or>
+ </condition>
+ <offsets>
+ <x-m>-15.710</x-m>
+ <y-m>0.492</y-m>
+ <z-m>1.380</z-m>
+ <pitch-deg>-35</pitch-deg>
+ </offsets>
+ </model>
+
+ <model>
<name>OSO bombnav</name>
<path>Aircraft/B-1B/Models/Instruments-3d/bombnav.xml</path>
<condition>
Index: interior.png
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/interior.png,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
Binary files /tmp/cvsKKFMNw and /tmp/cvsMh3LwU differ
Index: landing_cone.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/landing_cone.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- landing_cone.xml 11 Dec 2008 00:02:34 -0000 1.1
+++ landing_cone.xml 30 Mar 2010 21:48:23 -0000 1.2
@@ -1,22 +1,25 @@
<?xml version="1.0"?>
<PropertyList>
- <path>landing_cone1.ac</path>
- <offsets>
+<path>landing_cone1.ac</path>
+<offsets>
<x-m> 0.0 </x-m>
<y-m> 0.0 </y-m>
<z-m> 0.0 </z-m>
- </offsets>
+</offsets>
- <animation>
+<!--<effect>
+ <inherits-from>Effects/light-cone</inherits-from>
+ <object-name>landing_cone.001</object-name>
+</effect>-->
+
+<animation>
<type>alpha-test</type>
- <!--<object-name>landing_cone</object-name>-->
<object-name>landing_cone.001</object-name>
<alpha-factor>0.001</alpha-factor>
- </animation>
- <animation>
+</animation>
+<animation>
<type>select</type>
- <!--<object-name>landing_cone</object-name>-->
<object-name>landing_cone.001</object-name>
<condition>
<and>
@@ -36,5 +39,4 @@
</condition>
</animation>
-
</PropertyList>
Index: landing_cone1.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/landing_cone1.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- landing_cone1.ac 11 Dec 2008 00:02:35 -0000 1.1
+++ landing_cone1.ac 30 Mar 2010 21:48:24 -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 "light_cone" rgb 0.8 0.8 0.8 amb 0 0 0 emis 1 1 1 spec 1 1 1 shi 32 trans 0.75
+MATERIAL "light_cone" rgb 0.8 0.8 0.8 amb 1 1 1 emis 1 1 1 spec 1 1 1 shi 32 trans 0.75
OBJECT world
kids 1
OBJECT poly
Index: landing_spot.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/landing_spot.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- landing_spot.xml 11 Dec 2008 00:02:38 -0000 1.1
+++ landing_spot.xml 30 Mar 2010 21:48:24 -0000 1.2
@@ -8,11 +8,7 @@
<z-m> 0.0 </z-m>
</offsets>
-<!--<animation>
- <type>billboard</type>
- <object-name>spot_light1</object-name>
- <spherical type="bool">true</spherical>
-</animation>-->
+
<animation>
@@ -37,11 +33,7 @@
</condition>
</animation>
-<!--<animation>-0.208
- <type>billboard</type>
- <object-name>spot_light2</object-name>
- <spherical type="bool">true</spherical>
-</animation>-->
+
<animation>
Index: posgreen.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/posgreen.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- posgreen.xml 28 Nov 2007 16:52:01 -0000 1.1
+++ posgreen.xml 30 Mar 2010 21:48:30 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<PropertyList>
- <path>posgreen.ac</path>
+ <path>poslightgreen.ac</path>
<offsets>
<x-m> 0.0 </x-m>
<y-m> 0.0 </y-m>
@@ -10,19 +10,19 @@
<animation>
<type>billboard</type>
- <object-name>poslightgreen</object-name>
+ <object-name>right_poslight</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>alpha-test</type>
- <object-name>poslightgreen</object-name>
+ <object-name>right_poslight</object-name>
<alpha-factor>0.001</alpha-factor>
</animation>
<animation>
<type>select</type>
- <object-name>poslightgreen</object-name>
+ <object-name>right_poslight</object-name>
<condition>
<and>
<equals>
Index: posred.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/posred.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- posred.xml 28 Nov 2007 16:52:01 -0000 1.1
+++ posred.xml 30 Mar 2010 21:48:32 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<PropertyList>
- <path>posred.ac</path>
+ <path>poslightleft.ac</path>
<offsets>
<x-m> 0.0 </x-m>
<y-m> 0.0 </y-m>
@@ -10,20 +10,20 @@
<animation>
<type>billboard</type>
- <object-name>poslightred</object-name>
+ <object-name>left_poslight</object-name>
<spherical type="bool">true</spherical>
</animation>
<animation>
<type>alpha-test</type>
- <object-name>poslightred</object-name>
+ <object-name>left_poslight</object-name>
<alpha-factor>0.001</alpha-factor>
</animation>
<animation>
<type>select</type>
- <object-name>poslightred</object-name>
+ <object-name>left_poslight</object-name>
<condition>
<and>
<equals>
Index: strobe.ac
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/strobe.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strobe.ac 28 Nov 2007 16:52:01 -0000 1.1
+++ strobe.ac 30 Mar 2010 21:48:35 -0000 1.2
@@ -6,20 +6,20 @@
OBJECT poly
name "glow"
data 9
-Plane.001
+Plane.033
texture "la_light.rgb"
texrep 1 1
-crease 30
+crease 30.000000
numvert 9
-0.009777 0.039415 -0.00014
-0.088607 0.039415 0.00014
-0.088608 -0.039415 0.00014
-0.009777 -0.039415 -0.00014
-0.101746 0 0.000186
-0.049192 0.052554 0
--0.003361 0 -0.000186
-0.049193 -0.052554 0
-0.049192 0 0
+-0.04347 0.039431 -0.000148
+0.03536 0.039431 0.000132
+0.035361 -0.039399 0.000132
+-0.04347 -0.039399 -0.000148
+0.048499 1.6e-05 0.000178
+-0.004055 0.05257 -8e-06
+-0.056608 1.6e-05 -0.000194
+-0.004054 -0.052538 -8e-06
+-0.004055 1.6e-05 -8e-06
numsurf 4
SURF 0x00
mat 1
@@ -52,21 +52,21 @@
kids 0
OBJECT poly
name "strobe"
-data 5
-Plane
+data 9
+Plane.034
texture "la_light.rgb"
texrep 1 1
-crease 30
+crease 30.000000
numvert 9
--0.700804 0.749999 -0.002656
-0.799186 0.750001 0.002664
-0.799189 -0.749999 0.002656
--0.700802 -0.750001 -0.002664
-1.049186 2e-06 0.003547
-0.049191 1 6e-06
--0.950801 -2e-06 -0.003547
-0.049194 -1 -6e-06
-0.049192 0 0
+-0.754051 0.750014 -0.002664
+0.745939 0.750017 0.002656
+0.745942 -0.749983 0.002648
+-0.754049 -0.749986 -0.002672
+0.995939 1.8e-05 0.003539
+-0.004056 1.000015 -2e-06
+-1.004048 1.4e-05 -0.003555
+-0.004053 -0.999985 -1.4e-05
+-0.004055 1.6e-05 -8e-06
numsurf 4
SURF 0x00
mat 1
Index: strobe.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/B-1B/Models/strobe.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- strobe.xml 28 Nov 2007 16:52:01 -0000 1.1
+++ strobe.xml 30 Mar 2010 21:48:36 -0000 1.2
@@ -21,8 +21,8 @@
</branch-duration-sec>
<branch-duration-sec>
<random>
- <min>1.8</min>
- <max>2.0</max>
+ <min>2.0</min>
+ <max>2.2</max>
</random>
</branch-duration-sec>
</animation>
@@ -52,7 +52,7 @@
<object-name>glow</object-name>
<condition>
<equals>
- <property>controls/lighting/nav-lights</property>
+ <property>sim/multiplay/generic/int[0]</property>
<value>1.0</value>
</equals>
</condition>
--- "aircraft_wash.xml" DELETED ---
--- "green.rgb" DELETED ---
--- "landing_spot_rwy.ac" DELETED ---
--- "landing_spot_rwy.xml" DELETED ---
--- "posgreen.ac" DELETED ---
--- "posred.ac" DELETED ---
--- "red.rgb" DELETED ---
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev