fly/fgdata
1
0
Fork 0
Code Activity

- make timer.stop() return "me"

Browse source 
- make door.move() only spawn an interpolate event if the target value
  differs from the current pos (fixes brake problem in the dhc6)
This commit is contained in:
mfranz 2008-02-05 12:39:56 +00:00
parent a511a1d020
commit 46f66693e2
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Nasal/aircraft.nas
View file

@ -105,7 +105,7 @@ var door = {
if (m.enabledN.getValue() == nil) if (m.enabledN.getValue() == nil)
m.enabledN.setBoolValue(1); m.enabledN.setBoolValue(1);
pos = optarg(arg, 2, 0); var pos = optarg(arg, 2, 0);
if (m.positionN.getValue() == nil) if (m.positionN.getValue() == nil)
m.positionN.setDoubleValue(pos); m.positionN.setDoubleValue(pos);
@ -113,30 +113,38 @@ var door = {
return m; return m;
}, },
# door.enable(bool) -> set ./enabled # door.enable(bool) -> set ./enabled
enable : func { me.enabledN.setBoolValue(arg[0]); me }, enable : func(v) {
me.enabledN.setBoolValue(v);
me;
},
# door.setpos(double) -> set ./position-norm without movement # door.setpos(double) -> set ./position-norm without movement
setpos : func { me.positionN.setValue(arg[0]); me.target = arg[0] < 0.5; me }, setpos : func(pos) {
me.positionN.setValue(pos);
me.target = pos < 0.5;
me;
},
# double door.getpos() -> return current position as double # double door.getpos() -> return current position as double
getpos : func { me.positionN.getValue() }, getpos : func { me.positionN.getValue() },
# door.close() -> move to closed state # door.close() -> move to closed state
close : func { me.move(me.target = 0) }, close : func { me.move(me.target = 0) },
# door.open() -> move to open state # door.open() -> move to open state
open : func { me.move(me.target = 1) }, open : func { me.move(me.target = 1) },
# door.toggle() -> move to opposite end position # door.toggle() -> move to opposite end position
toggle : func { me.move(me.target) }, toggle : func { me.move(me.target) },
# door.stop() -> stop movement # door.stop() -> stop movement
stop : func { interpolate(me.positionN) }, stop : func { interpolate(me.positionN) },
# door.move(double) -> move to arbitrary position # door.move(double) -> move to arbitrary position
move : func { move : func(target) {
time = abs(me.getpos() - arg[0]) * me.swingtime; var pos = me.getpos();
interpolate(me.positionN, arg[0], time); if (pos != target) {
var time = abs(pos - target) * me.swingtime;
interpolate(me.positionN, target, time);
}
me.target = !me.target; me.target = !me.target;
}, },
}; };
@ -514,6 +522,7 @@ var timer = {
me.running = 0; me.running = 0;
me.loopid += 1; me.loopid += 1;
me._apply_(); me._apply_();
me;
}, },
reset : func { reset : func {
me.node.setDoubleValue(0); me.node.setDoubleValue(0);