fly/fgdata
1
0
Fork 0
Code Activity

Tweaks to how we load aircraft defaults and definition file to make things

Browse source 
more intuitive.  We switch to an include in the preferences.xml to include
the default model, and then if the user specifies --aircraft=, that is
expanded immediately so portions can be overwritten by subsequent command
line options.

This required a slight format change to all the *-set.xml files.
This commit is contained in:
curt 2001-12-10 15:31:15 +00:00
parent 6299a67c71
commit 5446f74bec
10 changed files with 150 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Aircraft/747-yasim-set.xml
View file

@ -11,25 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- c172 is default so basically we just need to specify the panel-->
<sim>
<flight-model>yasim</flight-model>
<aero>747</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>yasim</flight-model>
<aero>747</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

42
Aircraft/X15-set.xml
View file

@ -11,31 +11,29 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- these are the three main components -->
<sim>
<flight-model>jsb</flight-model>
<aero>X15</aero>
<sound>false</sound>
<!-- these are the three main components -->
<panel>
<path>Aircraft/X15/Panels/X15-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>jsb</flight-model>
<aero>X15</aero>
<sound>false</sound>
<!-- switching models doesn't work -->
<!-- gear up -->
<model>
<path>Aircraft/X15/Models/X15_flight.ac</path>
</model>
<!-- gear down -->
<model_2>
<path>Aircraft/X15/Models/X15_landing.ac</path>
</model_2>
<panel>
<path>Aircraft/X15/Panels/X15-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<!-- switching models doesn't work -->
<!-- gear up -->
<model>
<path>Aircraft/X15/Models/X15_flight.ac</path>
</model>
<!-- gear down -->
<model_2>
<path>Aircraft/X15/Models/X15_landing.ac</path>
</model_2>
</PropertyList>

27
Aircraft/a4-yasim-set.xml
View file

@ -11,24 +11,21 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- c172 is default so basically we just need to specify the panel-->
<sim>
<flight-model>yasim</flight-model>
<aero>a4</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>yasim</flight-model>
<aero>a4</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

29
Aircraft/c172-ifr-set.xml
View file

@ -11,25 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- c172 is default so basically we just need to specify the panel-->
<sim>
<flight-model>jsb</flight-model>
<aero>c172</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>jsb</flight-model>
<aero>c172</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-ifr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

30
Aircraft/c172-larcsim-set.xml
View file

@ -11,24 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- c172 is default so basically we just need to specify the fdm -->
<sim>
<flight-model>larcsim</flight-model>
<aero>c172</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>larcsim</flight-model>
<aero>c172</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
</sim>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

28
Aircraft/c172-set.xml
View file

@ -11,24 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<sim>
<flight-model>jsb</flight-model>
<aero>c172</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>jsb</flight-model>
<aero>c172</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

29
Aircraft/c172-yasim-set.xml
View file

@ -11,25 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<!-- c172 is default so basically we just need to specify the panel-->
<sim>
<flight-model>yasim</flight-model>
<aero>c172</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>yasim</flight-model>
<aero>c172</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>

30
Aircraft/c310-set.xml
View file

@ -12,25 +12,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
<PropertyList>
<!-- these are the three main components -->
<sim>
<flight-model>jsb</flight-model>
<aero>c310</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c310/c310-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c310/c310-mini-panel.xml</path>
</panel_2>
<flight-model>jsb</flight-model>
<aero>c310</aero>
<sound>true</sound>
<!-- you need to download this model from the site listed above -->
<model>
<path>Aircraft/c310/Models/cessna310r.ac</path>
</model>
<panel>
<path>Aircraft/c310/c310-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c310/c310-mini-panel.xml</path>
</panel_2>
</sim>
<!-- you need to download this model from the site listed above -->
<model>
<path>Aircraft/c310/Models/cessna310r.ac</path>
</model>
</PropertyList>

30
Aircraft/c310-yasim-set.xml
View file

@ -12,25 +12,23 @@ October 23 2001 John Check, fgpanels@rockfish.net
<PropertyList>
<!-- these are the three main components -->
<sim>
<flight-model>yasim</flight-model>
<aero>c310</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c310/c310-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c310/c310-mini-panel.xml</path>
</panel_2>
<flight-model>yasim</flight-model>
<aero>c310</aero>
<sound>true</sound>
<!-- you need to download this from the above website -->
<model>
<path>Aircraft/c310/Models/cessna310r.ac</path>
</model>
<panel>
<path>Aircraft/c310/c310-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c310/c310-mini-panel.xml</path>
</panel_2>
</sim>
<!-- you need to download this from the above website -->
<model>
<path>Aircraft/c310/Models/cessna310r.ac</path>
</model>
</PropertyList>

28
Aircraft/shuttle-set.xml
View file

@ -11,24 +11,22 @@ October 23 2001 John Check, fgpanels@rockfish.net
-->
<PropertyList>
<sim>
<flight-model>jsb</flight-model>
<aero>shuttle</aero>
<sound>true</sound>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
<flight-model>jsb</flight-model>
<aero>shuttle</aero>
<sound>true</sound>
<model>
<path><!-- you need to set this --></path>
</model>
<panel>
<path>Aircraft/c172/Panels/c172-vfr-panel.xml</path>
<visibility>true</visibility>
</panel>
<panel_2>
<path>Aircraft/c172/Panels/c172-trans-mini-panel.xml</path>
</panel_2>
</sim>
<model>
<path><!-- you need to set this --></path>
</model>
</PropertyList>