X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalSys.hxx;h=6d64e5097ba66f3ddfd4dd01902178c047bae76d;hb=3209a4db097f3f45836cc1297dcd93964df562b4;hp=d99637719a8863ce3d735890dcdf660f39ec8fa7;hpb=f9bf9fd073325d9abdeb7cdb880aeba489c6eb27;p=flightgear.git

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index d99637719..6d64e5097 100644
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -4,8 +4,15 @@
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/nasal/nasal.h>
+#include <simgear/scene/model/modellib.hxx>
+#include <simgear/xml/easyxml.hxx>
+
+#include <map>
+using std::map;
+
 
 class FGNasalScript;
+class FGNasalListener;
 
 class FGNasalSys : public SGSubsystem
 {
@@ -13,7 +20,7 @@ public:
     FGNasalSys();
     virtual ~FGNasalSys();
     virtual void init();
-    virtual void update(double dt) { /* noop */ }
+    virtual void update(double dt);
 
     // Loads a nasal script from an external file and inserts it as a
     // global module of the specified name.
@@ -34,22 +41,27 @@ public:
     FGNasalScript* parseScript(const char* src, const char* name=0);
 
     // Implementation of the settimer extension function
-    void setTimer(int argc, naRef* args);
+    void setTimer(naContext c, int argc, naRef* args);
 
     // Implementation of the setlistener extension function
-    void setListener(int argc, naRef* args);
+    naRef setListener(naContext c, int argc, naRef* args);
+    naRef removeListener(naContext c, int argc, naRef* args);
 
     // Returns a ghost wrapper for the current _cmdArg
     naRef cmdArgGhost();
-    
+
     // Callbacks for command and timer bindings
     virtual bool handleCommand(const SGPropertyNode* arg);
 
     void createModule(const char* moduleName, const char* fileName,
-                    const char* src, int len);
-		    
-    void screenPrint(const char* src);
-     
+                      const char* src, int len, const SGPropertyNode* cmdarg=0,
+                      int argc=0, naRef*args=0);
+
+    void deleteModule(const char* moduleName);
+
+    naRef call(naRef code, int argc, naRef* args, naRef locals);
+    naRef propNodeGhost(SGPropertyNode* handle);
+
 private:
     friend class FGNasalScript;
     friend class FGNasalListener;
@@ -61,17 +73,22 @@ private:
     //
     struct NasalTimer {
         virtual void timerExpired();
+        virtual ~NasalTimer() {}
         naRef handler;
         int gcKey;
         FGNasalSys* nasal;
     };
 
+    // Listener
+    map<int, FGNasalListener *> _listener;
+    vector<FGNasalListener *> _dead_listener;
+    static int _listenerId;
+
     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
@@ -85,14 +102,16 @@ private:
     naContext _context;
     naRef _globals;
 
-    SGPropertyNode* _cmdArg;
+    SGPropertyNode_ptr _cmdArg;
 
     int _nextGCKey;
     naRef _gcHash;
+    int _callCount;
 
     public: void handleTimer(NasalTimer* t);
 };
 
+
 class FGNasalScript {
 public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
@@ -110,26 +129,67 @@ private:
     FGNasalSys* _nas;
 };
 
+
 class FGNasalListener : public SGPropertyChangeListener {
 public:
-    FGNasalListener(naRef handler, FGNasalSys* nasal)
-            : _handler(handler), _nas(nasal) {}
-
-    void valueChanged(SGPropertyNode* node) {
-        _nas->_cmdArg = node;
-        naContext c = naNewContext();
-        naModUnlock();
-        naCall(c, _handler, 0, 0, naNil(), naNil());
-        naModLock();
-        if(naGetError(c))
-            _nas->logError(c);
-        naFreeContext(c);
-    }
+    FGNasalListener(SGPropertyNode* node, naRef code, FGNasalSys* nasal,
+                    int key, int id, int init, int type);
+
+    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;
-    naRef _handler;
+    SGPropertyNode_ptr _node;
+    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 simgear::SGModelData {
+public:
+    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 _root;
+    SGConstPropertyNode_ptr _unload;
+};
+
+
+class NasalXMLVisitor : public XMLVisitor {
+public:
+    NasalXMLVisitor(naContext c, int argc, naRef* args);
+    virtual ~NasalXMLVisitor() { naFreeContext(_c); }
+
+    virtual void startElement(const char* tag, const XMLAttributes& a);
+    virtual void endElement(const char* tag);
+    virtual void data(const char* str, int len);
+    virtual void pi(const char* target, const char* data);
+
+private:
+    void call(naRef func, int num, naRef a = naNil(), naRef b = naNil());
+    naRef make_string(const char* s, int n = -1);
+
+    naContext _c;
+    naRef _start_element, _end_element, _data, _pi;
 };
 
 #endif // __NASALSYS_HXX