FGNasalModelData: use model XML path as module source

[flightgear.git] / src / Scripting / NasalSys.hxx

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index a68317570842fd9fcae58f6b78488c5e701491ce..6d64e5097ba66f3ddfd4dd01902178c047bae76d 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -4,11 +4,11 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/nasal/nasal.h>
-#include <simgear/scene/model/model.hxx>
+#include <simgear/scene/model/modellib.hxx>
 #include <simgear/xml/easyxml.hxx>
 
 #include <map>
-SG_USING_STD(map);
+using std::map;
 
 
 class FGNasalScript;
@@ -54,11 +54,13 @@ public:
     virtual bool handleCommand(const SGPropertyNode* arg);
 
     void createModule(const char* moduleName, const char* fileName,
-                    const char* src, int len, const SGPropertyNode* arg=0);
+                      const char* src, int len, const SGPropertyNode* cmdarg=0,
+                      int argc=0, naRef*args=0);
 
     void deleteModule(const char* moduleName);
 
-    naRef call(naRef code, naRef locals);
+    naRef call(naRef code, int argc, naRef* args, naRef locals);
+    naRef propNodeGhost(SGPropertyNode* handle);
 
 private:
     friend class FGNasalScript;
@@ -79,15 +81,14 @@ private:
 
     // Listener
     map<int, FGNasalListener *> _listener;
+    vector<FGNasalListener *> _dead_listener;
     static int _listenerId;
-    bool _purgeListeners;
 
     void loadPropertyScripts();
     void hashset(naRef hash, const char* key, naRef val);
     void logError(naContext);
     naRef parse(const char* filename, const char* buf, int len);
     naRef genPropsModule();
-    naRef propNodeGhost(SGPropertyNode* handle);
 
     // This mechanism is here to allow naRefs to be passed to
     // locations "outside" the interpreter.  Normally, such a
@@ -131,33 +132,44 @@ private:
 
 class FGNasalListener : public SGPropertyChangeListener {
 public:
-    FGNasalListener(SGPropertyNode_ptr node, naRef handler,
-                    FGNasalSys* nasal, int key, int id);
+    FGNasalListener(SGPropertyNode* node, naRef code, FGNasalSys* nasal,
+                    int key, int id, int init, int type);
 
-    ~FGNasalListener();
-    void valueChanged(SGPropertyNode* node);
+    virtual ~FGNasalListener();
+    virtual void valueChanged(SGPropertyNode* node);
+    virtual void childAdded(SGPropertyNode* parent, SGPropertyNode* child);
+    virtual void childRemoved(SGPropertyNode* parent, SGPropertyNode* child);
 
 private:
+    bool changed(SGPropertyNode* node);
+    void call(SGPropertyNode* which, naRef mode);
+
     friend class FGNasalSys;
     SGPropertyNode_ptr _node;
-    naRef _handler;
+    naRef _code;
     int _gcKey;
     int _id;
     FGNasalSys* _nas;
+    int _init;
+    int _type;
     unsigned int _active;
     bool _dead;
+    long _last_int;
+    double _last_float;
+    string _last_string;
 };
 
 
-class FGNasalModelData : public SGModelData {
+class FGNasalModelData : public simgear::SGModelData {
 public:
-    FGNasalModelData(SGPropertyNode *props = 0) : _props(props), _unload(0) {}
+    FGNasalModelData(SGPropertyNode *root = 0) : _root(root), _unload(0) {}
     ~FGNasalModelData();
     void modelLoaded(const string& path, SGPropertyNode *prop, osg::Node *);
 
 private:
+    static unsigned int _module_id;
     string _module;
-    SGPropertyNode_ptr _props;
+    SGPropertyNode_ptr _root;
     SGConstPropertyNode_ptr _unload;
 };