1
0
Fork 0

Merge branch 'master' of git://gitorious.org/fg/fgdata

This commit is contained in:
Erik Hofman 2011-04-05 13:11:17 +02:00
commit 95889d19eb
4 changed files with 36 additions and 14 deletions

View file

@ -6,23 +6,44 @@
<inherits-from>Effects/reflect</inherits-from>
<parameters>
<texture n="5">
<!-- we use 6 images here instead of a cube cross-->
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png</positive-x>
<negative-x>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png</negative-x>
<positive-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png</positive-y>
<negative-y>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png</negative-y>
<positive-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png</positive-z>
<negative-z>Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png</negative-z>
<positive-x>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_px.png</positive-x>
<negative-x>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_nx.png</negative-x>
<positive-y>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_py.png</positive-y>
<negative-y>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_ny.png</negative-y>
<positive-z>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_pz.png</positive-z>
<negative-z>Aircraft/Generic/Effects/CubeMaps/real.blue-sky/fair-sky_nz.png</negative-z>
</images>
</texture>
<rainbowiness type="float">0.01</rainbowiness>
<fresneliness>0.1</fresneliness>
<refl_correction>0.0</refl_correction>
<ambient_correction>0.1</ambient_correction>
<reflect_map>0</reflect_map>
<texture n="6">
<image>Aircraft/Generic/Effects/Rainbow.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
</texture>
<texture n="7">
<image>Aircraft/Generic/Effects/FresnelLookUp.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<texture n="8">
<image>Aircraft/Generic/Effects/greymap.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>
<internal-format>normalized</internal-format>
</texture>
<rendering-hint>transparent</rendering-hint>
<shade-model>smooth</shade-model>
<rainbowiness type="double">0.1</rainbowiness>
<fresneliness type="double">0.1</fresneliness>
<noisiness type="double">0.1</noisiness>
<refl_correction type="double">-0.2</refl_correction>
<ambient_correction type="double">0.1</ambient_correction>
<reflect_map type="double">0</reflect_map>
</parameters>
</PropertyList>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

View file

@ -108,7 +108,7 @@ var startChatter = func {
}
# connect listener
setlistener("/sim/sound/chatter/enabled", startChatter);
_setlistener("/sim/sound/chatter/enabled", startChatter);
# start chatter immediately, if enable is already set.
settimer(startChatter, 0);

View file

@ -160,6 +160,7 @@ Started September 2000 by David Megginson, david@megginson.com
<screen-distance type="double" userarchive="y">0.5</screen-distance>
<stereo-mode type="string" userarchive="y">OFF</stereo-mode>
</osg-displaysettings>
<cache type="bool">true</cache>
</rendering>
<model-hz type="int">120</model-hz>
<navdb>