fly/fgdata
1
0
Fork 0
Code Activity

Update to generic blackout, incorporating feedback from Melchior FRANZ:

Browse source 
- Update redout level every frame
 - Replace reading of properties every iteration with listeners
 - move -onset and -complete properties into a parameters subtree
This commit is contained in:
stuart 2008-02-16 20:23:27 +00:00
parent df780e1304
commit dc4ad0dc80
3 changed files with 215 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
Nasal/redout.nas
View file

@ -1,30 +1,24 @@
# Damped G value - starts at 1.
var GDamped = 1.0;
var running = 0;
var fdm = "jsb";
var blackout = func {
var blackout_start = nil;
var blackout_end = nil;
var redout_start = nil;
var redout_end = nil;
var internal = nil;
var enabled = getprop("/sim/rendering/redout/enabled");
var lp_black = nil;
var lp_red = nil;
if (enabled)
var run = func {
if (running)
{
var blackout_start = getprop("/sim/rendering/redout/blackout-onset-g");
var blackout_end = getprop("/sim/rendering/redout/blackout-complete-g");
var redout_start = getprop("/sim/rendering/redout/redout-onset-g");
var redout_end = getprop("/sim/rendering/redout/redout-complete-g");
var internal = getprop("/sim/current-view/internal");
if ((blackout_start == nil) or
(blackout_end == nil) or
(redout_start == nil) or
(redout_end == nil) )
{
# No valid properties - no point running
return;
}
var GCurrent = 1.0;
if (getprop("/sim/flight-model") == "jsb")
if (fdm == "jsb")
{
GCurrent = getprop("/accelerations/pilot/z-accel-fps_sec");
if (GCurrent != nil) GCurrent = - GCurrent / 32;
@ -34,18 +28,17 @@ var blackout = func {
GCurrent = getprop("/accelerations/pilot-g[0]");
}
if (GCurrent == nil) { GCurrent = 1.0; }
# Updated the GDamped using a filter.
if (GDamped < 0)
{
# Redout happens faster and clears quicker
GDamped = GDamped * 0.75 + GCurrent * 0.25;
GDamped = lp_red.filter(GCurrent);
}
else
{
GDamped = GDamped * 0.8 + GCurrent * 0.2;
GDamped = lp_black.filter(GCurrent);
}
setprop("/accelerations/pilot-gdamped", GDamped);
@ -76,14 +69,61 @@ var blackout = func {
# Not in cockpit view - remove all redout/blackout
setprop("/sim/rendering/redout/alpha",0);
}
settimer(run, 0);
}
else
{
# Disabled - remove all redout/blackout
setprop("/sim/rendering/redout/alpha",0);
}
settimer(blackout, 0.1);
}
_setlistener("/sim/signals/nasal-dir-initialized", func { blackout(); });
var check_params = func() {
blackout_start = getprop("/sim/rendering/redout/parameters/blackout-onset-g");
blackout_end = getprop("/sim/rendering/redout/parameters/blackout-complete-g");
redout_start = getprop("/sim/rendering/redout/parameters/redout-onset-g");
redout_end = getprop("/sim/rendering/redout/parameters/redout-complete-g");
if ((blackout_start == nil) or
(blackout_end == nil) or
(redout_start == nil) or
(redout_end == nil) )
{
# No valid properties - no point running
running = 0;
}
}
_setlistener("/sim/signals/nasal-dir-initialized",
func {
fdm = getprop("/sim/flight-model");
check_params();
running = getprop("/sim/rendering/redout/enabled");
internal = getprop("/sim/current-view/internal");
lp_black = aircraft.lowpass.new(0.2);
lp_red = aircraft.lowpass.new(0.25);
run();
setlistener("/sim/rendering/redout/enabled", func(n) {
if ((running == 0) and n.getBoolValue())
{
running = 1;
run();
}
else
{
running = n.getBoolValue();
}
});
setlistener("/sim/rendering/redout/parameters", func {
# one parameter has changed, read them all in again
check_params();
}, 1, 2);
setlistener("/sim/current-view/internal", func(n) {
internal = n.getBoolValue();
});
}
);

16
gui/dialogs/redout.xml
View file

@ -43,7 +43,7 @@
<label>15.0</label>
<format>%2.1f</format>
<live>true</live>
<property>/sim/rendering/redout/blackout-onset-g</property>
<property>/sim/rendering/redout/parameters/blackout-onset-g</property>
</text>
<slider>
@ -51,7 +51,7 @@
<col>2</col>
<min>1.0</min>
<max>15</max>
<property>/sim/rendering/redout/blackout-onset-g</property>
<property>/sim/rendering/redout/parameters/blackout-onset-g</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -70,7 +70,7 @@
<label>15.0</label>
<format>%2.1f</format>
<live>true</live>
<property>/sim/rendering/redout/blackout-complete-g</property>
<property>/sim/rendering/redout/parameters/blackout-complete-g</property>
</text>
<slider>
@ -78,7 +78,7 @@
<col>2</col>
<min>1.0</min>
<max>15</max>
<property>/sim/rendering/redout/blackout-complete-g</property>
<property>/sim/rendering/redout/parameters/blackout-complete-g</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -107,7 +107,7 @@
<label>15.0</label>
<format>%2.1f</format>
<live>true</live>
<property>/sim/rendering/redout/redout-onset-g</property>
<property>/sim/rendering/redout/parameters/redout-onset-g</property>
</text>
<slider>
@ -115,7 +115,7 @@
<col>2</col>
<min>-1.0</min>
<max>-15.0</max>
<property>/sim/rendering/redout/redout-onset-g</property>
<property>/sim/rendering/redout/parameters/redout-onset-g</property>
<binding>
<command>dialog-apply</command>
</binding>
@ -133,7 +133,7 @@
<label>15.0</label>
<format>%2.1f</format>
<live>true</live>
<property>/sim/rendering/redout/redout-complete-g</property>
<property>/sim/rendering/redout/parameters/redout-complete-g</property>
</text>
<slider>
@ -141,7 +141,7 @@
<col>2</col>
<min>-1.0</min>
<max>-15.0</max>
<property>/sim/rendering/redout/redout-complete-g</property>
<property>/sim/rendering/redout/parameters/redout-complete-g</property>
<binding>
<command>dialog-apply</command>
</binding>

2
preferences.xml
View file

@ -103,10 +103,12 @@ Started September 2000 by David Megginson, david@megginson.com
<glide-slope-tunnel type="bool" userarchive="y">false</glide-slope-tunnel>
<redout>
<enabled type="bool" userarchive="y">true</enabled>
<parameters>
<blackout-onset-g>3.5</blackout-onset-g>
<blackout-complete-g>5</blackout-complete-g>
<redout-onset-g>-2</redout-onset-g>
<redout-complete-g>-4</redout-complete-g>
</parameters>
</redout>
</rendering>
<model-hz type="int">120</model-hz>