X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalSys.hxx;h=b5b3d00d4c65b2827ecb923710d040a55f744931;hb=ce09c320d32728dd9c5eb0d6b4ab9f4683242cbc;hp=ec8cf886ee568bdcdefd834fad752805b3caf884;hpb=8a6c95451b5a1b9a3ac0202d8a68a94f179f3c8c;p=flightgear.git diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx index ec8cf886e..b5b3d00d4 100644 --- a/src/Scripting/NasalSys.hxx +++ b/src/Scripting/NasalSys.hxx @@ -3,15 +3,29 @@ #include #include +#include +#include #include -#include +#include +#include + +// Required only for MSVC +#ifdef _MSC_VER +# include +#endif #include -SG_USING_STD(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 { @@ -23,7 +37,7 @@ public: // 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 @@ -37,10 +51,10 @@ 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 naRef setListener(naContext c, int argc, naRef* args); @@ -49,19 +63,81 @@ public: // 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, const SGPropertyNode* arg=0); + 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); - naRef call(naRef code, naRef locals); + /** + * 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 > _loadList; + SGLockedQueue > _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. @@ -77,39 +153,31 @@ private: }; // Listener - map _listener; + std::map _listener; + std::vector _dead_listener; + static int _listenerId; - bool _purgeListeners; 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_ptr _cmdArg; - int _nextGCKey; - naRef _gcHash; - int _callCount; - - public: void handleTimer(NasalTimer* t); + simgear::BufferedLogCallback* _log; +public: + void handleTimer(NasalTimer* t); }; - +#if 0 class FGNasalScript { public: ~FGNasalScript() { _nas->gcRelease(_gcKey); } @@ -119,44 +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(SGPropertyNode_ptr node, naRef handler, - FGNasalSys* nasal, int key); - - ~FGNasalListener(); - void valueChanged(SGPropertyNode* node); - -private: - friend class FGNasalSys; - SGPropertyNode_ptr _node; - naRef _handler; - int _gcKey; - FGNasalSys* _nas; - unsigned int _active; - bool _dead; -}; - - -class FGNasalModelData : public SGModelData { -public: - FGNasalModelData(SGPropertyNode *props = 0) : _props(props), _unload(0) {} - ~FGNasalModelData(); - void modelLoaded(const string& path, SGPropertyNode *prop, osg::Node *); - -private: - string _module; - SGPropertyNode_ptr _props; - SGConstPropertyNode_ptr _unload; -}; +#endif #endif // __NASALSYS_HXX