fly/fgdata
1
0
Fork 0
Code Activity

Add max-paged-lod, triangle-directional-lights

Browse source 
Also restructure dialog somewhat.
This commit is contained in:
Stuart Buchanan 2020-05-10 16:23:54 +01:00
parent 132447f084
commit f8fdd58c43
1 changed files with 407 additions and 451 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

858
gui/dialogs/rendering.xml
View file

@ -78,74 +78,20 @@
<checkbox>
<halign>left</halign>
<label>Wireframe</label>
<name>wireframe</name>
<property>/sim/rendering/wireframe</property>
<label>Atmospheric Light Scattering (ALS)</label>
<name>skydome-scattering</name>
<enable>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</enable>
<property>/sim/rendering/shaders/skydome</property>
<binding>
<command>dialog-apply</command>
<object-name>wireframe</object-name>
<object-name>skydome-scattering</object-name>
</binding>
</checkbox>
<!--
<group>
<layout>hbox</layout>
<text>
<label>Lighting</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox>
<halign>left</halign>
<label>Sun/Moon horizon effect</label>
<property>/sim/rendering/horizon-effect</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label>Use point sprites for runway lights</label>
<property>/sim/rendering/point-sprites</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<!--
<checkbox>
<halign>left</halign>
<label>Enhanced runway lighting</label>
<property>/sim/rendering/enhanced-lighting</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Runway light distance attenuation</label>
<property>/sim/rendering/distance-attenuation</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Specular reflections on objects</label>
<property>/sim/rendering/specular-highlight</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<group>
<layout>hbox</layout>
<halign>left</halign>
@ -204,19 +150,6 @@
</text>
</group>
<!--
<checkbox>
<halign>left</halign>
<label>Lightning</label>
<property>/sim/rendering/lightning-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label>Compensate field of view for wider screens</label>
@ -227,32 +160,391 @@
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/nasal/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Use disk space for faster loading (DDS Texture Cache)</label>
<name>texture-cache-enabled</name>
<property>/sim/rendering/texture-cache/cache-enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>texture-cache-enabled</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Use disk space for faster loading (DDS Texture Cache)</label>
<name>texture-cache-enabled</name>
<property>/sim/rendering/texture-cache/cache-enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>texture-cache-enabled</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Wireframe</label>
<name>wireframe</name>
<property>/sim/rendering/wireframe</property>
<binding>
<command>dialog-apply</command>
<object-name>wireframe</object-name>
</binding>
</checkbox>
<empty>
<group>
<layout>hbox</layout>
<halign>left</halign>
<text>
<label>Maximum number of aircraft and scenery tiles</label>
</text>
<slider>
<name>max-plod</name>
<min>100.0</min>
<max>10000.0</max>
<step>100.0</step>
<fraction>0.17</fraction>
<property>/sim/rendering/max-paged-lod</property>
<binding>
<command>dialog-apply</command>
<object-name>max-plod</object-name>
</binding>
</slider>
<text>
<label>12345</label>
<format>%d</format>
<live>true</live>
<property>/sim/rendering/max-paged-lod</property>
</text>
</group>
<text>
<color>
<red>1.0</red>
<green>0.6</green>
<blue>0.6</blue>
</color>
<label>Warning: High values use a lot amount of memory and GPU</label>
<visible>
<greater-than>
<property>/sim/rendering/max-paged-lod</property>
<value>500.0</value>
</greater-than>
</visible>
</text>
<empty>
<stretch>1</stretch>
</empty>
<group>
<layout>hbox</layout>
<text>
<label>Shaders</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<group>
<layout>table</layout>
<group>
<layout>hbox</layout>
<row>0</row>
<col>0</col>
<visible>
<not>
<property>/sim/rendering/shaders/custom-settings</property>
</not>
</visible>
<text>
<label>Performance</label>
</text>
<slider>
<name>quality-level</name>
<min>0.0</min>
<max>5.0</max>
<step>1.0</step>
<fraction>0.17</fraction>
<property>/sim/rendering/shaders/quality-level-internal</property>
<binding>
<command>dialog-apply</command>
<object-name>quality-level</object-name>
</binding>
</slider>
<text>
<label>Quality</label>
</text>
<text>
<label>12345678</label>
<format>(%1.0f)</format>
<live>true</live>
<property>/sim/rendering/shaders/quality-level-internal</property>
</text>
</group>
<group>
<layout>hbox</layout>
<row>0</row>
<col>0</col>
<visible>
<and>
<property>/sim/rendering/shaders/custom-settings</property>
<not>
<property>/sim/rendering/shaders/skydome</property>
</not>
</and>
</visible>
<button>
<legend>Shader Options</legend>
<halign>left</halign>
<binding>
<command>dialog-show</command>
<dialog-name>shaders</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
<group>
<layout>hbox</layout>
<row>0</row>
<col>0</col>
<visible>
<and>
<property>/sim/rendering/shaders/custom-settings</property>
<property>/sim/rendering/shaders/skydome</property>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</and>
</visible>
<button>
<legend>Shader Options</legend>
<halign>left</halign>
<binding>
<command>dialog-show</command>
<dialog-name>shaders-lightfield</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
<checkbox>
<halign>left</halign>
<row>0</row>
<col>1</col>
<label>Custom</label>
<name>custom-settings</name>
<property>/sim/rendering/shaders/custom-settings</property>
<binding>
<command>dialog-apply</command>
<object-name>custom-settings</object-name>
</binding>
</checkbox>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Atmospheric Effects</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<checkbox>
<halign>left</halign>
<label>Particles (smoke, dust, spray)</label>
<name>particles</name>
<property>/sim/rendering/particles</property>
<binding>
<command>dialog-apply</command>
<object-name>particles</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Precipitation</label>
<name>precipitation</name>
<property>/sim/rendering/precipitation-gui-enable</property>
<binding>
<command>dialog-apply</command>
<object-name>precipitation</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>3D clouds</label>
<name>3d-clouds</name>
<property>/sim/rendering/clouds3d-enable</property>
<binding>
<command>dialog-apply</command>
<object-name>3d-clouds</object-name>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text>
<label>Cloud density</label>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-density</name>
<min>0</min>
<max>1.0</max>
<property>/sim/rendering/clouds3d-density</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-density</object-name>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding>
</slider>
<text>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<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>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-vis-range</name>
<min>1000.0</min>
<max>150000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-vis-range</object-name>
</binding>
</slider>
<text>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/sim/rendering/clouds3d-vis-range</property>
</text>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Experimental Settings</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<group>
<layout>table</layout>
<button>
<row>0</row>
<col>0</col>
<enable>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<legend>Filter effects</legend>
<halign>center</halign>
<binding>
<command>dialog-show</command>
<dialog-name>als-filters</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
<button>
<row>0</row>
<col>1</col>
<enable>
<property>/sim/rendering/rembrandt/enabled</property>
</enable>
<legend>Rembrandt Options</legend>
<halign>center</halign>
<binding>
<command>dialog-show</command>
<dialog-name>rembrandt</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
<group>
<layout>vbox</layout>
<stretch>1</stretch>
</group>
</group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<vrule/>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text>
@ -598,164 +890,10 @@
</group>
<group>
<layout>vbox</layout>
<stretch>1</stretch>
</group>
</group>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<vrule/>
<!-- only for a gap -->
<group>
<layout>vbox</layout>
<default-padding>1</default-padding>
<text>
<label> </label>
</text>
</group>
<group>
<layout>vbox</layout>
<group>
<layout>hbox</layout>
<text>
<label>Shader Effects</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<group>
<layout>table</layout>
<checkbox>
<halign>left</halign>
<row>0</row>
<col>0</col>
<label>Custom settings (fine-tuning)</label>
<name>custom-settings</name>
<property>/sim/rendering/shaders/custom-settings</property>
<binding>
<command>dialog-apply</command>
<object-name>custom-settings</object-name>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<row>1</row>
<col>0</col>
<visible>
<not>
<property>/sim/rendering/shaders/custom-settings</property>
</not>
</visible>
<text>
<label>Performance</label>
</text>
<slider>
<name>quality-level</name>
<min>0.0</min>
<max>5.0</max>
<step>1.0</step>
<fraction>0.17</fraction>
<property>/sim/rendering/shaders/quality-level-internal</property>
<binding>
<command>dialog-apply</command>
<object-name>quality-level</object-name>
</binding>
</slider>
<text>
<label>Quality</label>
</text>
<text>
<label>12345678</label>
<format>(%1.0f)</format>
<live>true</live>
<property>/sim/rendering/shaders/quality-level-internal</property>
</text>
</group>
<group>
<layout>hbox</layout>
<row>1</row>
<col>0</col>
<visible>
<and>
<property>/sim/rendering/shaders/custom-settings</property>
<not>
<property>/sim/rendering/shaders/skydome</property>
</not>
</and>
</visible>
<button>
<legend>Shader Options</legend>
<halign>left</halign>
<binding>
<command>dialog-show</command>
<dialog-name>shaders</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
<group>
<layout>hbox</layout>
<row>1</row>
<col>0</col>
<visible>
<and>
<property>/sim/rendering/shaders/custom-settings</property>
<property>/sim/rendering/shaders/skydome</property>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</and>
</visible>
<button>
<legend>Shader Options</legend>
<halign>left</halign>
<binding>
<command>dialog-show</command>
<dialog-name>shaders-lightfield</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
</group>
<group>
<layout>hbox</layout>
<text>
<label>Atmospheric Effects</label>
<label>Airports</label>
<halign>left</halign>
</text>
<hrule>
@ -765,216 +903,35 @@
<checkbox>
<halign>left</halign>
<label>Particles (smoke, dust, spray)</label>
<name>particles</name>
<property>/sim/rendering/particles</property>
<label>Use point sprites for runway lights</label>
<property>/sim/rendering/point-sprites</property>
<binding>
<command>dialog-apply</command>
<object-name>particles</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Precipitation</label>
<name>precipitation</name>
<property>/sim/rendering/precipitation-gui-enable</property>
<binding>
<command>dialog-apply</command>
<object-name>precipitation</object-name>
</binding>
</checkbox>
<!--
<checkbox>
<halign>left</halign>
<label>2D clouds</label>
<property>/sim/rendering/bump-mapping</property>
<label>Use triangles for directional lights</label>
<property>/sim/rendering/triangle-directional-lights</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable>
<property>/sim/rendering/point-sprites</property>
</enable>
</checkbox>
-->
<checkbox>
<halign>left</halign>
<label>3D clouds</label>
<name>3d-clouds</name>
<property>/sim/rendering/clouds3d-enable</property>
<binding>
<command>dialog-apply</command>
<object-name>3d-clouds</object-name>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text>
<label>Cloud density</label>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-density</name>
<min>0</min>
<max>1.0</max>
<property>/sim/rendering/clouds3d-density</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-density</object-name>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding>
<binding>
<command>property-toggle</command>
<property>/sim/rendering/clouds3d-enable</property>
</binding>
</slider>
<text>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<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>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
</text>
<slider>
<name>cloud-vis-range</name>
<min>1000.0</min>
<max>150000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property>
<binding>
<command>dialog-apply</command>
<object-name>cloud-vis-range</object-name>
</binding>
</slider>
<text>
<enable>
<property>/sim/rendering/clouds3d-enable</property>
</enable>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/sim/rendering/clouds3d-vis-range</property>
</text>
</group>
<!-- mhab modified -->
<group>
<layout>table</layout>
<group>
<layout>vbox</layout>
<pref-height>35</pref-height>
<halign>left</halign>
<row>0</row>
<col>0</col>
<checkbox>
<halign>left</halign>
<label>Atmospheric Light Scattering (ALS)</label>
<name>skydome-scattering</name>
<enable>
<not>
<property>/sim/rendering/rembrandt/enabled</property>
</not>
</enable>
<property>/sim/rendering/shaders/skydome</property>
<binding>
<command>dialog-apply</command>
<object-name>skydome-scattering</object-name>
</binding>
</checkbox>
</group>
<button>
<row>1</row>
<col>0</col>
<enable>
<property>/sim/rendering/shaders/skydome</property>
</enable>
<legend>Filter settings (experimental)</legend>
<halign>center</halign>
<binding>
<command>dialog-show</command>
<dialog-name>als-filters</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
<group>
<layout>hbox</layout>
<row>2</row>
<col>0</col>
<text>
<label>Rembrandt</label>
<halign>left</halign>
<enable>
<property>/sim/rendering/rembrandt/enabled</property>
</enable>
</text>
<text>
<label>(experimental)</label>
<halign>left</halign>
<color>
<red>1.0</red>
<green>0.6</green>
<blue>0.6</blue>
</color>
<enable>
<property>/sim/rendering/rembrandt/enabled</property>
</enable>
</text>
<hrule>
<stretch>true</stretch>
<visible>
<property>/sim/rendering/rembrandt/enabled</property>
</visible>
</hrule>
</group>
<button>
<row>3</row>
<col>0</col>
<enable>
<property>/sim/rendering/rembrandt/enabled</property>
</enable>
<legend>Rembrandt Options</legend>
<halign>center</halign>
<binding>
<command>dialog-show</command>
<dialog-name>rembrandt</dialog-name>
</binding>
<binding>
<command>dialog-close</command>
<dialog-name>rendering</dialog-name>
</binding>
<pref-width>200</pref-width>
</button>
</group>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/nasal/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<empty>
<stretch>1</stretch>
@ -1168,7 +1125,6 @@
reload_vals[p] = getprop(p);
}
]]>
</open>
</nasal>