fly/fgdata
1
0
Fork 0
Code Activity

Revert "add Model movement"

Browse source 
This reverts commit 7b8be5146ed2225828525a51a6167232a33e16b0.

Too soon!

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza 2012-05-28 10:59:35 +01:00
parent ddef6248be
commit ce77e04690
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Nasal/geo.nas
View file

@ -67,7 +67,7 @@
# #
# geo.normdeg(<angle>) ... returns angle normalized to 0 <= angle < 360 # geo.normdeg(<angle>) ... returns angle normalized to 0 <= angle < 360
# #
# geo.put_model(<path>, <lat>, <lon> [, <elev:nil> [, <hdg:0> [, <pitch:0> [, <roll:0>[, <speed>]]]]]); # geo.put_model(<path>, <lat>, <lon> [, <elev:nil> [, <hdg:0> [, <pitch:0> [, <roll:0>]]]]);
# ... put model <path> at location <lat>/<lon> with given elevation # ... put model <path> at location <lat>/<lon> with given elevation
# (optional, default: surface). <hdg>/<pitch>/<roll> are optional # (optional, default: surface). <hdg>/<pitch>/<roll> are optional
# and default to zero. # and default to zero.
@ -260,15 +260,14 @@ var put_model = func(path, c, arg...) {
} }
var _put_model = func(path, lat, lon, elev_m = nil, hdg = 0, pitch = 0, roll = 0, speed = 0, vs=0, hs=0) { var _put_model = func(path, lat, lon, elev_m = nil, hdg = 0, pitch = 0, roll = 0) {
if (elev_m == nil) if (elev_m == nil)
elev_m = elevation(lat, lon); elev_m = elevation(lat, lon);
if (elev_m == nil) if (elev_m == nil)
die("geo.put_model(): cannot get elevation for " ~ lat ~ "/" ~ lon); die("geo.put_model(): cannot get elevation for " ~ lat ~ "/" ~ lon);
fgcommand("add-model", var n = props.Node.new({ "path": path, fgcommand("add-model", var n = props.Node.new({ "path": path,
"latitude-deg": lat, "longitude-deg": lon, "elevation-m": elev_m, "latitude-deg": lat, "longitude-deg": lon, "elevation-m": elev_m,
"heading-deg": hdg, "pitch-deg": pitch, "roll-deg": roll, "speed-kt": speed, "heading-deg": hdg, "pitch-deg": pitch, "roll-deg": roll,
"vertical-fps": vs, "horizontal-fps": hs,
})); }));
return props.globals.getNode(n.getNode("property").getValue()); return props.globals.getNode(n.getNode("property").getValue());
} }