#ifndef __NASALSYS_HXX
#define __NASALSYS_HXX
-#include <simgear/misc/sg_path.hxx>
-#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/math/SGMath.hxx> // keep before any cppbind include to enable
+ // SGVec2<T> conversion.
#include <simgear/misc/sg_dir.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/nasal/cppbind/NasalHash.hxx>
#include <simgear/nasal/nasal.h>
-#include <simgear/threads/SGQueue.hxx>
#include <simgear/props/props.hxx>
+#include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/threads/SGQueue.hxx>
// Required only for MSVC
#ifdef _MSC_VER
class FGNasalListener;
class SGCondition;
class FGNasalModelData;
+class NasalCommand;
+class FGNasalModuleListener;
namespace simgear { class BufferedLogCallback; }
SGPropertyNode* ghostToPropNode(naRef ref);
-SGCondition* conditionGhost(naRef r);
class FGNasalSys : public SGSubsystem
{
FGNasalSys();
virtual ~FGNasalSys();
virtual void init();
+ virtual void shutdown();
+
virtual void update(double dt);
// Loads a nasal script from an external file and inserts it as a
void deleteModule(const char* moduleName);
+ void addCommand(naRef func, const std::string& name);
+ void removeCommand(const std::string& name);
+
/**
* Set member of specified hash to given value
*/
void globalsSet(const char* key, naRef val);
naRef call(naRef code, int argc, naRef* args, naRef locals);
+ naRef callWithContext(naContext ctx, naRef code, int argc, naRef* args, naRef locals);
naRef callMethod(naRef code, naRef self, int argc, naRef* args, naRef locals);
+ naRef callMethodWithContext(naContext ctx, naRef code, naRef self, int argc, naRef* args, naRef locals);
naRef propNodeGhost(SGPropertyNode* handle);
// can't call this 'globals' due to naming clash
naRef nasalGlobals() const
{ return _globals; }
-
- naContext context() const
- { return _context; }
+
+ nasal::Hash getGlobals() const
+ { return nasal::Hash(_globals, _context); }
// This mechanism is here to allow naRefs to be passed to
// locations "outside" the interpreter. Normally, such a
// when done.
int gcSave(naRef r);
void gcRelease(int key);
-
+
+ /**
+ * Check if IOrules correctly work to limit access from Nasal scripts to the
+ * file system.
+ *
+ * @note Just a simple test is performed to check if access to a path is
+ * possible which should never be possible (The actual path refers to
+ * a file/folder named 'do-not-access' in the file system root).
+ *
+ * @see http://wiki.flightgear.org/IOrules
+ *
+ * @return Whether the check was successful.
+ */
+ bool checkIOrules();
+
/// retrive the associated log object, for displaying log
/// output somewhere (a UI, presumably)
simgear::BufferedLogCallback* log() const
SGLockedQueue<SGSharedPtr<FGNasalModelData> > _loadList;
SGLockedQueue<SGSharedPtr<FGNasalModelData> > _unloadList;
+ // Delay removing items of the _loadList to ensure the are already attached
+ // to the scene graph (eg. enables to retrieve world position in load
+ // callback).
+ bool _delay_load;
+
//
// FGTimer subclass for handling Nasal timer callbacks.
// See the implementation of the settimer() extension function for
std::map<int, FGNasalListener *> _listener;
std::vector<FGNasalListener *> _dead_listener;
+ std::vector<FGNasalModuleListener*> _moduleListeners;
+
static int _listenerId;
void loadPropertyScripts();
void loadPropertyScripts(SGPropertyNode* n);
void loadScriptDirectory(simgear::Dir nasalDir);
void addModule(std::string moduleName, simgear::PathList scripts);
- void logError(naContext);
- naRef parse(const char* filename, const char* buf, int len);
+ static void logError(naContext);
+ naRef parse(naContext ctx, const char* filename, const char* buf, int len);
naRef genPropsModule();
+ bool _inited;
naContext _context;
naRef _globals,
_string;
SGPropertyNode_ptr _cmdArg;
- int _nextGCKey;
- naRef _gcHash;
- int _callCount;
-
simgear::BufferedLogCallback* _log;
+
+ typedef std::map<std::string, NasalCommand*> NasalCommandDict;
+ NasalCommandDict _commands;
+
+ naRef _wrappedNodeFunc;
public:
void handleTimer(NasalTimer* t);
};