Merge branch 'master' of git.gitorious.org:fg/fgdata
This commit is contained in:
Martin Spott
commit
2ad1dbe745
4 changed files with 3123 additions and 3111 deletions
|
|
@ -1034,9 +1034,15 @@ var HUD = {
|
|||
init: func {
|
||||
me.vis1N = props.globals.getNode("/sim/hud/visibility[1]", 1);
|
||||
me.currcolN = props.globals.getNode("/sim/hud/current-color", 1);
|
||||
me.currentPathN = props.globals.getNode("/sim/hud/current-path", 1);
|
||||
me.hudN = props.globals.getNode("/sim/hud", 1);
|
||||
me.paletteN = props.globals.getNode("/sim/hud/palette", 1);
|
||||
me.brightnessN = props.globals.getNode("/sim/hud/color/brightness", 1);
|
||||
me.currentN = me.vis1N;
|
||||
|
||||
# keep compatibility with earlier version of FG - hud/path[1] is
|
||||
# the default Hud
|
||||
me.currentPathN.setIntValue(1);
|
||||
},
|
||||
cycle_color: func { # h-key
|
||||
if (!me.currentN.getBoolValue()) # if off, turn on
|
||||
|
|
@ -1057,10 +1063,16 @@ var HUD = {
|
|||
me.brightnessN.setValue(br > 0.01 ? br : 1);
|
||||
},
|
||||
normal_type: func { # i-key
|
||||
|
||||
me.currentPathN.setIntValue(1);
|
||||
},
|
||||
cycle_type: func { # I-key
|
||||
|
||||
var i = me.currentPathN.getValue() + 1;
|
||||
if (i < 1 or i > size(me.hudN.getChildren("path"))) {
|
||||
# back to the start
|
||||
me.currentPathN.setIntValue(1);
|
||||
} else {
|
||||
me.currentPathN.setIntValue(i);
|
||||
}
|
||||
},
|
||||
is_active: func {
|
||||
me.vis1N.getValue();
|
||||
|
|
|
|||
|
|
@ -685,7 +685,6 @@ top down before the key bindings are parsed.
|
|||
</binding>
|
||||
</key>
|
||||
|
||||
<!-- no longer used
|
||||
<key n="73">
|
||||
<name>I</name>
|
||||
<desc>Switch to and toggle alternative HUD types</desc>
|
||||
|
|
@ -693,7 +692,7 @@ top down before the key bindings are parsed.
|
|||
<command>nasal</command>
|
||||
<script>aircraft.HUD.cycle_type()</script>
|
||||
</binding>
|
||||
</key> -->
|
||||
</key>
|
||||
|
||||
<key n="77">
|
||||
<name>M</name>
|
||||
|
|
@ -908,7 +907,6 @@ top down before the key bindings are parsed.
|
|||
</binding>
|
||||
</key>
|
||||
|
||||
<!-- no longer used
|
||||
<key n="105">
|
||||
<name>i</name>
|
||||
<desc>Normal HUD</desc>
|
||||
|
|
@ -917,7 +915,6 @@ top down before the key bindings are parsed.
|
|||
<script>aircraft.HUD.normal_type()</script>
|
||||
</binding>
|
||||
</key>
|
||||
-->
|
||||
|
||||
<key n="106">
|
||||
<name>j</name>
|
||||
|
|
|
|||
|
|
@ -565,13 +565,23 @@ Shared parameters for various materials.
|
|||
<material>
|
||||
<name>pc_taxiway</name>
|
||||
<name>dirt_rwytaxiway</name>
|
||||
<effect>Effects/runway</effect>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pc_taxiway.dds</texture>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
<name>pc_tiedown</name>
|
||||
<name>dirt_rwytiedown</name>
|
||||
<effect>Effects/runway</effect>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pc_tiedown.dds</texture>
|
||||
<xsize>200</xsize>
|
||||
<ysize>200</ysize>
|
||||
</material>
|
||||
|
||||
<material>
|
||||
|
|
@ -597,6 +607,10 @@ Shared parameters for various materials.
|
|||
<material>
|
||||
<name>pc_threshold</name>
|
||||
<name>dirt_rwythreshold</name>
|
||||
<effect>Effects/runway</effect>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pc_threshold.dds</texture>
|
||||
<wrapu>false</wrapu>
|
||||
<wrapv>false</wrapv>
|
||||
|
|
@ -1015,9 +1029,6 @@ Shared parameters for various materials.
|
|||
<b>0.1</b>
|
||||
<a>1.0</a>
|
||||
</specular>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pa_shoulder.dds</texture>
|
||||
<ysize>5</ysize>
|
||||
<wrapu>false</wrapu>
|
||||
|
|
@ -1041,9 +1052,6 @@ Shared parameters for various materials.
|
|||
<b>0.1</b>
|
||||
<a>1.0</a>
|
||||
</specular>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pc_shoulder.dds</texture>
|
||||
<ysize>5</ysize>
|
||||
<wrapu>false</wrapu>
|
||||
|
|
@ -1067,9 +1075,6 @@ Shared parameters for various materials.
|
|||
<b>0.1</b>
|
||||
<a>1.0</a>
|
||||
</specular>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pa_shoulder_f.dds</texture>
|
||||
<ysize>5</ysize>
|
||||
<wrapu>false</wrapu>
|
||||
|
|
@ -1093,9 +1098,6 @@ Shared parameters for various materials.
|
|||
<b>0.1</b>
|
||||
<a>1.0</a>
|
||||
</specular>
|
||||
<shininess>
|
||||
<use>/environment/rain-norm</use>
|
||||
</shininess>
|
||||
<texture>Runway/pc_shoulder_f.dds</texture>
|
||||
<ysize>5</ysize>
|
||||
<wrapu>false</wrapu>
|
||||
|
|
@ -1829,7 +1831,6 @@ Shared parameters for various materials.
|
|||
<bumpiness>0.6</bumpiness>
|
||||
</material>
|
||||
|
||||
|
||||
<material>
|
||||
<condition>
|
||||
<equals>
|
||||
|
|
@ -1944,7 +1945,7 @@ Shared parameters for various materials.
|
|||
<name>HerbTundraCover</name>
|
||||
<name>HerbTundra</name>
|
||||
<effect>Effects/transition-base-rock</effect>
|
||||
<!--<effect>Effects/herbtundra</effect>-->
|
||||
<!-- <effect>Effects/herbtundra</effect> -->
|
||||
<texture>Terrain/herbtundra.dds</texture>
|
||||
<texture>Terrain/herbtundra2.dds</texture>
|
||||
<texture>Terrain/herbtundra3.dds</texture>
|
||||
|
|
@ -2068,7 +2069,7 @@ Shared parameters for various materials.
|
|||
<heading-type>random</heading-type>
|
||||
</object>
|
||||
</object-group>
|
||||
<!-- Disabled to avoid a tremendous osg performance penalty when
|
||||
<!--Disabled to avoid a tremendous osg performance penalty when
|
||||
deleting scenery tiles, caused by tens of thousands of shared
|
||||
horse/cow objects. Need a better implementation!
|
||||
<object-group>
|
||||
|
|
@ -2083,7 +2084,7 @@ Shared parameters for various materials.
|
|||
<coverage-m2>300000</coverage-m2>
|
||||
<heading-type>random</heading-type>
|
||||
</object>
|
||||
</object-group> -->
|
||||
</object-group>-->
|
||||
<wood-coverage>1000000.0</wood-coverage>
|
||||
<wood-size>20000.0</wood-size>
|
||||
<tree-density>4000.0</tree-density>
|
||||
|
|
@ -2152,7 +2153,7 @@ Shared parameters for various materials.
|
|||
<coverage-m2>300000</coverage-m2>
|
||||
<heading-type>random</heading-type>
|
||||
</object>
|
||||
</object-group> -->
|
||||
</object-group>-->
|
||||
<wood-coverage>500000.0</wood-coverage>
|
||||
<tree-texture>Textures.high/Trees/mixed-summer.dds</tree-texture>
|
||||
<tree-varieties>8</tree-varieties>
|
||||
|
|
@ -2213,7 +2214,7 @@ Shared parameters for various materials.
|
|||
<heading-type>random</heading-type>
|
||||
</object>
|
||||
</object-group>
|
||||
<!-- Disabled to avoid a tremendous osg performance penalty when
|
||||
<!--Disabled to avoid a tremendous osg performance penalty when
|
||||
deleting scenery tiles, caused by tens of thousands of shared
|
||||
horse/cow objects. Need a better implementation!
|
||||
<object-group>
|
||||
|
|
@ -2228,7 +2229,7 @@ Shared parameters for various materials.
|
|||
<coverage-m2>300000</coverage-m2>
|
||||
<heading-type>random</heading-type>
|
||||
</object>
|
||||
</object-group> -->
|
||||
</object-group>-->
|
||||
<wood-coverage>500000.0</wood-coverage>
|
||||
<wood-size>20000.0</wood-size>
|
||||
<tree-density>5000.0</tree-density>
|
||||
|
|
@ -3667,7 +3668,6 @@ Shared parameters for various materials.
|
|||
|
||||
<!-- runway and taxiway signs -->
|
||||
|
||||
|
||||
<material>
|
||||
<name>YellowSign.unlighted</name>
|
||||
<texture>Signs/yellow.dds</texture>
|
||||
|
|
|
|||
|
|
@ -327,6 +327,9 @@ Started September 2000 by David Megginson, david@megginson.com
|
|||
</panel_2>
|
||||
<hud>
|
||||
<path n="1">Huds/default.xml</path>
|
||||
<path n="2">Huds/NTPS.xml</path>
|
||||
<path n="3">Huds/minimal.xml</path>
|
||||
|
||||
<!-- new HUD -->
|
||||
<visibility n="1"
|
||||
type="bool">false</visibility>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue