Merge branch 'master' of git://gitorious.org/fg/fgdata
0
Nasal/environment.nas
Executable file → Normal file
|
@ -138,6 +138,7 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
|
|||
menuEnable("tutorial-start", size(props.globals.getNode("/sim/tutorials", 1).getChildren("tutorial")));
|
||||
menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks").getChildren("js")));
|
||||
|
||||
# frame-per-second display
|
||||
var fps = props.globals.getNode("/sim/rendering/fps-display", 1);
|
||||
setlistener(fps, fpsDisplay, 1);
|
||||
setlistener("/sim/startup/xsize", func {
|
||||
|
@ -147,6 +148,16 @@ _setlistener("/sim/signals/nasal-dir-initialized", func {
|
|||
}
|
||||
});
|
||||
|
||||
# frame-latency display
|
||||
var latency = props.globals.getNode("/sim/rendering/frame-latency-display", 1);
|
||||
setlistener(latency, latencyDisplay, 1);
|
||||
setlistener("/sim/startup/xsize", func {
|
||||
if (latency.getValue()) {
|
||||
latencyDisplay(0);
|
||||
latencyDisplay(1);
|
||||
}
|
||||
});
|
||||
|
||||
# only enable precipitation if gui *and* aircraft want it
|
||||
var p = "/sim/rendering/precipitation-";
|
||||
var precip_gui = getprop(p ~ "gui-enable");
|
||||
|
@ -197,7 +208,10 @@ var fpsDisplay = func(n) {
|
|||
var w = isa(n, props.Node) ? n.getValue() : n;
|
||||
fgcommand(w ? "dialog-show" : "dialog-close", props.Node.new({"dialog-name": "fps"}));
|
||||
}
|
||||
|
||||
var latencyDisplay = func(n) {
|
||||
var w = isa(n, props.Node) ? n.getValue() : n;
|
||||
fgcommand(w ? "dialog-show" : "dialog-close", props.Node.new({"dialog-name": "frame-latency"}));
|
||||
}
|
||||
|
||||
##
|
||||
# How many seconds do we show the tip?
|
||||
|
|
0
Nasal/redout.nas
Executable file → Normal file
|
@ -75,6 +75,9 @@ var min_speed_kt = 0;
|
|||
# Target property tree root
|
||||
var target_root = "";
|
||||
|
||||
# Loop identifier
|
||||
var tracker_loop_id = 0;
|
||||
|
||||
# Initialize target tracking
|
||||
var TrackInit = func {
|
||||
if (props.globals.getNode("autopilot") == nil)
|
||||
|
@ -109,20 +112,25 @@ var TrackInit = func {
|
|||
target_root = default_target_root;
|
||||
setprop("/autopilot/target-tracking/target-root", target_root);
|
||||
}
|
||||
|
||||
setlistener("/autopilot/target-tracking/enable", func { startTimer();} );
|
||||
}
|
||||
settimer(TrackInit, 0);
|
||||
|
||||
|
||||
# If enabled, update our AP target values based on the target range,
|
||||
# bearing, and speed
|
||||
var TrackUpdate = func {
|
||||
var TrackUpdate = func(loop_id) {
|
||||
# avoid running multiple concurrent timers
|
||||
if (tracker_loop_id != loop_id)
|
||||
return;
|
||||
|
||||
if (props.globals.getNode("autopilot") == nil)
|
||||
return;
|
||||
|
||||
target_tracking_enable = getprop("/autopilot/target-tracking/enable");
|
||||
update_period = getprop("/autopilot/target-tracking/update-period");
|
||||
|
||||
if ( target_tracking_enable == 1 ) {
|
||||
update_period = getprop("/autopilot/target-tracking/update-period");
|
||||
|
||||
# refresh user configurable values
|
||||
goal_range_nm = getprop("/autopilot/target-tracking/goal-range-nm");
|
||||
target_root = getprop("/autopilot/target-tracking/target-root");
|
||||
|
@ -182,16 +190,17 @@ var TrackUpdate = func {
|
|||
setprop( "/autopilot/settings/true-heading-deg",
|
||||
my_hdg_true + h_offset );
|
||||
setprop( "/autopilot/settings/target-speed-kt", target_speed );
|
||||
|
||||
# only keep the timer running when the feature is really enabled
|
||||
settimer(func() { TrackUpdate(loop_id); }, update_period );
|
||||
}
|
||||
|
||||
# last thing to do before we return from this function
|
||||
registerTimer();
|
||||
}
|
||||
|
||||
# create and start a new timer to cause our update function to be called periodially
|
||||
startTimer = func {
|
||||
tracker_loop_id += 1;
|
||||
TrackUpdate(tracker_loop_id);
|
||||
}
|
||||
|
||||
# timer handling to cause our update function to be called periodially
|
||||
registerTimer = func {
|
||||
settimer(TrackUpdate, update_period );
|
||||
}
|
||||
registerTimer();
|
||||
settimer(TrackInit, 0);
|
||||
|
||||
|
|
0
Navaids/TACAN_freq.dat.gz
Executable file → Normal file
0
Sounds/mk-viii/500-above.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-10.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-100.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-1000.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-20.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-200.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-30.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-300.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-40.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-400.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-50.wav
Executable file → Normal file
0
Sounds/mk-viii/altitude-500.wav
Executable file → Normal file
0
Sounds/mk-viii/application-data-base-failed.wav
Executable file → Normal file
0
Sounds/mk-viii/bank-angle-inop.wav
Executable file → Normal file
0
Sounds/mk-viii/bank-angle.wav
Executable file → Normal file
0
Sounds/mk-viii/callouts-inop.wav
Executable file → Normal file
0
Sounds/mk-viii/configuration-type-invalid.wav
Executable file → Normal file
0
Sounds/mk-viii/dont-sink.wav
Executable file → Normal file
0
Sounds/mk-viii/glideslope-inop.wav
Executable file → Normal file
0
Sounds/mk-viii/glideslope.wav
Executable file → Normal file
0
Sounds/mk-viii/gpws-inop.wav
Executable file → Normal file
0
Sounds/mk-viii/minimums.wav
Executable file → Normal file
0
Sounds/mk-viii/pull-up.wav
Executable file → Normal file
0
Sounds/mk-viii/sink-rate.wav
Executable file → Normal file
0
Sounds/mk-viii/terrain.wav
Executable file → Normal file
0
Sounds/mk-viii/too-low-flaps.wav
Executable file → Normal file
0
Sounds/mk-viii/too-low-gear.wav
Executable file → Normal file
0
Sounds/mk-viii/too-low-terrain.wav
Executable file → Normal file
0
Textures/Sky/cl_cb.png
Executable file → Normal file
Before Width: | Height: | Size: 213 KiB After Width: | Height: | Size: 213 KiB |
0
Textures/Sky/cl_cu.png
Executable file → Normal file
Before Width: | Height: | Size: 223 KiB After Width: | Height: | Size: 223 KiB |
0
Textures/Sky/cl_cu2.png
Executable file → Normal file
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 42 KiB |
0
Textures/Sky/cl_ns.png
Executable file → Normal file
Before Width: | Height: | Size: 594 KiB After Width: | Height: | Size: 594 KiB |
0
Textures/Sky/cl_ns_white.png
Executable file → Normal file
Before Width: | Height: | Size: 542 KiB After Width: | Height: | Size: 542 KiB |
0
Textures/Sky/cl_st.png
Executable file → Normal file
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 19 KiB |
0
gui/dialogs/atc-ai.xml
Executable file → Normal file
|
@ -8,13 +8,13 @@
|
|||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<empty><stretch>1</stretch></empty>
|
||||
<empty><stretch>1</stretch></empty>
|
||||
|
||||
<text>
|
||||
<label>Display Options</label>
|
||||
</text>
|
||||
|
||||
<empty><stretch>1</stretch></empty>
|
||||
<empty><stretch>1</stretch></empty>
|
||||
|
||||
<button>
|
||||
<pref-width>16</pref-width>
|
||||
|
@ -43,6 +43,15 @@
|
|||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Show worst-case frame latency</label>
|
||||
<property>/sim/rendering/frame-latency-display</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<halign>left</halign>
|
||||
<label>Show chat messages</label>
|
||||
|
@ -79,10 +88,10 @@
|
|||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
<group>
|
||||
<layout>hbox</layout>
|
||||
|
||||
<checkbox>
|
||||
<checkbox>
|
||||
<label>Autohide cursor in</label>
|
||||
<property>/sim/mouse/hide-cursor</property>
|
||||
<binding>
|
||||
|
@ -90,11 +99,11 @@
|
|||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<input>
|
||||
<live>true</live>
|
||||
<pref-width>40</pref-width>
|
||||
<pref-height>10</pref-height>
|
||||
<enable>
|
||||
<input>
|
||||
<live>true</live>
|
||||
<pref-width>40</pref-width>
|
||||
<pref-height>10</pref-height>
|
||||
<enable>
|
||||
<property>/sim/mouse/hide-cursor</property>
|
||||
</enable>
|
||||
<property>/sim/mouse/cursor-timeout-sec</property>
|
||||
|
@ -102,12 +111,11 @@
|
|||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</input>
|
||||
|
||||
<text>
|
||||
<label>sec.</label>
|
||||
</text>
|
||||
|
||||
</group>
|
||||
<text>
|
||||
<label>sec.</label>
|
||||
</text>
|
||||
</group>
|
||||
|
||||
</group>
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
<text>
|
||||
<label>000</label>
|
||||
<property>/sim/frame-rate</property>
|
||||
<format>%3.0f</format>
|
||||
<live>true</live>
|
||||
<color>
|
||||
<red>0.9</red>
|
||||
|
|
30
gui/dialogs/frame-latency.xml
Normal file
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<PropertyList>
|
||||
<name>frame-latency</name>
|
||||
<x>2</x>
|
||||
<y>2</y>
|
||||
<layout>hbox</layout>
|
||||
<default-padding>0</default-padding>
|
||||
<font>
|
||||
<name>HELVETICA_12</name>
|
||||
</font>
|
||||
<color>
|
||||
<red>0</red>
|
||||
<green>0</green>
|
||||
<blue>0</blue>
|
||||
<alpha>0</alpha>
|
||||
</color>
|
||||
<text>
|
||||
<label>0000 ms</label>
|
||||
<property>/sim/frame-latency-max-ms</property>
|
||||
<format>%4.0f ms</format>
|
||||
<live>true</live>
|
||||
<color>
|
||||
<red>0.9</red>
|
||||
<green>0.4</green>
|
||||
<blue>0.2</blue>
|
||||
<alpha>1</alpha>
|
||||
</color>
|
||||
</text>
|
||||
</PropertyList>
|
|
@ -29,6 +29,15 @@
|
|||
|
||||
<hrule/>
|
||||
|
||||
<checkbox>
|
||||
<label>Enable 3D</label>
|
||||
<halign>left</halign>
|
||||
<property>/sim/hud/enable3d[1]</property>
|
||||
<binding>
|
||||
<command>dialog-apply</command>
|
||||
</binding>
|
||||
</checkbox>
|
||||
|
||||
<checkbox>
|
||||
<label>Transparent</label>
|
||||
<halign>left</halign>
|
||||
|
|
|
@ -23,7 +23,7 @@ Started September 2000 by David Megginson, david@megginson.com
|
|||
|
||||
<session type="int" userarchive="y">0</session>
|
||||
<paths>
|
||||
<screenshot-dir type="string"/> <!-- defaults to current working dir -->
|
||||
<screenshot-dir type="string" userarchive="y"/> <!-- defaults to current working dir -->
|
||||
<validate>
|
||||
<read type="string"/>
|
||||
<write type="string"/>
|
||||
|
@ -131,6 +131,7 @@ Started September 2000 by David Megginson, david@megginson.com
|
|||
<shader-experimental type="bool" userarchive="y">false</shader-experimental>
|
||||
<shader-effects type="bool" userarchive="y">true</shader-effects>
|
||||
<fps-display type="bool" userarchive="y">false</fps-display>
|
||||
<frame-latency-display type="bool" userarchive="y">false</frame-latency-display>
|
||||
<on-screen-statistics type="int">0</on-screen-statistics>
|
||||
<glide-slope-tunnel type="bool" userarchive="y">false</glide-slope-tunnel>
|
||||
<redout>
|
||||
|
|