fly/fgdata
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
BARANGER Emmanuel 2011-06-13 18:17:47 +02:00
commit 169ff10cf8
13 changed files with 191 additions and 51 deletions

1
Docs/README.gui
View file

@ -400,6 +400,7 @@ The flags printed after the node type have the following meaning:
W -> trace write operations
A -> archive bit set
U -> user archive bit set
P -> preserved bit set (value is preserved on sim-reset)
T -> property is "tied"
Ln -> number of listeners attached to this node

3
Nasal/debug.nas
View file

@ -134,8 +134,9 @@ var attributes = func(p, verbose = 1) {
var W = p.getAttribute("trace-write") ? "W" : "";
var A = p.getAttribute("archive") ? "A" : "";
var U = p.getAttribute("userarchive") ? "U" : "";
var P = p.getAttribute("preserve") ? "P" : "";
var T = p.getAttribute("tied") ? "T" : "";
var attr = r ~ w ~ R ~ W ~ A ~ U ~ T;
var attr = r ~ w ~ R ~ W ~ A ~ U ~ P ~ T;
var type = "(" ~ p.getType();
if (size(attr))
type ~= ", " ~ attr;

11
Nasal/gui.nas
View file

@ -1254,17 +1254,6 @@ var common_aircraft_keys = {
],
};
_setlistener("/sim/signals/screenshot", func {
var path = getprop("/sim/paths/screenshot-last");
var button = { button: { legend: "Ok", default: 1, binding: { command: "dialog-close" }}};
var success= getprop("/sim/signals/screenshot");
if (success) {
popupTip("Screenshot written to '" ~ path ~ "'", 3);
} else {
popupTip("Error writing screenshot '" ~ path ~ "'", 600, button);
}
});
var do_welcome = 1;
_setlistener("/sim/signals/fdm-initialized", func {
var haveTutorials = size(props.globals.getNode("/sim/tutorials", 1).getChildren("tutorial"));

3
Nasal/view.nas
View file

@ -100,7 +100,8 @@ var stepView = func(step, force = 0) {
n = size(views) - 1;
elsif (n >= size(views))
n = 0;
if (force or (var e = views[n].getNode("enabled")) == nil or e.getBoolValue())
if (force or (var e = (views[n].getNode("enabled"))) == nil or
(e.getBoolValue() and (views[n].getNode("name")!=nil)))
break;
}
setprop("/sim/current-view/view-number", n);

BIN
Textures/Terrain.winter/golfcourse1.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 134 KiB

BIN
Textures/Terrain.winter/naturalcrop1.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 32 KiB

BIN
Textures/Terrain/golfcourse1.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 124 KiB

BIN
Textures/Terrain/naturalcrop1.png Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 106 KiB

5
gui/dialogs/view.xml
View file

@ -44,7 +44,8 @@
foreach (var v; view.views) {
var index = v.getIndex();
var enabled = v.initNode("enabled", 1, "BOOL");
var name = v.getNode("name");
if (name != nil) {
if (index >= 200) {
if (mode != 2) {
mode = 2;
@ -65,10 +66,10 @@
var target = group.getChild("checkbox", index, 1);
props.copy(group.getNode("checkbox-template"), target);
var name = v.getNode("name");
target.getNode("label").setValue(name != nil ? name.getValue() : ("** unnamed view " ~ index ~ " **"));
target.getNode("property").setValue(enabled.getPath());
}
}
</open>
</nasal>

7
gui/menubar.xml
View file

@ -58,7 +58,12 @@
<command>nasal</command>
<script>
gui.popdown();
fgcommand("screen-capture");
var success = fgcommand("screen-capture");
var path = getprop("/sim/paths/screenshot-last");
if (success)
gui.popupTip("Screenshot written to '" ~ path ~ "'");
else
gui.popupTip("Error writing screenshot '" ~ path ~ "'");
</script>
</binding>
</item>

15
keyboard.xml
View file

@ -1106,7 +1106,20 @@ top down before the key bindings are parsed.
<name>F3</name>
<desc>Capture screen</desc>
<binding>
<command>screen-capture</command>
<command>nasal</command>
<script>
var success = fgcommand("screen-capture");
var path = getprop("/sim/paths/screenshot-last");
var threading = getprop("/sim/rendering/multithreading-mode");
var button = { button: { legend: "Ok", default: 1, binding: { command: "dialog-close" }}};
if (threading and threading != "SingleThreaded") {
gui.popupTip("Threading model must be SingleThreaded (or not defined) for snapshots to work.", 600, button);
} elsif (success) {
gui.popupTip("Screenshot written to '" ~ path ~ "'", 2);
} else {
gui.popupTip("Error writing screenshot '" ~ path ~ "'", 600, button);
}
</script>
</binding>
<mod-shift>
<desc>Load panel</desc>

135
materials.xml
View file

@ -1177,7 +1177,6 @@ Shared parameters for various materials.
<name>GrassCover</name>
<name>BareTundraCover</name>
<name>MixedTundraCover</name>
<name>GolfCourse</name>
<name>Cemetery</name>
<effect>Effects/landmass</effect>
<texture>Terrain/tundra.png</texture>
@ -1439,7 +1438,6 @@ Shared parameters for various materials.
<effect>Effects/crop</effect>
<name>DryCropPastureCover</name>
<name>DryCrop</name>
<name>NaturalCrop</name>
<texture>Terrain/drycrop1.png</texture>
<texture>Terrain/drycrop2.png</texture>
<texture>Terrain/drycrop3.png</texture>
@ -1496,6 +1494,33 @@ Shared parameters for various materials.
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>summer</value>
</equals>
</condition>
<name>NaturalCrop</name>
<texture>Terrain/naturalcrop1.png</texture>
<xsize>2000</xsize>
<ysize>2000</ysize>
<solid>1</solid>
<friction-factor>0.9</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<wood-coverage>500000.0</wood-coverage>
<wood-size>20000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
@ -1539,6 +1564,44 @@ Shared parameters for various materials.
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>summer</value>
</equals>
</condition>
<name>GolfCourse</name>
<texture>Terrain/golfcourse1.png</texture>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
<diffuse>
<r>0.93</r>
<g>0.95</g>
<b>0.93</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.1</r>
<g>0.12</g>
<b>0.1</b>
<a>1.0</a>
</specular>
<shininess>1.2</shininess>
<solid>1</solid>
<friction-factor>0.7</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>500000.0</wood-coverage>
<tree-texture>Textures/Trees/mixed-summer.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
@ -2297,7 +2360,6 @@ Shared parameters for various materials.
</condition>
<name>DryCropPastureCover</name>
<name>DryCrop</name>
<name>NaturalCrop</name>
<texture>Terrain.winter/drycrop1.png</texture>
<texture>Terrain.winter/drycrop2.png</texture>
<texture>Terrain.winter/drycrop3.png</texture>
@ -2354,6 +2416,33 @@ Shared parameters for various materials.
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>winter</value>
</equals>
</condition>
<name>NaturalCrop</name>
<texture>Terrain.winter/naturalcrop1.png</texture>
<xsize>2000</xsize>
<ysize>2000</ysize>
<solid>1</solid>
<friction-factor>0.9</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.6</bumpiness>
<load-resistance>1e30</load-resistance>
<light-coverage>2000000.0</light-coverage>
<wood-coverage>150000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
@ -2398,6 +2487,46 @@ Shared parameters for various materials.
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>
<property>sim/startup/season</property>
<value>winter</value>
</equals>
</condition>
<name>GolfCourse</name>
<texture>Terrain.winter/golfcourse.png</texture>
<xsize>2000</xsize>
<ysize>2000</ysize>
<light-coverage>2000000.0</light-coverage>
<diffuse>
<r>0.93</r>
<g>0.95</g>
<b>0.93</b>
<a>1.0</a>
</diffuse>
<specular>
<r>0.1</r>
<g>0.12</g>
<b>0.1</b>
<a>1.0</a>
</specular>
<shininess>1.2</shininess>
<solid>1</solid>
<friction-factor>0.7</friction-factor>
<rolling-friction>0.1</rolling-friction>
<bumpiness>0.3</bumpiness>
<load-resistance>1e30</load-resistance>
<wood-coverage>150000.0</wood-coverage>
<wood-size>10000.0</wood-size>
<tree-density>5000.0</tree-density>
<tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
<tree-varieties>8</tree-varieties>
<tree-range-m alias="/params/forest/tree-range-m"/>
<tree-height-m>20.0</tree-height-m>
<tree-width-m>12.0</tree-width-m>
</material>
<material>
<condition>
<equals>

18
preferences.xml
View file

@ -39,29 +39,29 @@ Started September 2000 by David Megginson, david@megginson.com
<intl include="Translations/locale.xml"/>
<aircraft>c172p</aircraft>
<virtual-cockpit type="bool">false</virtual-cockpit>
<presets>
<presets preserve="y">
<airport-id>KSFO</airport-id>
<runway></runway>
<trim type="bool">true</trim>
</presets>
<startup>
<xsize type="int">800</xsize>
<ysize type="int">600</ysize>
<xsize type="int" preserve="y">800</xsize>
<ysize type="int" preserve="y">600</ysize>
<splash-screen type="bool">true</splash-screen>
<splash-progress type="bool">true</splash-progress>
<splash-title>
<!-- -->
</splash-title>
<intro-music type="bool">false</intro-music>
<game-mode type="bool">false</game-mode>
<fullscreen type="bool">false</fullscreen>
<game-mode type="bool" preserve="y">false</game-mode>
<fullscreen type="bool" preserve="y">false</fullscreen>
<units>feet</units>
<save-on-exit type="bool"
userarchive="y">true</save-on-exit>
<browser-app write="n">firefox -new-tab "%u"</browser-app>
<!-- help viewer; only used under Unix -->
<terminal-ansi-colors type="bool">true</terminal-ansi-colors>
<season type="string">summer</season>
<season type="string" preserve="y">summer</season>
</startup>
<rendering>
<debug type="bool">false</debug>
@ -655,7 +655,7 @@ Started September 2000 by David Megginson, david@megginson.com
</autovisibility>
</menubar>
<gui>
<gui preserve="y">
<current-style type="int"
userarchive="y">1</current-style>
<style n="0"
@ -722,7 +722,7 @@ Started September 2000 by David Megginson, david@megginson.com
</ai>
<multiplay>
<chat type="string">Hello</chat>
<chat type="string" preserve="y">Hello</chat>
<transmission-freq-hz type="string">118500000</transmission-freq-hz>
<chat-display type="bool"
userarchive="y">true</chat-display>
@ -732,7 +732,7 @@ Started September 2000 by David Megginson, david@megginson.com
</multiplay>
<user>
<callsign type="string">Golf Foxtrot Sierra</callsign>
<callsign type="string" preserve="y">Golf Foxtrot Sierra</callsign>
</user>
<timing-statistics>