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

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index d99637719..b5b3d00d4 100644
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -3,9 +3,29 @@
 
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
+#include <simgear/misc/sg_dir.hxx>
+#include <simgear/nasal/cppbind/NasalHash.hxx>
 #include <simgear/nasal/nasal.h>
+#include <simgear/threads/SGQueue.hxx>
+#include <simgear/props/props.hxx>
+
+// Required only for MSVC
+#ifdef _MSC_VER
+#   include <Scripting/NasalModelData.hxx>
+#endif
+
+#include <map>
+
 
 class FGNasalScript;
+class FGNasalListener;
+class SGCondition;
+class FGNasalModelData;
+
+namespace simgear { class BufferedLogCallback; }
+
+SGPropertyNode* ghostToPropNode(naRef ref);
+SGCondition* conditionGhost(naRef r);
 
 class FGNasalSys : public SGSubsystem
 {
@@ -13,11 +33,11 @@ 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.
-    void loadModule(SGPath file, const char* moduleName);
+    bool loadModule(SGPath file, const char* moduleName);
 
     // Simple hook to run arbitrary source code.  Returns a bool to
     // indicate successful execution.  Does *not* return any Nasal
@@ -31,28 +51,93 @@ public:
     // this function.  The "name" argument specifies the "file name"
     // for the source code that will be printed in Nasal stack traces
     // on error.
-    FGNasalScript* parseScript(const char* src, const char* name=0);
+ //   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();
+
+    void setCmdArg(SGPropertyNode* aNode);
+    
+    /**
+     * create Nasal props.Node for an SGPropertyNode*
+     * This is the actual ghost, wrapped in a Nasal sugar class.
+     */
+    naRef wrappedPropsNode(SGPropertyNode* aProps);
     
     // Callbacks for command and timer bindings
+    virtual bool handleCommand( const char* moduleName,
+                                const char* fileName,
+                                const char* src,
+                                const SGPropertyNode* arg = 0 );
     virtual bool handleCommand(const SGPropertyNode* arg);
 
-    void createModule(const char* moduleName, const char* fileName,
-                    const char* src, int len);
-		    
-    void screenPrint(const char* src);
-     
+    bool createModule(const char* moduleName, const char* fileName,
+                      const char* src, int len, const SGPropertyNode* cmdarg=0,
+                      int argc=0, naRef*args=0);
+
+    void deleteModule(const char* moduleName);
+
+    /**
+     * Set member of specified hash to given value
+     */
+    void hashset(naRef hash, const char* key, naRef val);
+
+    /**
+     * Set member of globals hash to given value
+     */
+    void globalsSet(const char* key, naRef val);
+
+    naRef call(naRef code, int argc, naRef* args, naRef locals);
+  
+    naRef callMethod(naRef code, naRef self, int argc, naRef* args, naRef locals);
+  
+    naRef propNodeGhost(SGPropertyNode* handle);
+  
+    void registerToLoad(FGNasalModelData* data);
+    void registerToUnload(FGNasalModelData* data);
+
+    // 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
+    // reference would be garbage collected unexpectedly.  By passing
+    // it to gcSave and getting a key/handle, it can be cached in a
+    // globals.__gcsave hash.  Be sure to release it with gcRelease
+    // when done.
+    int gcSave(naRef r);
+    void gcRelease(int key);
+    
+    /// retrive the associated log object, for displaying log
+    /// output somewhere (a UI, presumably)
+    simgear::BufferedLogCallback* log() const
+    { return _log; }
 private:
-    friend class FGNasalScript;
+    //friend class FGNasalScript;
     friend class FGNasalListener;
+    friend class FGNasalModuleListener;
+
+    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.
@@ -61,38 +146,38 @@ private:
     //
     struct NasalTimer {
         virtual void timerExpired();
+        virtual ~NasalTimer() {}
         naRef handler;
         int gcKey;
         FGNasalSys* nasal;
     };
 
+    // Listener
+    std::map<int, FGNasalListener *> _listener;
+    std::vector<FGNasalListener *> _dead_listener;
+    
+    static int _listenerId;
+
     void loadPropertyScripts();
-    void hashset(naRef hash, const char* key, naRef val);
-    void logError(naContext);
+    void loadPropertyScripts(SGPropertyNode* n);
+    void loadScriptDirectory(simgear::Dir nasalDir);
+    void addModule(std::string moduleName, simgear::PathList scripts);
+    static 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
-    // reference would be garbage collected unexpectedly.  By passing
-    // it to gcSave and getting a key/handle, it can be cached in a
-    // globals.__gcsave hash.  Be sure to release it with gcRelease
-    // when done.
-    int gcSave(naRef r);
-    void gcRelease(int key);
 
     naContext _context;
-    naRef _globals;
+    naRef _globals,
+          _string;
 
-    SGPropertyNode* _cmdArg;
+    SGPropertyNode_ptr _cmdArg;
 
-    int _nextGCKey;
-    naRef _gcHash;
-
-    public: void handleTimer(NasalTimer* t);
+    simgear::BufferedLogCallback* _log;
+public:
+    void handleTimer(NasalTimer* t);
 };
 
+#if 0
 class FGNasalScript {
 public:
     ~FGNasalScript() { _nas->gcRelease(_gcKey); }
@@ -102,34 +187,14 @@ public:
         naCall(_nas->_context, _code, 0, &n, naNil(), naNil());
         return naGetError(_nas->_context) == 0;
     }
-
+    
+    FGNasalSys* sys() const { return _nas; }
 private:
     friend class FGNasalSys;
     naRef _code;
     int _gcKey;
     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);
-    }
-
-private:
-    friend class FGNasalSys;
-    naRef _handler;
-    FGNasalSys* _nas;
-};
+#endif
 
 #endif // __NASALSYS_HXX