#include <boost/foreach.hpp>
#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/tuple/tuple.hpp> // for boost::tie
#include <simgear/sg_inlines.h>
#include <simgear/scene/material/mat.hxx>
#include <simgear/bucket/newbucket.hxx>
#include <Airports/runways.hxx>
-#include <Airports/simple.hxx>
+#include <Airports/airport.hxx>
#include <Airports/dynamics.hxx>
#include <Airports/parking.hxx>
#include <Scripting/NasalSys.hxx>
#include <Navaids/routePath.hxx>
#include <Navaids/procedure.hxx>
#include <Navaids/airways.hxx>
+#include <Navaids/NavDataCache.hxx>
using namespace flightgear;
static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef* out);
naGhostType RunwayGhostType = { positionedGhostDestroy, "runway", runwayGhostGetMember, 0 };
+naGhostType HelipadGhostType = { positionedGhostDestroy, "helipad", runwayGhostGetMember, 0 };
+naGhostType TaxiwayGhostType = { positionedGhostDestroy, "taxiway", runwayGhostGetMember, 0 };
static const char* fixGhostGetMember(naContext c, void* g, naRef field, naRef* out);
naGhostType FixGhostType = { positionedGhostDestroy, "fix", fixGhostGetMember, 0 };
return 0;
}
+static FGTaxiway* taxiwayGhost(naRef r)
+{
+ if (naGhost_type(r) == &TaxiwayGhostType)
+ return (FGTaxiway*) naGhost_ptr(r);
+ return 0;
+}
+
static FGFix* fixGhost(naRef r)
{
if (naGhost_type(r) == &FixGhostType)
return naNewGhost2(c, &RunwayGhostType, (void*) r);
}
+naRef ghostForHelipad(naContext c, const FGHelipad* r)
+{
+ if (!r) {
+ return naNil();
+ }
+
+ FGPositioned::get(r); // take a ref
+ return naNewGhost2(c, &HelipadGhostType, (void*) r);
+}
+
+naRef ghostForTaxiway(naContext c, const FGTaxiway* r)
+{
+ if (!r) {
+ return naNil();
+ }
+
+ FGPositioned::get(r); // take a ref
+ return naNewGhost2(c, &TaxiwayGhostType, (void*) r);
+}
+
naRef ghostForFix(naContext c, const FGFix* r)
{
if (!r) {
if (!wpt) {
return naNil();
}
-
+
Waypt::get(wpt); // take a ref
return naNewGhost2(c, &WayptGhostType, (void*) wpt);
}
double minLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft");
for(unsigned int r=0; r<apt->numRunways(); ++r) {
FGRunway* rwy(apt->getRunwayByIndex(r));
-
- // ignore unusably short runways
+ // ignore unusably short runways
if (rwy->lengthFt() < minLengthFt) {
continue;
}
-
naRef rwyid = stringToNasal(c, rwy->ident());
naRef rwydata = ghostForRunway(c, rwy);
naHash_set(*out, rwyid, rwydata);
}
+ } else if (!strcmp(fieldName, "helipads")) {
+ *out = naNewHash(c);
+
+ for(unsigned int r=0; r<apt->numHelipads(); ++r) {
+ FGHelipad* hp(apt->getHelipadByIndex(r));
+
+ naRef rwyid = stringToNasal(c, hp->ident());
+ naRef rwydata = ghostForHelipad(c, hp);
+ naHash_set(*out, rwyid, rwydata);
+ }
+
+ } else if (!strcmp(fieldName, "taxiways")) {
+ *out = naNewVector(c);
+ for(unsigned int r=0; r<apt->numTaxiways(); ++r) {
+ FGTaxiway* taxi(apt->getTaxiwayByIndex(r));
+ naRef taxidata = ghostForTaxiway(c, taxi);
+ naVec_append(*out, taxidata);
+ }
} else {
return 0;
static const char* waypointCommonGetMember(naContext c, Waypt* wpt, const char* fieldName, naRef* out)
{
- if (!strcmp(fieldName, "wp_name")) *out = stringToNasal(c, wpt->ident());
+ if (!strcmp(fieldName, "wp_name") || !strcmp(fieldName, "id")) *out = stringToNasal(c, wpt->ident());
else if (!strcmp(fieldName, "wp_type")) *out = stringToNasal(c, wpt->type());
else if (!strcmp(fieldName, "wp_role")) *out = wayptFlagToNasal(c, wpt->flags());
- else if (!strcmp(fieldName, "wp_lat")) *out = naNum(wpt->position().getLatitudeDeg());
- else if (!strcmp(fieldName, "wp_lon")) *out = naNum(wpt->position().getLongitudeDeg());
+ else if (!strcmp(fieldName, "wp_lat") || !strcmp(fieldName, "lat")) *out = naNum(wpt->position().getLatitudeDeg());
+ else if (!strcmp(fieldName, "wp_lon") || !strcmp(fieldName, "lon")) *out = naNum(wpt->position().getLongitudeDeg());
else if (!strcmp(fieldName, "wp_parent_name")) {
Procedure* proc = dynamic_cast<Procedure*>(wpt->owner());
*out = proc ? stringToNasal(c, proc->ident()) : naNil();
static RouteRestriction routeRestrictionFromString(const char* s)
{
- string u(s);
+ std::string u(s);
boost::to_lower(u);
if (u == "computed") return RESTRICT_COMPUTED;
if (u == "at") return RESTRICT_AT;
if (!strcmp(fieldName, "parents")) {
*out = naNewVector(c);
naVec_append(*out, fpLegPrototype);
+ naVec_append(*out, waypointPrototype);
} else if (!strcmp(fieldName, "index")) {
*out = naNum(leg->index());
} else if (!strcmp(fieldName, "alt_cstr")) {
return;
}
+ if (naIsNil(value)) {
+ fp->setDeparture(static_cast<FGAirport*>(NULL));
+ return;
+ }
+
naRuntimeError(c, "bad argument type setting departure");
} else if (!strcmp(fieldName, "destination")) {
FGAirport* apt = airportGhost(value);
return;
}
- naRuntimeError(c, "bad argument type setting departure");
+ naRuntimeError(c, "bad argument type setting departure runway");
} else if (!strcmp(fieldName, "destination_runway")) {
FGRunway* rwy = runwayGhost(value);
if (rwy){
return;
}
- naRuntimeError(c, "bad argument type setting departure");
+ naRuntimeError(c, "bad argument type setting destination runway");
} else if (!strcmp(fieldName, "sid")) {
Procedure* proc = procedureGhost(value);
if (proc && (proc->type() == PROCEDURE_SID)) {
ArrivalDeparture* ad = static_cast<ArrivalDeparture*>(proc);
*out = naNewVector(c);
- BOOST_FOREACH(string id, ad->transitionIdents()) {
+ BOOST_FOREACH(std::string id, ad->transitionIdents()) {
naVec_append(*out, stringToNasal(c, id));
}
} else {
static const char* runwayGhostGetMember(naContext c, void* g, naRef field, naRef* out)
{
const char* fieldName = naStr_data(field);
- FGRunway* rwy = (FGRunway*) g;
-
- if (!strcmp(fieldName, "id")) *out = stringToNasal(c, rwy->ident());
- else if (!strcmp(fieldName, "lat")) *out = naNum(rwy->latitude());
- else if (!strcmp(fieldName, "lon")) *out = naNum(rwy->longitude());
- else if (!strcmp(fieldName, "heading")) *out = naNum(rwy->headingDeg());
- else if (!strcmp(fieldName, "length")) *out = naNum(rwy->lengthM());
- else if (!strcmp(fieldName, "width")) *out = naNum(rwy->widthM());
- else if (!strcmp(fieldName, "threshold")) *out = naNum(rwy->displacedThresholdM());
- else if (!strcmp(fieldName, "stopway")) *out = naNum(rwy->stopwayM());
- else if (!strcmp(fieldName, "ils_frequency_mhz")) {
- *out = rwy->ILS() ? naNum(rwy->ILS()->get_freq() / 100.0) : naNil();
- } else if (!strcmp(fieldName, "ils")) {
- *out = ghostForNavaid(c, rwy->ILS());
+ FGRunwayBase* base = (FGRunwayBase*) g;
+
+ if (!strcmp(fieldName, "id")) *out = stringToNasal(c, base->ident());
+ else if (!strcmp(fieldName, "lat")) *out = naNum(base->latitude());
+ else if (!strcmp(fieldName, "lon")) *out = naNum(base->longitude());
+ else if (!strcmp(fieldName, "heading")) *out = naNum(base->headingDeg());
+ else if (!strcmp(fieldName, "length")) *out = naNum(base->lengthM());
+ else if (!strcmp(fieldName, "width")) *out = naNum(base->widthM());
+ else if (!strcmp(fieldName, "surface")) *out = naNum(base->surface());
+ else if (base->type() == FGRunwayBase::RUNWAY) {
+ FGRunway* rwy = (FGRunway*) g;
+ if (!strcmp(fieldName, "threshold")) *out = naNum(rwy->displacedThresholdM());
+ else if (!strcmp(fieldName, "stopway")) *out = naNum(rwy->stopwayM());
+ else if (!strcmp(fieldName, "reciprocal")) {
+ *out = ghostForRunway(c, rwy->reciprocalRunway());
+ } else if (!strcmp(fieldName, "ils_frequency_mhz")) {
+ *out = rwy->ILS() ? naNum(rwy->ILS()->get_freq() / 100.0) : naNil();
+ } else if (!strcmp(fieldName, "ils")) {
+ *out = ghostForNavaid(c, rwy->ILS());
+ } else {
+ return 0;
+ }
} else {
- return 0;
+ return 0;
}
return "";
return false;
}
- return naEqual(naVec_get(parents, 0), geoCoordClass);
+ return naEqual(naVec_get(parents, 0), geoCoordClass) != 0;
}
bool geodFromHash(naRef ref, SGGeod& result)
return 1;
}
+ if (gt == &TaxiwayGhostType) {
+ result = taxiwayGhost(args[offset])->geod();
+ return 1;
+ }
+
if (gt == &FixGhostType) {
result = fixGhost(args[offset])->geod();
return 1;
}
-class AirportInfoFilter : public FGAirport::AirportFilter
-{
-public:
- AirportInfoFilter() : type(FGPositioned::AIRPORT) {
- minRunwayLengthFt = fgGetDouble("/sim/navdb/min-runway-length-ft", 0.0);
- }
-
- bool fromArg(naRef arg)
- {
- const char *s = naStr_data(arg);
- if(!strcmp(s, "airport")) type = FGPositioned::AIRPORT;
- else if(!strcmp(s, "seaport")) type = FGPositioned::SEAPORT;
- else if(!strcmp(s, "heliport")) type = FGPositioned::HELIPORT;
- else
- return false;
-
- return true;
- }
-
- virtual FGPositioned::Type minType() const {
- return type;
- }
-
- virtual FGPositioned::Type maxType() const {
- return type;
- }
-
- virtual bool pass(FGPositioned* aPos) const
- {
- FGAirport* apt = (FGAirport*) aPos;
- if ((apt->type() == FGPositioned::AIRPORT) &&
- !apt->hasHardRunwayOfLengthFt(minRunwayLengthFt))
- {
- return false;
- }
-
- return true;
- }
-
- FGPositioned::Type type;
- double minRunwayLengthFt;
-};
-
// Returns data hash for particular or nearest airport of a <type>, or nil
// on error.
//
double maxRange = 10000.0; // expose this? or pick a smaller value?
- AirportInfoFilter filter; // defaults to airports only
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
if(argc == 0) {
// fall through and use AIRPORT
} else if(argc == 1 && naIsString(args[0])) {
- if (filter.fromArg(args[0])) {
+ if (filter.fromTypeString(naStr_data(args[0]))) {
// done!
} else {
// user provided an <id>, hopefully
naRuntimeError(c, "findAirportsWithinRange expected range (in nm) as arg %d", argOffset);
}
- AirportInfoFilter filter; // defaults to airports only
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
double rangeNm = args[argOffset++].num;
if (argOffset < argc) {
- filter.fromArg(args[argOffset++]);
+ filter.fromTypeString(naStr_data(args[argOffset++]));
}
naRef r = naNewVector(c);
- FGPositioned::List apts = FGPositioned::findWithinRange(pos, rangeNm, &filter);
+ FGPositionedList apts = FGPositioned::findWithinRange(pos, rangeNm, &filter);
FGPositioned::sortByRange(apts, pos);
BOOST_FOREACH(FGPositionedRef a, apts) {
}
int argOffset = 0;
- string prefix(naStr_data(args[argOffset++]));
- AirportInfoFilter filter; // defaults to airports only
+ std::string prefix(naStr_data(args[argOffset++]));
+ FGAirport::TypeRunwayFilter filter; // defaults to airports only
if (argOffset < argc) {
- filter.fromArg(args[argOffset++]);
+ filter.fromTypeString(naStr_data(args[argOffset++]));
}
naRef r = naNewVector(c);
- FGPositioned::List apts = FGPositioned::findAllWithIdent(prefix, &filter, false);
+ FGPositionedList apts = FGPositioned::findAllWithIdent(prefix, &filter, false);
BOOST_FOREACH(FGPositionedRef a, apts) {
FGAirport* apt = (FGAirport*) a.get();
naRef comms = naNewVector(c);
// if we have an explicit type, return a simple vector of frequencies
- if (argc > 0 && naIsScalar(args[0])) {
+ if (argc > 0 && !naIsString(args[0])) {
+ naRuntimeError(c, "airport.comms argument must be a frequency type name");
+ }
+
+ if (argc > 0) {
std::string commName = naStr_data(args[0]);
FGPositioned::Type commType = FGPositioned::typeFromName(commName);
if (!apt) {
naRuntimeError(c, "airport.runway called on non-airport object");
}
-
+
if ((argc < 1) || !naIsString(args[0])) {
naRuntimeError(c, "airport.runway expects a runway ident argument");
}
-
+
std::string ident(naStr_data(args[0]));
boost::to_upper(ident);
- if (!apt->hasRunwayWithIdent(ident)) {
- return naNil();
+
+ if (apt->hasRunwayWithIdent(ident)) {
+ return ghostForRunway(c, apt->getRunwayByIdent(ident));
+ } else if (apt->hasHelipadWithIdent(ident)) {
+ return ghostForHelipad(c, apt->getHelipadByIdent(ident));
}
-
- return ghostForRunway(c, apt->getRunwayByIdent(ident));
+ return naNil();
+}
+
+static naRef f_airport_runwaysWithoutReciprocals(naContext c, naRef me, int argc, naRef* args)
+{
+ FGAirport* apt = airportGhost(me);
+ if (!apt) {
+ naRuntimeError(c, "airport.runwaysWithoutReciprocals called on non-airport object");
+ }
+
+ FGRunwayList rwylist(apt->getRunwaysWithoutReciprocals());
+ naRef runways = naNewVector(c);
+ for (unsigned int r=0; r<rwylist.size(); ++r) {
+ FGRunway* rwy(rwylist[r]);
+ naVec_append(runways, ghostForRunway(c, apt->getRunwayByIdent(rwy->ident())));
+ }
+ return runways;
}
static naRef f_airport_sids(naContext c, naRef me, int argc, naRef* args)
}
FGAirportDynamics* dynamics = apt->getDynamics();
- for (int i=0; i<dynamics->getNrOfParkings(); ++i) {
- FGParking* park = dynamics->getParking(i);
- // filter out based on availability and type
- if (onlyAvailable && !park->isAvailable()) {
+ PositionedIDVec parkings = flightgear::NavDataCache::instance()->airportItemsOfType(apt->guid(),
+ FGPositioned::PARKING);
+
+ BOOST_FOREACH(PositionedID parking, parkings) {
+ // filter out based on availability and type
+ if (onlyAvailable && !dynamics->isParkingAvailable(parking)) {
continue;
}
+ FGParking* park = dynamics->getParking(parking);
if (!type.empty() && (park->getType() != type)) {
continue;
}
- const SGGeod& parkLoc = park->getGeod();
+ const SGGeod& parkLoc = park->geod();
naRef ph = naNewHash(c);
hashset(c, ph, "name", stringToNasal(c, park->getName()));
hashset(c, ph, "lat", naNum(parkLoc.getLatitudeDeg()));
naRuntimeError(c, "airport.getSid passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findSIDWithIdent(ident));
}
naRuntimeError(c, "airport.getStar passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findSTARWithIdent(ident));
}
naRuntimeError(c, "airport.getIAP passed invalid argument");
}
- string ident = naStr_data(args[0]);
+ std::string ident = naStr_data(args[0]);
return ghostForProcedure(c, apt->findApproachWithIdent(ident));
}
+static naRef f_airport_findBestRunway(naContext c, naRef me, int argc, naRef* args)
+{
+ FGAirport* apt = airportGhost(me);
+ if (!apt) {
+ naRuntimeError(c, "findBestRunway called on non-airport object");
+ }
+
+ SGGeod pos;
+ if (!geodFromArgs(args, 0, argc, pos)) {
+ naRuntimeError(c, "findBestRunway must be passed a position");
+ }
+
+ return ghostForRunway(c, apt->findBestRunwayForPos(pos));
+}
+
static naRef f_airport_toString(naContext c, naRef me, int argc, naRef* args)
{
FGAirport* apt = airportGhost(me);
naRef r = naNewVector(c);
FGNavList::TypeFilter filter(type);
- FGPositioned::List navs = FGPositioned::findWithinRange(pos, rangeNm, &filter);
+ FGPositionedList navs = FGPositioned::findWithinRange(pos, rangeNm, &filter);
FGPositioned::sortByRange(navs, pos);
BOOST_FOREACH(FGPositionedRef a, navs) {
}
FGPositioned::Type type = FGPositioned::INVALID;
- string ident = naStr_data(args[argOffset++]);
+ std::string ident = naStr_data(args[argOffset++]);
if (argOffset < argc) {
type = FGPositioned::typeFromName(naStr_data(args[argOffset]));
}
naRuntimeError(c, "findFixesByIdent expectes ident string as arg %d", argOffset);
}
- string ident(naStr_data(args[argOffset]));
+ std::string ident(naStr_data(args[argOffset]));
naRef r = naNewVector(c);
FGPositioned::TypeFilter filter(FGPositioned::FIX);
- FGPositioned::List fixes = FGPositioned::findAllWithIdent(ident, &filter);
+ FGPositionedList fixes = FGPositioned::findAllWithIdent(ident, &filter);
FGPositioned::sortByRange(fixes, pos);
BOOST_FOREACH(FGPositionedRef f, fixes) {
_plan(fp),
_instance(ins)
{
- SG_LOG(SG_NASAL, SG_INFO, "created Nasal delegate for " << fp);
_gcSaveKey = _nasal->gcSave(ins);
}
virtual ~NasalFPDelegate()
{
- SG_LOG(SG_NASAL, SG_INFO, "destroying Nasal delegate for " << _plan);
_nasal->gcRelease(_gcSaveKey);
}
{
callDelegateMethod("currentWaypointChanged");
}
+
+ virtual void cleared()
+ {
+ callDelegateMethod("cleared");
+ }
+
+ virtual void endOfFlightPlan()
+ {
+ callDelegateMethod("endOfFlightPlan");
+ }
private:
void callDelegateMethod(const char* method)
{
naRef f;
- naMember_cget(_nasal->context(), _instance, method, &f);
- if (naIsNil(f)) {
+ if (naMember_cget(_nasal->context(), _instance, method, &f) == 0) {
return; // no method on the delegate
}
naRuntimeError(c, "createWP: no identifier supplied");
}
- string ident = naStr_data(args[argOffset++]);
+ std::string ident = naStr_data(args[argOffset++]);
WayptRef wpt = new BasicWaypt(pos, ident, NULL);
// set waypt flags - approach, departure, pseudo, etc
if (argc > argOffset) {
WayptFlag f = wayptFlagFromString(naStr_data(args[argOffset++]));
+ if (f == 0) {
+ naRuntimeError(c, "createWP: bad waypoint role");
+ }
+
wpt->setFlag(f);
}
// set waypt flags - approach, departure, pseudo, etc
if (argc > 1) {
WayptFlag f = wayptFlagFromString(naStr_data(args[1]));
+ if (f == 0) {
+ naRuntimeError(c, "createWPFrom: bad waypoint role");
+ }
wpt->setFlag(f);
}
}
WayptFlag flag = wayptFlagFromString(naStr_data(args[0]));
+ if (flag == 0) {
+ naRuntimeError(c, "clearWPType: bad waypoint role");
+ }
+
fp->clearWayptsWithFlag(flag);
return naNil();
}
return ghostForFlightPlan(c, fp->clone());
}
+static naRef f_flightplan_pathGeod(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.clone called on non-flightplan object");
+ }
+
+ if ((argc < 1) || !naIsNum(args[0])) {
+ naRuntimeError(c, "bad argument to flightplan.pathGeod");
+ }
+
+ if ((argc > 1) && !naIsNum(args[1])) {
+ naRuntimeError(c, "bad argument to flightplan.pathGeod");
+ }
+
+ int index = (int) args[0].num;
+ double offset = (argc > 1) ? args[1].num : 0.0;
+ naRef result = naNewHash(c);
+ SGGeod g = fp->pointAlongRoute(index, offset);
+ hashset(c, result, "lat", naNum(g.getLatitudeDeg()));
+ hashset(c, result, "lon", naNum(g.getLongitudeDeg()));
+ return result;
+}
+
+static naRef f_flightplan_finish(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan* fp = flightplanGhost(me);
+ if (!fp) {
+ naRuntimeError(c, "flightplan.finish called on non-flightplan object");
+ }
+
+ fp->finish();
+ return naNil();
+}
+
static naRef f_leg_setSpeed(naContext c, naRef me, int argc, naRef* args)
{
FlightPlan::Leg* leg = fpLegGhost(me);
return result;
}
+static naRef f_leg_courseAndDistanceFrom(naContext c, naRef me, int argc, naRef* args)
+{
+ FlightPlan::Leg* leg = fpLegGhost(me);
+ if (!leg) {
+ naRuntimeError(c, "leg.courseAndDistanceFrom called on non-flightplan-leg object");
+ }
+
+ SGGeod pos;
+ geodFromArgs(args, 0, argc, pos);
+
+ double courseDeg;
+ double distanceM;
+ boost::tie(courseDeg, distanceM) = leg->waypoint()->courseAndDistanceFrom(pos);
+
+ naRef result = naNewVector(c);
+ naVec_append(result, naNum(courseDeg));
+ naVec_append(result, naNum(distanceM * SG_METER_TO_NM));
+ return result;
+}
+
static naRef f_waypoint_navaid(naContext c, naRef me, int argc, naRef* args)
{
flightgear::Waypt* w = wayptGhost(me);
};
-naRef initNasalPositioned(naRef globals, naContext c, naRef gcSave)
+naRef initNasalPositioned(naRef globals, naContext c)
{
airportPrototype = naNewHash(c);
- hashset(c, gcSave, "airportProto", airportPrototype);
+ naSave(c, airportPrototype);
hashset(c, airportPrototype, "runway", naNewFunc(c, naNewCCode(c, f_airport_runway)));
+ hashset(c, airportPrototype, "runwaysWithoutReciprocals", naNewFunc(c, naNewCCode(c, f_airport_runwaysWithoutReciprocals)));
+ hashset(c, airportPrototype, "helipad", naNewFunc(c, naNewCCode(c, f_airport_runway)));
hashset(c, airportPrototype, "tower", naNewFunc(c, naNewCCode(c, f_airport_tower)));
hashset(c, airportPrototype, "comms", naNewFunc(c, naNewCCode(c, f_airport_comms)));
hashset(c, airportPrototype, "sids", naNewFunc(c, naNewCCode(c, f_airport_sids)));
hashset(c, airportPrototype, "getSid", naNewFunc(c, naNewCCode(c, f_airport_getSid)));
hashset(c, airportPrototype, "getStar", naNewFunc(c, naNewCCode(c, f_airport_getStar)));
hashset(c, airportPrototype, "getIAP", naNewFunc(c, naNewCCode(c, f_airport_getApproach)));
+ hashset(c, airportPrototype, "findBestRunwayForPos", naNewFunc(c, naNewCCode(c, f_airport_findBestRunway)));
hashset(c, airportPrototype, "tostring", naNewFunc(c, naNewCCode(c, f_airport_toString)));
flightplanPrototype = naNewHash(c);
- hashset(c, gcSave, "flightplanProto", flightplanPrototype);
+ naSave(c, flightplanPrototype);
hashset(c, flightplanPrototype, "getWP", naNewFunc(c, naNewCCode(c, f_flightplan_getWP)));
hashset(c, flightplanPrototype, "currentWP", naNewFunc(c, naNewCCode(c, f_flightplan_currentWP)));
hashset(c, flightplanPrototype, "cleanPlan", naNewFunc(c, naNewCCode(c, f_flightplan_clearPlan)));
hashset(c, flightplanPrototype, "clearWPType", naNewFunc(c, naNewCCode(c, f_flightplan_clearWPType)));
hashset(c, flightplanPrototype, "clone", naNewFunc(c, naNewCCode(c, f_flightplan_clone)));
-
+ hashset(c, flightplanPrototype, "pathGeod", naNewFunc(c, naNewCCode(c, f_flightplan_pathGeod)));
+ hashset(c, flightplanPrototype, "finish", naNewFunc(c, naNewCCode(c, f_flightplan_finish)));
+
waypointPrototype = naNewHash(c);
- hashset(c, gcSave, "wayptProto", waypointPrototype);
+ naSave(c, waypointPrototype);
hashset(c, waypointPrototype, "navaid", naNewFunc(c, naNewCCode(c, f_waypoint_navaid)));
hashset(c, waypointPrototype, "runway", naNewFunc(c, naNewCCode(c, f_waypoint_runway)));
hashset(c, waypointPrototype, "airport", naNewFunc(c, naNewCCode(c, f_waypoint_airport)));
procedurePrototype = naNewHash(c);
- hashset(c, gcSave, "procedureProto", procedurePrototype);
+ naSave(c, procedurePrototype);
hashset(c, procedurePrototype, "transition", naNewFunc(c, naNewCCode(c, f_procedure_transition)));
hashset(c, procedurePrototype, "route", naNewFunc(c, naNewCCode(c, f_procedure_route)));
fpLegPrototype = naNewHash(c);
- hashset(c, gcSave, "fpLegProto", fpLegPrototype);
+ naSave(c, fpLegPrototype);
hashset(c, fpLegPrototype, "setSpeed", naNewFunc(c, naNewCCode(c, f_leg_setSpeed)));
hashset(c, fpLegPrototype, "setAltitude", naNewFunc(c, naNewCCode(c, f_leg_setAltitude)));
hashset(c, fpLegPrototype, "path", naNewFunc(c, naNewCCode(c, f_leg_path)));
+ hashset(c, fpLegPrototype, "courseAndDistanceFrom", naNewFunc(c, naNewCCode(c, f_leg_courseAndDistanceFrom)));
for(int i=0; funcs[i].name; i++) {
hashset(c, globals, funcs[i].name,
projects / flightgear.git / blobdiff