fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Alexis Bory 2011-08-05 00:27:06 +02:00
commit 3a2ae5ec23
8 changed files with 1233 additions and 1223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Docs/README.xmlparticles
View file

@ -1,4 +1,4 @@
Document started 27/01/2008 by Tiago Gusmão Document started 27/01/2008 by Tiago Gusmão
Updated 02/02/2008 to reflect syntax changes Updated 02/02/2008 to reflect syntax changes
Updated 03/02/2008 to add trails (connected particles) Updated 03/02/2008 to add trails (connected particles)

16
Environment/interpolator.xml
View file

@ -126,6 +126,22 @@
<filter-time>5</filter-time> <filter-time>5</filter-time>
</filter> </filter>
<filter>
<name>EnvironmentInterpolator:wind-from-down</name>
<input>
<expression>
<sum>
<property>/environment/thermal-lift-fps</property>
<property>/environment/ridge-lift-fps</property>
<property>/environment/local-weather-lift-fps</property>
</sum>
</expression>
</input>
<output>/environment/wind-from-down-fps</output>
<type>exponential</type>
<filter-time>0.5</filter-time>
</filter>
<filter> <filter>
<name>EnvironmentInterpolator:turbulence-raw-magnitude</name> <name>EnvironmentInterpolator:turbulence-raw-magnitude</name>
<enable> <enable>

6
Nasal/local_weather/compat_layer.nas
View file

@ -226,11 +226,7 @@ settimer( func {visibility_loop(); },0);
#################################### ####################################
var setLift = func (lift) { var setLift = func (lift) {
setprop("/environment/local-weather-lift-fps",lift);
if (features.can_disable_environment == 1)
{
setprop("/environment/wind-from-down-fps",lift);
}
} }
#################################### ####################################

2
gui/dialogs/display.xml
View file

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

8
gui/dialogs/rendering.xml
View file

@ -73,7 +73,6 @@
</checkbox> </checkbox>
<!-- <!--
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>
@ -93,16 +92,18 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
-->
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Use point sprites for runway lights</label> <label>Use point sprites for runway lights (requires restart)</label>
<property>/sim/rendering/point-sprites</property> <property>/sim/rendering/point-sprites</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
<!--
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Enhanced runway lighting</label> <label>Enhanced runway lighting</label>
@ -129,7 +130,6 @@
<command>dialog-apply</command> <command>dialog-apply</command>
</binding> </binding>
</checkbox> </checkbox>
--> -->
<group> <group>
@ -690,8 +690,6 @@
</text> </text>
</group> </group>
</group> </group>
</group> </group>

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

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