fly/fgdata
1
0
Fork 0
Code Activity

#558: weather utility, performance drop on sim reset

Browse source 
Do not install another set of listeners on _every_ sim reset.
Also improve performance by removing a listener for a property which is
written in _every_ loop anyway (don't waste another Nasal context).
(Do we really need a _Nasal_ loop running at full speed just to convert
a bunch of properties? It increases the load on the Nasal GC and
is unconditionally active, even if all shaders are disabled etc).
This commit is contained in:
ThorstenB 2012-01-07 09:23:26 +01:00
parent 21e3c4d493
commit e3fabacfc5
1 changed files with 49 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
Nasal/weather-utility.nas
View file

@ -3,6 +3,9 @@
# be used with a tied property # be used with a tied property
# #
# TODO: Make this optional (when shaders disabled etc), or move computation
# away from Nasal.
#does what it says on the tin #does what it says on the tin
var clamp = func(v, min, max) { v < min ? min : v > max ? max : v } var clamp = func(v, min, max) { v < min ? min : v > max ? max : v }
@ -44,7 +47,44 @@ props.globals.initNode("/orientation/model/pitch-deg", 0, "DOUBLE");
props.globals.initNode("/orientation/model/roll-deg", 0, "DOUBLE"); props.globals.initNode("/orientation/model/roll-deg", 0, "DOUBLE");
var update_waves = func (wind) {
var wind = 0;
var amp = 0;
var angle = 0;
var dangle = 0;
var freq = 0;
var factor = 0;
var sharp = 0;
amp = Amp + 0.02 * wind;
amp = clamp(amp, 1.0, 2.0);
setprop("/environment/wave/amp", amp);
angle = Angle + 0.2 * wind;
setprop("/environment/wave/angle", angle);
dangle = DAngle - 0.4 * wind;
setprop("/environment/wave/dangle", dangle);
freq = Freq + 0.0008 * wind;
freq = clamp(freq, 0.01, 0.015);
setprop("/environment/wave/freq", freq);
factor = Factor - 0.00001 * wind;
factor = clamp(factor, 0.0001, 0.0004);
setprop("/environment/wave/factor", factor);
sharp = Sharp + 0.02 * wind;
sharp = clamp(sharp, 1.0, 2.0);
setprop("/environment/wave/sharp", sharp);
};
var is_initialized = 0;
var initialize = func { var initialize = func {
if (is_initialized)
return; # only install listeners once
is_initialized = 1;
var wind_from_east_Node = props.globals.getNode("/environment/config/boundary/entry[0]/wind-from-east-fps", 1); var wind_from_east_Node = props.globals.getNode("/environment/config/boundary/entry[0]/wind-from-east-fps", 1);
wind_from_east_Node.setDoubleValue(0); wind_from_east_Node.setDoubleValue(0);
@ -72,48 +112,14 @@ var initialize = func {
# ################## listeners #################### # ################## listeners ####################
# #
setlistener("/environment/sea/surface/wind-speed-kt", func (n) { # installing a listener to /environment/sea/surface/wind-speed-kt does not make sense,
var wind = 0; # since it's currently being written in _every_ update loop anyway).
var amp = 0; # setlistener("/environment/sea/surface/wind-speed-kt", func(n) {update_waves(n.getValue())},
var angle = 0; # 1,
var dangle = 0; # 0);# end listener
var freq = 0;
var factor = 0;
var sharp = 0;
wind = n.getValue();
amp = Amp + 0.02 * wind;
amp = clamp(amp, 1.0, 2.0);
setprop("/environment/wave/amp", amp);
angle = Angle + 0.2 * wind;
setprop("/environment/wave/angle", angle);
dangle = DAngle - 0.4 * wind;
setprop("/environment/wave/dangle", dangle);
freq = Freq + 0.0008 * wind;
freq = clamp(freq, 0.01, 0.015);
setprop("/environment/wave/freq", freq);
factor = Factor - 0.00001 * wind;
factor = clamp(factor, 0.0001, 0.0004);
setprop("/environment/wave/factor", factor);
sharp = Sharp + 0.02 * wind;
sharp = clamp(sharp, 1.0, 2.0);
setprop("/environment/wave/sharp", sharp);
},
1,
0);# end listener
print("weather util initialized ..."); print("weather util initialized ...");
loop(); loop();
}# end init }# end init
var loop = func { var loop = func {
@ -132,6 +138,9 @@ var loop = func {
value = getprop("/environment/config/boundary/entry[0]/wind-speed-kt"); value = getprop("/environment/config/boundary/entry[0]/wind-speed-kt");
setprop("/environment/sea/surface/wind-speed-kt", value); setprop("/environment/sea/surface/wind-speed-kt", value);
# print("wind-speed-kt ", getprop("/environment/sea/surface/wind-speed-kt")); # print("wind-speed-kt ", getprop("/environment/sea/surface/wind-speed-kt"));
# Direct call to update wave settings (much more effective than using a listener,
# since it's written in every loop anyway.
update_waves(value);
value = getprop("/environment/config/enabled"); value = getprop("/environment/config/enabled");
setprop("/environment/sea/config/enabled", value); setprop("/environment/sea/config/enabled", value);