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 2011-07-31 16:21:05 +02:00
commit 0481fc5010
3 changed files with 84 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gui/dialogs/display.xml
View file

@ -45,7 +45,7 @@
<checkbox>
<halign>left</halign>
<label>Show worst-case frame latency</label>
<label>Show frame spacing</label>
<property>/sim/rendering/frame-latency-display</property>
<binding>
<command>dialog-apply</command>

164
gui/dialogs/rendering.xml
View file

@ -73,64 +73,64 @@
</checkbox>
<!--
<group>
<layout>hbox</layout>
<text>
<label>Lighting</label>
<halign>left</halign>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<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>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 (requires restart)</label>
<property>/sim/rendering/point-sprites</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>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>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>
-->
<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>
@ -167,16 +167,16 @@
<!--
<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>Lightning</label>
<property>/sim/rendering/lightning-enable</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
-->
<checkbox>
<halign>left</halign>
@ -207,16 +207,16 @@
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/sim/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>Animated jetways</label>
<name>jetways</name>
<property>/sim/jetways/enabled</property>
<binding>
<command>dialog-apply</command>
<object-name>jetways</object-name>
</binding>
</checkbox>
<group>
<layout>hbox</layout>
@ -231,16 +231,16 @@
<!--
<checkbox>
<halign>left</halign>
<label>2D clouds</label>
<property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
<checkbox>
<halign>left</halign>
<label>2D clouds</label>
<property>/sim/rendering/bump-mapping</property>
<binding>
<command>dialog-apply</command>
</binding>
</checkbox>
-->
-->
<checkbox>
<halign>left</halign>
@ -690,8 +690,6 @@
</text>
</group>
</group>
</group>

4
gui/dialogs/stereoscopic-view-options.xml
View file

@ -77,7 +77,7 @@
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<format>%.2f m</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/screen-distance</property>
</text>
@ -98,7 +98,7 @@
</slider>
<text>
<label>12345678</label>
<format>%.2f</format>
<format>%.2f m</format>
<live>true</live>
<property>/sim/rendering/osg-displaysettings/eye-separation</property>
</text>