fly/fgdata
1
0
Fork 0
Code Activity

Reorganized the rendering menu

Browse source
This commit is contained in:
sydadams 2009-10-15 03:25:05 +00:00
parent 98c7b517ac
commit d6db41f31d
5 changed files with 209 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
gui/dialogs/display.xml Normal file
View file

@ -0,0 +1,104 @@
<?xml version="1.0"?>
<PropertyList>
<name>display</name>
<modal>false</modal>
<layout>vbox</layout>
<text>
<label>Display Options</label>
</text>
<hrule/>
<group>
<layout>vbox</layout>
<halign>center</halign>
<checkbox>
<halign>left</halign>
<label>Show frame rate</label>
<property>/sim/rendering/fps-display</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Show chat messages</label>
<property>/sim/multiplay/chat-display</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Enable view name popup</label>
<property>/sim/view-name-popup</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Toggle 2D Panel</label>
<binding>
<command>property-toggle</command>
<property>/sim/panel/visibility</property>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Allow 3d cockpit toggle</label>
<property>/sim/allow-toggle-cockpit</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<button>
<halign>center</halign>
<legend>Cycle HUD</legend>
<binding>
<command>nasal</command>
<script>aircraft.HUD.cycle_color()</script>
</binding>
</button>
<button>
<halign>center</halign>
<legend>Configure views</legend>
<binding>
<command>dialog-show</command>
<dialog-name>view</dialog-name>
</binding>
</button>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<empty><stretch>true</stretch></empty>
<button>
<legend>Close</legend>
<default>true</default>
<key>Esc</key>
<binding>
<command>dialog-apply</command>
</binding>
<binding>
<command>dialog-close</command>
</binding>
</button>
<empty><stretch>true</stretch></empty>
</group>
</PropertyList>

103
gui/dialogs/rendering.xml
View file

@ -15,24 +15,6 @@
<layout>vbox</layout> <layout>vbox</layout>
<halign>center</halign> <halign>center</halign>
<checkbox>
<halign>left</halign>
<label>Show frame rate</label>
<property>/sim/rendering/fps-display</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Show chat messages</label>
<property>/sim/multiplay/chat-display</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Sun/Moon horizon effect</label> <label>Sun/Moon horizon effect</label>
@ -98,21 +80,39 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Lightning</label> <label>Random vegetation</label>
<property>/sim/rendering/lightning-enable</property> <property>/sim/rendering/random-vegetation</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <button>
<halign>center</halign>
<legend>Configure shader effects </legend>
<binding>
<command>dialog-show</command>
<dialog-name>shader-options</dialog-name>
</binding>
</button>
<!--checkbox>
<halign>left</halign>
<label>Lightning</label>
<property>/sim/rendering/lightning-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox-->
<!--checkbox>
<halign>left</halign> <halign>left</halign>
<label>Bump mapped clouds</label> <label>Bump mapped clouds</label>
<property>/sim/rendering/bump-mapping</property> <property>/sim/rendering/bump-mapping</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox-->
</group> </group>
<hrule/> <hrule/>
@ -154,13 +154,70 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
</group> </group>
</group> </group>
</group> </group>
<hrule/> <hrule/>
<group>
<padding>8</padding>
<layout>vbox</layout>
<checkbox>
<padding>8</padding>
<halign>left</halign>
<label>Enable 3d clouds</label>
<property>/sim/rendering/clouds3d-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text><label>Cloud density</label></text>
<slider>
<min>0</min>
<max>1.0</max>
<property>/sim/rendering/clouds3d-density</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<live>true</live>
<property>/sim/rendering/clouds3d-density</property>
</text>
</group>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text><label>Cloud visibility range</label></text>
<slider>
<min>100.0</min>
<max>20000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property>
<binding>
<command>dialog-apply</command>
</binding>
</slider>
<text>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/sim/rendering/clouds3d-vis-range</property>
</text>
</group>
</group>
<hrule/>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<empty><stretch>true</stretch></empty> <empty><stretch>true</stretch></empty>

131
gui/dialogs/shader-options.xml
View file

@ -17,127 +17,40 @@
<hrule/> <hrule/>
<group> <group>
<text>
<label>Terrain Effects</label>
</text>
<layout>vbox</layout> <layout>vbox</layout>
<halign>center</halign> <halign>center</halign>
<checkbox>
<halign>left</halign>
<label>Random vegetation</label>
<property>/sim/rendering/random-vegetation</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Crop texture</label>
<property>/sim/rendering/crop-shader</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Landmass effects</label>
<property>/sim/rendering/landmass-shader</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
</group>
<hrule/>
<group>
<text>
<label>Atmosphere Effects</label>
</text>
<padding>8</padding>
<layout>vbox</layout>
<checkbox>
<padding>8</padding>
<halign>left</halign>
<label>Enable 3d clouds</label>
<property>/sim/rendering/clouds3d-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>left</halign>
<text><label>Cloud density</label></text> <checkbox>
<slider> <halign>left</halign>
<min>0</min> <label>Crop texture</label>
<max>1.0</max> <property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/clouds3d-density</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</slider> </checkbox>
<text> <checkbox>
<label>12345678</label> <halign>left</halign>
<format>%.2f</format> <label>Landmass effects</label>
<live>true</live> <property>/sim/rendering/landmass-shader</property>
<property>/sim/rendering/clouds3d-density</property>
</text>
</group>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text><label>Cloud visibility range</label></text>
<slider>
<min>100.0</min>
<max>20000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</slider> </checkbox>
<text>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/sim/rendering/clouds3d-vis-range</property>
</text>
</group> </group>
</group> <group>
<layout>hbox</layout>
<hrule/>
<group>
<text>
<label>Water Effects</label>
</text>
<layout>vbox</layout>
<halign>center</halign>
<checkbox>
<halign>left</halign> <halign>left</halign>
<label>Light reflection</label> <checkbox>
<property>/sim/rendering/water-shader</property> <halign>left</halign>
<binding> <label>Water reflection</label>
<command>dialog-apply</command> <property>/sim/rendering/water-shader</property>
</binding> <binding>
</checkbox> <command>dialog-apply</command>
</group> </binding>
</checkbox>
<hrule/> </group>
<group>
<text>
<label>Model Effects</label>
</text>
</group> </group>
<hrule/> <hrule/>

13
gui/dialogs/view.xml
View file

@ -11,18 +11,7 @@
<hrule/> <hrule/>
<checkbox> <nasal>
<halign>left</halign>
<label>Enable view name popup</label>
<property>/sim/view-name-popup</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<hrule/>
<nasal>
<open> <open>
var group = cmdarg().getNode("group"); var group = cmdarg().getNode("group");
var ac = getprop("/sim/aircraft"); var ac = getprop("/sim/aircraft");

20
gui/menubar.xml
View file

@ -93,18 +93,10 @@
<label>View</label> <label>View</label>
<item> <item>
<label>Toggle 2D Panel</label> <label>Display Options</label>
<binding>
<command>property-toggle</command>
<property>/sim/panel/visibility</property>
</binding>
</item>
<item>
<label>View Options</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>view</dialog-name> <dialog-name>display</dialog-name>
</binding> </binding>
</item> </item>
@ -116,14 +108,6 @@
</binding> </binding>
</item> </item>
<item>
<label>Effects</label>
<binding>
<command>dialog-show</command>
<dialog-name>shader-options</dialog-name>
</binding>
</item>
<item> <item>
<label>Cockpit View Options</label> <label>Cockpit View Options</label>
<binding> <binding>