fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of git://mapserver.flightgear.org/fgdata

Browse source
This commit is contained in:
Ryan Miller 2010-12-14 15:41:44 -08:00
commit 8a854b963f
3 changed files with 99 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Effects/tree.eff
View file

@ -21,6 +21,7 @@
<predicate>
<and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/random-vegetation</property>
<less-equal>
<value type="float">1.0</value>
<shader-language/>

168
gui/dialogs/rendering.xml
View file

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

7
materials.xml
View file

@ -1023,13 +1023,6 @@ Shared parameters for various materials.
<coverage-m2>400000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Residential/zone_maisons_carre-ba.ac</path>
<path>Models/Residential/zone_maisons_long-ba.ac</path>
<path>Models/Residential/zone_maisons_grd-ba.ac</path>
<coverage-m2>100000</coverage-m2>
<heading-type>random</heading-type>
</object>
<object>
<path>Models/Residential/germanvillagehouse1.ac</path>
<path>Models/Residential/MontHse1Grey_White.ac</path>