#include <Main/globals.hxx>
#include <Main/util.hxx>
#include <Main/fg_props.hxx>
-#include <Main/FGInterpolator.hxx>
using std::map;
_sys->gcRelease(_gcSelf);
}
+ bool isRunning() const { return _isRunning; }
+
void stop()
{
if (_isRunning) {
{
naRef *args = NULL;
_sys->callMethod(_func, _self, 0, args, naNil() /* locals */);
+ if (_singleShot) {
+ _isRunning = false;
+ }
}
void setSingleShot(bool aSingleShot)
// value/delta numbers.
static naRef f_interpolate(naContext c, naRef me, int argc, naRef* args)
{
- FGInterpolator* mgr =
- static_cast<FGInterpolator*>
- (
- globals->get_subsystem_mgr()
- ->get_group(SGSubsystemMgr::INIT)
- ->get_subsystem("prop-interpolator")
- );
- if( !mgr )
- {
- SG_LOG(SG_GENERAL, SG_WARN, "No property interpolator available");
- return naNil();
- };
-
SGPropertyNode* node;
naRef prop = argc > 0 ? args[0] : naNil();
if(naIsString(prop)) node = fgGetNode(naStr_data(prop), true);
deltas.push_back(naNumValue(naVec_get(curve, 2*i+1)).num);
}
- mgr->interpolate
- (
- node,
- "numeric",
- value_nodes,
- deltas,
- "linear"
- );
-
+ node->interpolate("numeric", value_nodes, deltas, "linear");
return naNil();
}
return naStr_fromdata(naNewString(c), const_cast<char*>(pdata), strlen(pdata));
}
+static naRef f_findDataDir(naContext c, naRef me, int argc, naRef* args)
+{
+ if(argc != 1 || !naIsString(args[0]))
+ naRuntimeError(c, "bad arguments to findDataDir()");
+
+ SGPath p = globals->find_data_dir(naStr_data(args[0]));
+ const char* pdata = p.c_str();
+ return naStr_fromdata(naNewString(c), const_cast<char*>(pdata), strlen(pdata));
+}
+
class NasalCommand : public SGCommandMgr::Command
{
public:
{ "abort", f_abort },
{ "directory", f_directory },
{ "resolvepath", f_resolveDataPath },
+ { "finddata", f_findDataDir },
{ "parsexml", f_parsexml },
{ "systime", f_systime },
{ 0, 0 }
.method("start", &TimerObj::start)
.method("stop", &TimerObj::stop)
.method("restart", &TimerObj::restart)
- .member("singleShot", &TimerObj::isSingleShot, &TimerObj::setSingleShot);
+ .member("singleShot", &TimerObj::isSingleShot, &TimerObj::setSingleShot)
+ .member("isRunning", &TimerObj::isRunning);
// Now load the various source files in the Nasal directory
simgear::Dir nasalDir(SGPath(globals->get_fg_root(), "Nasal"));
{
static naRef wrapNodeFunc = naNil();
if (naIsNil(wrapNodeFunc)) {
- nasal::Hash g(_globals, _context);
- nasal::Hash props = g.get<nasal::Hash>("props");
+ nasal::Hash props = getGlobals().get<nasal::Hash>("props");
wrapNodeFunc = props.get("wrapNode");
}
if (!_loadList.empty())
{
- // process Nasal load hook (only one per update loop to avoid excessive lags)
- _loadList.pop()->load();
+ if( _delay_load )
+ _delay_load = false;
+ else
+ // process Nasal load hook (only one per update loop to avoid excessive lags)
+ _loadList.pop()->load();
}
else
if (!_unloadList.empty())
// Create module with list of scripts
void FGNasalSys::addModule(string moduleName, simgear::PathList scripts)
{
- if (scripts.size()>0)
+ if (! scripts.empty())
{
SGPropertyNode* nasal = globals->get_props()->getNode("nasal");
SGPropertyNode* module_node = nasal->getChild(moduleName,0,true);
void FGNasalSys::registerToLoad(FGNasalModelData *data)
{
- _loadList.push(data);
+ if( _loadList.empty() )
+ _delay_load = true;
+ _loadList.push(data);
}
void FGNasalSys::registerToUnload(FGNasalModelData *data)
void FGNasalListener::call(SGPropertyNode* which, naRef mode)
{
if(_active || _dead) return;
- SG_LOG(SG_NASAL, SG_DEBUG, "trigger listener #" << _id);
_active++;
naRef arg[4];
arg[0] = _nas->propNodeGhost(which);