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 2010-10-04 16:01:35 +02:00
commit 944c65fb22
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Aircraft/Generic/WalkView/walkview.nas
View file

@ -362,7 +362,7 @@ var TO_DEG = 180/math.pi;
var walkers = {};
var closerXY = func (pos, p1, p2) {
l1 = [p1[0] - pos[0], p1[1] - pos[1]];
l2 = [p2[0] - pos[0], p2[1] - pos[1]];
var l1 = [p1[0] - pos[0], p1[1] - pos[1]];
var l2 = [p2[0] - pos[0], p2[1] - pos[1]];
return (l1[0]*l1[0] + l1[1]*l1[1]) - (l2[0]*l2[0] + l2[1]*l2[1]);
}

37
Nasal/mp_broadcast.nas
View file

@ -45,24 +45,25 @@ BroadcastChannel.new = func (mpp_path, process,
accept_predicate = nil,
on_disconnect = nil,
enable_send=1) {
obj = { parents : [BroadcastChannel],
mpp_path : mpp_path,
send_node : enable_send ? props.globals.getNode(mpp_path, 1)
: nil,
process_msg : process,
send_to_self : send_to_self,
accept_predicate : (accept_predicate != nil) ? accept_predicate :
func (p) { return 1; },
on_disconnect : (on_disconnect != nil) ? on_disconnect :
func (p) { return; },
# Internal state.
send_buf : [],
peers : {},
loopid : 0,
PERIOD : 1.3,
last_time : 0.0, # For join handling.
last_send : 0.0, # For the send queue
SEND_TIME : 0.5 };
var obj = { parents : [BroadcastChannel],
mpp_path : mpp_path,
send_node : enable_send ? props.globals.getNode(mpp_path, 1)
: nil,
process_msg : process,
send_to_self : send_to_self,
accept_predicate :
(accept_predicate != nil) ? accept_predicate
: func (p) { return 1; },
on_disconnect : (on_disconnect != nil) ? on_disconnect
: func (p) { return; },
# Internal state.
send_buf : [],
peers : {},
loopid : 0,
PERIOD : 1.3,
last_time : 0.0, # For join handling.
last_send : 0.0, # For the send queue
SEND_TIME : 0.5 };
if (enable_send and (obj.send_node == nil)) {
printlog("warn",
"BroadcastChannel invalid send node.");