fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'rendering-checkboxes'

Browse source
This commit is contained in:
Gijs de Rooy 2010-12-14 14:27:04 +01:00
commit 13c0f75cd8
1 changed files with 98 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
gui/dialogs/rendering.xml
View file

@ -6,10 +6,29 @@
<layout>vbox</layout> <layout>vbox</layout>
<padding>20</padding> <padding>20</padding>
<group>
<layout>hbox</layout>
<empty><stretch>1</stretch></empty>
<text> <text>
<label>Rendering Options</label> <label>Rendering options</label>
</text> </text>
<empty><stretch>1</stretch></empty>
<button>
<pref-width>16</pref-width>
<pref-height>16</pref-height>
<legend></legend>
<default>1</default>
<keynum>27</keynum>
<border>2</border>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
<hrule/> <hrule/>
<group> <group>
@ -19,10 +38,18 @@
<group> <group>
<layout>vbox</layout> <layout>vbox</layout>
<!--
<group>
<layout>hbox</layout>
<text> <text>
<halign>left</halign>
<label>Lighting</label> <label>Lighting</label>
<halign>left</halign>
</text> </text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
@ -69,16 +96,22 @@
</binding> </binding>
</checkbox> </checkbox>
<hrule/> -->
<group>
<layout>hbox</layout>
<text> <text>
<halign>left</halign>
<label>Objects</label> <label>Objects</label>
<halign>left</halign>
</text> </text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Particles (Smoke, Dust, Spray)</label> <label>Particles (smoke, dust, spray)</label>
<property>/sim/rendering/particles</property> <property>/sim/rendering/particles</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -94,6 +127,8 @@
</binding> </binding>
</checkbox> </checkbox>
<!--
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Lightning</label> <label>Lightning</label>
@ -103,15 +138,6 @@
</binding> </binding>
</checkbox> </checkbox>
<checkbox>
<halign>left</halign>
<label>Bump mapped clouds</label>
<property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Random objects</label> <label>Random objects</label>
@ -129,44 +155,35 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
</group>
<vrule/> -->
<group> <group>
<layout>vbox</layout> <layout>hbox</layout>
<text> <text>
<label>Clouds</label>
<halign>left</halign> <halign>left</halign>
<label>Shadows</label>
</text> </text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<!--
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Enable</label> <label>2D clouds</label>
<property>/sim/rendering/shadows/enabled</property> <property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Debug</label>
<property>/sim/rendering/shadows/debug</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<hrule/> -->
<text>
<label>3D Clouds</label>
<halign>left</halign>
</text>
<checkbox> <checkbox>
<label>Enable 3D clouds</label> <label>3D clouds</label>
<halign>left</halign> <halign>left</halign>
<property>/sim/rendering/clouds3d-enable</property> <property>/sim/rendering/clouds3d-enable</property>
<binding> <binding>
@ -214,16 +231,32 @@
</text> </text>
</group> </group>
<hrule/> <group>
<layout>vbox</layout>
<stretch>true</stretch>
</group>
</group>
<vrule/>
<group>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text> <text>
<label>Shader effects</label>
<halign>left</halign> <halign>left</halign>
<label>Shader Effects</label>
</text> </text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Material Shaders</label> <label>Material shaders</label>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
@ -334,27 +367,6 @@
</group> </group>
</group> </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>
<nasal> <nasal>
<open> <open>
gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets")); gui.enable_widgets(cmdarg(), "shadows-debug", getprop("/sim/gui/devel-widgets"));