fly/fgdata
1
0
Fork 0
Code Activity

Merge branch 'master' of D:\Git_New\fgdata

Browse source
This commit is contained in:
Vivian Meazza 2011-12-10 00:13:45 +00:00
commit 8c7e5b79cc
14 changed files with 215 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Effects/transition.eff
View file

@ -41,7 +41,7 @@ parameters :
<use>/environment/rain-norm</use> <use>/environment/rain-norm</use>
</rain-norm> </rain-norm>
<snow-level> <snow-level>
<use>/sim/rendering/snow-level-m</use> <use>/environment/snow-level-m</use>
</snow-level> </snow-level>
<cloud-cover0> <cloud-cover0>

66
Effects/urban.eff
View file

@ -4,12 +4,12 @@
<inherits-from>Effects/terrain-default</inherits-from> <inherits-from>Effects/terrain-default</inherits-from>
<parameters> <parameters>
<snow-level> <snow-level>
<use>/sim/rendering/snow-level-m</use> <use>/environment/snow-level-m</use>
</snow-level> </snow-level>
<depth-factor type="float">0.008</depth-factor> <depth-factor type="float">0.008</depth-factor>
<night-color type="vec3d">0.75 0.59 0.05</night-color> <night-color type="vec3d">0.75 0.59 0.05</night-color>
<quality-level> <quality-level>
<use>/sim/rendering/shaders/quality-level</use> <use>/sim/rendering/shaders/urban</use>
</quality-level> </quality-level>
<!--fog include--> <!--fog include-->
@ -46,20 +46,26 @@
<property>/sim/rendering/shaders/quality-level</property> <property>/sim/rendering/shaders/quality-level</property>
<less-equal> <less-equal>
<value type="float">4.0</value> <value type="float">4.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/urban</float-property>
</less-equal> </less-equal>
<or> <and>
<less-equal> <or>
<value type="float">2.0</value> <less-equal>
<glversion/> <value type="float">2.0</value>
</less-equal> <glversion/>
<and> </less-equal>
<extension-supported>GL_ARB_shader_objects</extension-supported> <and>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
</and> <extension-supported>GL_ARB_fragment_shader</extension-supported>
</or> </and>
</or>
<or>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>
@ -289,18 +295,24 @@
<value type="float">2.0</value> <value type="float">2.0</value>
<float-property>/sim/rendering/shaders/quality-level</float-property> <float-property>/sim/rendering/shaders/quality-level</float-property>
</less-equal> </less-equal>
<or> <and>
<less-equal> <or>
<value type="float">2.0</value> <less-equal>
<glversion/> <value type="float">2.0</value>
</less-equal> <glversion/>
<and> </less-equal>
<extension-supported>GL_ARB_shader_objects</extension-supported> <and>
<extension-supported>GL_ARB_shading_language_100</extension-supported> <extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported> <extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported> <extension-supported>GL_ARB_vertex_shader</extension-supported>
</and> <extension-supported>GL_ARB_fragment_shader</extension-supported>
</or> </and>
</or>
<or>
<extension-supported>GL_ATI_shader_texture_lod</extension-supported>
<extension-supported>GL_ARB_shader_texture_lod</extension-supported>
</or>
</and>
</and> </and>
</predicate> </predicate>
<pass> <pass>

2
Environment/environment.xml
View file

@ -319,6 +319,8 @@
<data type="string"/> <data type="string"/>
</wildfire> </wildfire>
<snow-level-m type="double">3200.0</snow-level-m>
<!-- create on instance of the terrains-sampler but start disabled --> <!-- create on instance of the terrains-sampler but start disabled -->
<terrain> <terrain>
<area> <area>

1
Input/Joysticks/Accelerometers/accelerometers.xml
View file

@ -13,6 +13,7 @@ $Id$
<PropertyList> <PropertyList>
<name>ST LIS3LV02DL Accelerometer</name> <name>ST LIS3LV02DL Accelerometer</name>
<name>ST LIS3L V02DL Accelerometer</name>
</PropertyList> </PropertyList>

8
Nasal/gui.nas
View file

@ -1232,14 +1232,14 @@ var common_aircraft_keys = {
key: [ key: [
{ name: "Enter", desc: "move rudder right" }, { name: "Enter", desc: "move rudder right" },
{ name: "0/Insert", desc: "move rudder left" }, { name: "0/Insert", desc: "move rudder left" },
{ name: "1/End", desc: "decrease elevator trim" }, { name: "1/End", desc: "elevator trim up" },
{ name: "2/Up", desc: "increase elevator or AP altitude" }, { name: "2/Down", desc: "elevator up or increase AP altitude" },
{ name: "3/PgDn", desc: "decr. throttle or AP autothrottle" }, { name: "3/PgDn", desc: "decr. throttle or AP autothrottle" },
{ name: "4/Left", desc: "move aileron left or adj. AP hdg." }, { name: "4/Left", desc: "move aileron left or adj. AP hdg." },
{ name: "5/KP5", desc: "center aileron, elev., and rudder" }, { name: "5/KP5", desc: "center aileron, elev., and rudder" },
{ name: "6/Right", desc: "move aileron right or adj. AP hdg." }, { name: "6/Right", desc: "move aileron right or adj. AP hdg." },
{ name: "7/Home", desc: "increase elevator trim" }, { name: "7/Home", desc: "elevator trim down" },
{ name: "8/Down", desc: "decrease elevator or AP altitude" }, { name: "8/Up", desc: "elevator down or decrease AP altitude" },
{ name: "9/PgUp", desc: "incr. throttle or AP autothrottle" }, { name: "9/PgUp", desc: "incr. throttle or AP autothrottle" },
{ name: "Space", desc: "PTT - Push To Talk (via VoIP)" }, { name: "Space", desc: "PTT - Push To Talk (via VoIP)" },
{ name: "!/@/#/$", desc: "select engine 1/2/3/4" }, { name: "!/@/#/$", desc: "select engine 1/2/3/4" },

24
Nasal/weather-utility.nas
View file

@ -70,7 +70,6 @@ var initialize = func {
var ground_term_Node = props.globals.getNode("/environment/terminator-relative-position-m" , 1); var ground_term_Node = props.globals.getNode("/environment/terminator-relative-position-m" , 1);
ground_term_Node.setDoubleValue(60000); ground_term_Node.setDoubleValue(60000);
# ################## listeners #################### # ################## listeners ####################
# #
setlistener("/environment/sea/surface/wind-speed-kt", func (n) { setlistener("/environment/sea/surface/wind-speed-kt", func (n) {
@ -157,3 +156,26 @@ setlistener("sim/signals/fdm-initialized", initialize);
# end # end
###
# Adjust snow line to match METAR
#
var snowLineDefault = 3200;
_setlistener("/environment/metar/valid", func {
var snowCover = getprop("/environment/metar/snow-cover");
var snowLine = getprop("/environment/snow-level-m");
# Put the snow line slightly below the station's elevation,
# so the station is completely covered with snow
var stationElev = getprop("/environment/metar/station-elevation-ft") * globals.FT2M - 50;
if (snowCover == 1){
if (stationElev > snowLineDefault) { snowLine = snowLineDefault; }
if ((stationElev <= snowLineDefault) and (snowLine > stationElev)) { snowLine = stationElev; }
}
setprop("/environment/snow-level-m",snowLine);
});
#
###

1
Shaders/urban.frag
View file

@ -7,6 +7,7 @@
#version 120 #version 120
#extension GL_ATI_shader_texture_lod : enable #extension GL_ATI_shader_texture_lod : enable
#extension GL_ARB_shader_texture_lod : enable
#define TEXTURE_MIP_LEVELS 10 #define TEXTURE_MIP_LEVELS 10
#define TEXTURE_PIX_COUNT 1024 //pow(2,TEXTURE_MIP_LEVELS) #define TEXTURE_PIX_COUNT 1024 //pow(2,TEXTURE_MIP_LEVELS)

BIN
Sounds/avionics-400Hz.wav Normal file
View file

Binary file not shown.

75
gui/dialogs/rendering.xml
View file

@ -418,81 +418,6 @@
</group> </group>
</group> </group>
<group>
<layout>hbox</layout>
<text>
<label>Other</label>
<halign>left</halign>
<enable>
<property>/sim/rendering/shaders/quality-level</property>
</enable>
</text>
<hrule>
<stretch>true</stretch>
</hrule>
</group>
<group>
<layout>hbox</layout>
<halign>right</halign>
<text>
<label>Snow line</label>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
</text>
<slider>
<name>snow-level</name>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
<min>0.0</min>
<max>5000.0</max>
<property>/sim/rendering/snow-level-m</property>
<binding>
<command>dialog-apply</command>
<object-name>snow-level</object-name>
</binding>
</slider>
<text>
<halign>left</halign>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/sim/rendering/snow-level-m</property>
</text>
</group>
<group> <group>
<layout>hbox</layout> <layout>hbox</layout>
<text> <text>

22
gui/dialogs/sound.xml
View file

@ -273,6 +273,28 @@
<property>/sim/sound/enabled</property> <property>/sim/sound/enabled</property>
</enable> </enable>
</checkbox> </checkbox>
<text>
<row>6</row>
<col>0</col>
<label>AI/MP</label>
<halign>left</halign>
<enable>
<property>/sim/sound/enabled</property>
</enable>
</text>
<checkbox>
<row>6</row>
<col>1</col>
<property>/sim/sound/aimodels/enabled</property>
<binding>
<command>dialog-apply</command>
</binding>
<enable>
<property>/sim/sound/enabled</property>
</enable>
</checkbox>
</group> </group>
<hrule/> <hrule/>

120
gui/dialogs/weather.xml
View file

@ -416,7 +416,7 @@
</group> </group>
<group> <group>
<layout>hbox</layout> <layout>vbox</layout>
<halign>fill</halign> <halign>fill</halign>
<group> <group>
<layout>table</layout> <layout>table</layout>
@ -424,23 +424,18 @@
<row>0</row> <row>0</row>
<col>0</col> <col>0</col>
<label>Rain</label> <label>Rain</label>
<enable> <halign>left</halign>
<property>/sim/gui/dialogs/weather-scenario/state</property> <enable>
</enable> <equals>
</text> <property>/sim/gui/dialogs/weather-scenario/state</property>
<value type="int">1</value>
<text> </equals>
<row>0</row>
<col>1</col>
<label>Snow</label>
<enable>
<property>/sim/gui/dialogs/weather-scenario/state</property>
</enable> </enable>
</text> </text>
<slider> <slider>
<row>1</row> <row>0</row>
<col>0</col> <col>1</col>
<live>true</live> <live>true</live>
<halign>fill</halign> <halign>fill</halign>
<property>/environment/rain-norm</property> <property>/environment/rain-norm</property>
@ -456,6 +451,19 @@
</enable> </enable>
</slider> </slider>
<text>
<row>1</row>
<col>0</col>
<label>Snow</label>
<halign>left</halign>
<enable>
<equals>
<property>/sim/gui/dialogs/weather-scenario/state</property>
<value type="int">1</value>
</equals>
</enable>
</text>
<slider> <slider>
<row>1</row> <row>1</row>
<col>1</col> <col>1</col>
@ -478,7 +486,7 @@
<row>0</row> <row>0</row>
<col>3</col> <col>3</col>
<label>QNH (inHg)</label> <label>QNH (inHg)</label>
<enable> <enable>
<property>/sim/gui/dialogs/weather-scenario/state</property> <property>/sim/gui/dialogs/weather-scenario/state</property>
</enable> </enable>
</text> </text>
@ -502,18 +510,92 @@
</binding> </binding>
</input> </input>
<empty> <text>
<label>Snow line</label>
<row>2</row> <row>2</row>
<col>0</col> <col>0</col>
<colspan>3</colspan> <enable>
<pref-height>30</pref-height> <and>
</empty> <property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
</text>
<slider>
<name>snow-level</name>
<row>2</row>
<col>1</col>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
<min>-425.0</min>
<max>5000.0</max>
<live>true</live>
<property>/environment/snow-level-m</property>
<binding>
<command>dialog-apply</command>
<object-name>snow-level</object-name>
</binding>
</slider>
<text>
<row>2</row>
<col>2</col>
<enable>
<and>
<property>/sim/rendering/shaders/quality-level</property>
<or>
<property>/sim/rendering/shaders/crop</property>
<property>/sim/rendering/shaders/landmass</property>
<property>/sim/rendering/shaders/transition</property>
<property>/sim/rendering/shaders/urban</property>
</or>
</and>
</enable>
<label>12345678</label>
<format>%.fm</format>
<live>true</live>
<property>/environment/snow-level-m</property>
</text>
</group> </group>
<empty> <empty>
<stretch>true</stretch> <stretch>true</stretch>
</empty> </empty>
<text>
<visible>
<not>
<equals>
<property>/sim/gui/dialogs/weather-scenario/state</property>
<value type="int">1</value>
</equals>
</not>
</visible>
<label>Disable METAR to manually edit weather settings.</label>
<halign>left</halign>
<color>
<red>1.0</red>
<green>0.6</green>
<blue>0.6</blue>
</color>
</text>
</group> </group>
</group> </group>
<!-- Precipitation End --> <!-- Precipitation End -->

8
keyboard.xml
View file

@ -462,7 +462,7 @@ top down before the key bindings are parsed.
<key n="50"> <key n="50">
<name>2</name> <name>2</name>
<desc>Increase elevator or autopilot altitude</desc> <desc>Elevator up or increase autopilot altitude</desc>
<repeatable type="bool">true</repeatable> <repeatable type="bool">true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -570,7 +570,7 @@ top down before the key bindings are parsed.
<key n="56"> <key n="56">
<name>8</name> <name>8</name>
<desc>Decrease elevator or autopilot altitude</desc> <desc>Elevator down or decrease autopilot altitude</desc>
<repeatable type="bool">true</repeatable> <repeatable type="bool">true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -1277,7 +1277,7 @@ top down before the key bindings are parsed.
<key n="357"> <key n="357">
<name>Up</name> <name>Up</name>
<desc>Increase elevator or autopilot altitude</desc> <desc>Elevator down or decrease autopilot altitude</desc>
<repeatable type="bool">true</repeatable> <repeatable type="bool">true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -1324,7 +1324,7 @@ top down before the key bindings are parsed.
<key n="359"> <key n="359">
<name>Down</name> <name>Down</name>
<desc>Decrease elevator or autopilot altitude</desc> <desc>Elevator up or increase autopilot altitude</desc>
<repeatable type="bool">true</repeatable> <repeatable type="bool">true</repeatable>
<binding> <binding>
<command>nasal</command> <command>nasal</command>

2
materials-dds.xml
View file

@ -1280,6 +1280,7 @@ Shared parameters for various materials.
<name>ShrubCover</name> <name>ShrubCover</name>
<name>ShrubGrassCover</name> <name>ShrubGrassCover</name>
<name>ScrubCover</name> <name>ScrubCover</name>
<name>Scrub</name>
<name>Sclerophyllous</name> <name>Sclerophyllous</name>
<name>Heath</name> <name>Heath</name>
<texture>Terrain/shrub.dds</texture> <texture>Terrain/shrub.dds</texture>
@ -2553,6 +2554,7 @@ Shared parameters for various materials.
<name>ShrubCover</name> <name>ShrubCover</name>
<name>ShrubGrassCover</name> <name>ShrubGrassCover</name>
<name>ScrubCover</name> <name>ScrubCover</name>
<name>Scrub</name>
<name>Sclerophyllous</name> <name>Sclerophyllous</name>
<name>Heath</name> <name>Heath</name>
<texture>Terrain.winter/shrub.png</texture> <texture>Terrain.winter/shrub.png</texture>

39
preferences.xml
View file

@ -68,22 +68,15 @@ Started September 2000 by David Megginson, david@megginson.com
<realism type="int">5</realism> <realism type="int">5</realism>
<filtering type="int">8</filtering> <filtering type="int">8</filtering>
<shaders> <shaders>
<model type="float" <model type="float" userarchive="y">1.0</model>
userarchive="y">1.0</model> <crop type="float" userarchive="y">1.0</crop>
<crop type="float" <landmass type="float" userarchive="y">1.0</landmass>
userarchive="y">1.0</crop> <contrails type="float" userarchive="y">1.0</contrails>
<landmass type="float" <skydome type="bool" userarchive="y">false</skydome>
userarchive="y">1.0</landmass> <transition type="float" userarchive="y">1.0</transition>
<contrails type="float" <urban type="float" userarchive="y">1.0</urban>
userarchive="y">1.0</contrails> <water type="float" userarchive="y">1.0</water>
<transition type="float" <quality-level type="float" userarchive="y">3.0</quality-level>
userarchive="y">1.0</transition>
<urban type="float"
userarchive="y">1.0</urban>
<water type="float"
userarchive="y">1.0</water>
<quality-level type="float"
userarchive="y">3.0</quality-level>
</shaders> </shaders>
<mie type="float" <mie type="float"
userarchive="y">0.003</mie> userarchive="y">0.003</mie>
@ -91,8 +84,6 @@ Started September 2000 by David Megginson, david@megginson.com
userarchive="y">0.0003</rayleigh> userarchive="y">0.0003</rayleigh>
<dome-density type="float" <dome-density type="float"
userarchive="y">0.5</dome-density> userarchive="y">0.5</dome-density>
<scattering-shader type="bool"
userarchive="y">0</scattering-shader>
<!-- multithreading-mode>AutomaticSelection</multithreading-mode --> <!-- multithreading-mode>AutomaticSelection</multithreading-mode -->
<!-- <!--
Uncomment the above element to select OSG multi-threading mode. Uncomment the above element to select OSG multi-threading mode.
@ -213,15 +204,6 @@ Started September 2000 by David Megginson, david@megginson.com
userarchive="y">false</enabled> userarchive="y">false</enabled>
<rate-m-g type="double">0.005</rate-m-g> <rate-m-g type="double">0.005</rate-m-g>
</headshake> </headshake>
<crop-shader type="bool" userarchive="y">false</crop-shader>
<landmass-shader type="bool" userarchive="y">false</landmass-shader>
<transition-shader type="bool" userarchive="y">false</transition-shader>
<water-shader type="bool" userarchive="y">false</water-shader>
<urban-shader type="bool" userarchive="y">false</urban-shader>
<contrail-shader type="bool" userarchive="y">false</contrail-shader>
<snow-level-m type="double">2000.0</snow-level-m>
<quality-level type="double"
userarchive="y">0.0</quality-level>
<osg-displaysettings> <osg-displaysettings>
<eye-separation type="double" <eye-separation type="double"
userarchive="y">0.05</eye-separation> userarchive="y">0.05</eye-separation>
@ -323,6 +305,9 @@ Started September 2000 by David Megginson, david@megginson.com
<festival type="bool">true</festival> <festival type="bool">true</festival>
</voice> </voice>
</voices> </voices>
<aimodels>
<enabled type="bool" userarchive="y">false</enabled>
</aimodels>
</sound> </sound>
<speed-up type="double">1.0</speed-up> <speed-up type="double">1.0</speed-up>
<current-view> <current-view>