fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://gitorious.org/fg/fgdata

Browse source
This commit is contained in:
BARANGER Emmanuel 2010-09-23 18:46:41 +02:00
commit 8e58c5f9a3
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Effects/reflect-bump-spec.eff
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Reflections <!-- Reflections + Bumpmapping + specular
PARAMETERS: There are two forms of cube map texture:- vertical cross and 6 images. PARAMETERS: There are two forms of cube map texture:- vertical cross and 6 images.
Either can be used - alternative forms are shown in <parameters> and in <texture-unit> Either can be used - alternative forms are shown in <parameters> and in <texture-unit>
@ -25,7 +25,7 @@ define <texture n="4"> in the derived effect file
USE: To use the default reflection effect (controlled by material shininess values) use USE: To use the default reflection effect (controlled by material shininess values) use
<effect> <effect>
<inherits-from>Effects/reflect</inherits-from> <inherits-from>Effects/reflect-bump-spec</inherits-from>
<object-name>Fuselage</object-name> <object-name>Fuselage</object-name>
</effect> </effect>
@ -41,14 +41,14 @@ in your model file.
To use your own effect place your efffect file containing something like this: To use your own effect place your efffect file containing something like this:
<name>Effects/lightningreflect</name> <name>Effects/lightningreflect</name>
<inherits-from>Effects/reflect</inherits-from> <inherits-from>Effects/reflect-bump-spec</inherits-from>
and the the modified tags in the path as above and the the modified tags in the path as above
EXAMPLES: You can find examples of both usages in the Hunter and Lightning models. EXAMPLES: You can find examples of both usages in the Hunter and Lightning models.
--> -->
<PropertyList> <PropertyList>
<name>Effects/reflect</name> <name>Effects/reflect-bump-spec</name>
<inherits-from>Effects/model-default</inherits-from> <inherits-from>Effects/model-default</inherits-from>
<parameters> <parameters>

12
gui/dialogs/radios.xml
View file

@ -4,7 +4,7 @@
<name>radios</name> <name>radios</name>
<width>600</width> <width>600</width>
<height>330</height> <height>370</height>
<modal>false</modal> <modal>false</modal>
<text> <text>
@ -505,5 +505,15 @@
</button> </button>
</group> </group>
<group>
<x>400</x>
<y>60</y>
<button>
<legend>ATC Services in range</legend>
<binding>
<command>ATC-freq-search</command>
</binding>
</button>
</group>
</PropertyList> </PropertyList>

6
gui/menubar.xml
View file

@ -2,8 +2,8 @@
<PropertyList> <PropertyList>
<menu> <menu>
<label>General</label> <label>File</label>
<!--
<item> <item>
<label>Load Flight (Shift-F1)</label> <label>Load Flight (Shift-F1)</label>
<binding> <binding>
@ -19,7 +19,7 @@
<script>gui.save_flight()</script> <script>gui.save_flight()</script>
</binding> </binding>
</item> </item>
<!--
<item> <item>
<label>Scenario</label> <label>Scenario</label>
<binding> <binding>