Harald JOHNSEN:
This is another update for the cloud code, a lot of lines but this time I have started to add the doxygen doc. Misc ==== - corrected a bug when RTT is not available, the current rendering context was altered - if RTT is not available then 3d clouds are not drawn at all - impostors lighting is now recomputed when the sun changes position - distant objects are no more seen in front of clouds - blending of distant clouds is a bit better now - litle optimization of code (uses a less cpu time) - use layer wind speed and direction (no more hardcoded wind) - fov is no more hardcoded Changes ======= - clouds (cu only) are dissipating/reforming (experimental) - compute a turbulence factor that depends on surrounding clouds and type of clouds (experimental) - clouds shapes are defined in cloudlayers.xml - type of clouds present in a layer is also defined in cloudlayers.xml - cloud layers are generated from metar and other misc. data (in progress) - added a rain effect around the viewer (enabled in the rendering dialog and when the metar property says so) - added a lightning effect (enabled in the rendering dialog) : cb clouds spawn new lightnings - added a dialog to select from different weather source : metar/property, a 'fair weather' environment and a 'thunderstorm' environment.
This commit is contained in:
parent
019cc557a6
commit
fec33019cb
5 changed files with 1175 additions and 1 deletions
1080
cloudlayers.xml
Normal file
1080
cloudlayers.xml
Normal file
File diff suppressed because it is too large
Load diff
|
@ -58,6 +58,24 @@
|
||||||
</binding>
|
</binding>
|
||||||
</checkbox>
|
</checkbox>
|
||||||
|
|
||||||
|
<checkbox>
|
||||||
|
<halign>left</halign>
|
||||||
|
<label>Precipitations</label>
|
||||||
|
<property>/sim/rendering/precipitation-enable</property>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-apply</command>
|
||||||
|
</binding>
|
||||||
|
</checkbox>
|
||||||
|
|
||||||
|
<checkbox>
|
||||||
|
<halign>left</halign>
|
||||||
|
<label>Lightnings</label>
|
||||||
|
<property>/sim/rendering/lightning-enable</property>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-apply</command>
|
||||||
|
</binding>
|
||||||
|
</checkbox>
|
||||||
|
|
||||||
<checkbox>
|
<checkbox>
|
||||||
<halign>left</halign>
|
<halign>left</halign>
|
||||||
<label>Bump mapped clouds</label>
|
<label>Bump mapped clouds</label>
|
||||||
|
@ -77,7 +95,6 @@
|
||||||
</checkbox>
|
</checkbox>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
<layout>hbox</layout>
|
<layout>hbox</layout>
|
||||||
<halign>right</halign>
|
<halign>right</halign>
|
||||||
|
|
67
gui/dialogs/weather_scenario.xml
Normal file
67
gui/dialogs/weather_scenario.xml
Normal file
|
@ -0,0 +1,67 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
|
||||||
|
<PropertyList>
|
||||||
|
<name>weather_scenario</name>
|
||||||
|
<modal>false</modal>
|
||||||
|
<layout>vbox</layout>
|
||||||
|
|
||||||
|
<text>
|
||||||
|
<label>___________Weather Scenario___________</label>
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<text>
|
||||||
|
<label></label>
|
||||||
|
</text>
|
||||||
|
<group>
|
||||||
|
<layout>hbox</layout>
|
||||||
|
<text>
|
||||||
|
<label>Weather source</label>
|
||||||
|
<halign>left</halign>
|
||||||
|
</text>
|
||||||
|
<combo>
|
||||||
|
<pref-width>200</pref-width>
|
||||||
|
<property>/environment/weather-scenario</property>
|
||||||
|
<value>Fair weather</value>
|
||||||
|
<value>Thunderstorm</value>
|
||||||
|
<value>METAR</value>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-apply</command>
|
||||||
|
</binding>
|
||||||
|
<binding>
|
||||||
|
<command>nasal</command>
|
||||||
|
<script>
|
||||||
|
setprop("/environment/rebuild_layers", getprop("/environment/rebuild_layers")+1);
|
||||||
|
</script>
|
||||||
|
</binding>
|
||||||
|
</combo>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<text><label>Last metar used</label></text>
|
||||||
|
<input>
|
||||||
|
<pref-width>400</pref-width>
|
||||||
|
<live>true</live>
|
||||||
|
<property>/environment/metar/last-metar</property>
|
||||||
|
</input>
|
||||||
|
|
||||||
|
<text>
|
||||||
|
<label></label>
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<group>
|
||||||
|
<layout>hbox</layout>
|
||||||
|
<empty><stretch>true</stretch></empty>
|
||||||
|
|
||||||
|
<button>
|
||||||
|
<legend>Close</legend>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-apply</command>
|
||||||
|
</binding>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-close</command>
|
||||||
|
</binding>
|
||||||
|
<default>true</default>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<empty><stretch>true</stretch></empty>
|
||||||
|
</group>
|
||||||
|
</PropertyList>
|
|
@ -248,6 +248,14 @@
|
||||||
<menu>
|
<menu>
|
||||||
<label>Weather</label>
|
<label>Weather</label>
|
||||||
|
|
||||||
|
<item>
|
||||||
|
<label>Weather Scenario</label>
|
||||||
|
<binding>
|
||||||
|
<command>dialog-show</command>
|
||||||
|
<dialog-name>weather_scenario</dialog-name>
|
||||||
|
</binding>
|
||||||
|
</item>
|
||||||
|
|
||||||
<item>
|
<item>
|
||||||
<label>Weather Conditions</label>
|
<label>Weather Conditions</label>
|
||||||
<binding>
|
<binding>
|
||||||
|
|
|
@ -348,6 +348,8 @@ Started September 2000 by David Megginson, david@megginson.com
|
||||||
<environment>
|
<environment>
|
||||||
<config>
|
<config>
|
||||||
|
|
||||||
|
<cloudlayers include="cloudlayers.xml"/>
|
||||||
|
|
||||||
<boundary-transition-ft>500</boundary-transition-ft>
|
<boundary-transition-ft>500</boundary-transition-ft>
|
||||||
|
|
||||||
<boundary>
|
<boundary>
|
||||||
|
|
Loading…
Reference in a new issue