FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for passing parameters in and out of scripts.

Browse Source 
Implemented support for osg::ValueObject in LuaScriptEngine.
This commit is contained in:
Robert Osfield
2013-09-24 15:17:42 +00:00
parent 796314c339
commit 6d8f40d13a
10 changed files with 397 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/python/PythonScriptEngine.cpp
View File

@@ -41,9 +41,9 @@ void PythonScriptEngine::initialize()
_py_main = PyModule_GetDict(PyImport_AddModule("__main__"));
}
void PythonScriptEngine::run(osg::Script* script)
bool PythonScriptEngine::run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters)
{
if (!script || !_py_main) return;
if (!script || !_py_main) return false;
PyObject* r = PyRun_String(script->getScript().c_str(), Py_file_input, _py_main, _py_main);
@@ -55,4 +55,6 @@ void PythonScriptEngine::run(osg::Script* script)
PyErr_Clear();
}
}
return true;
}

4
src/osgPlugins/python/PythonScriptEngine.h
View File

@@ -32,7 +32,7 @@ class PythonScriptEngine : public osg::ScriptEngine
virtual const std::string& getLanguage() const { return _language; }
/** run a Script.*/
virtual void run(osg::Script* script);
virtual bool run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters);
/** get the Python main object.*/
PyObject* getPythonMain() { return _py_main; }
@@ -49,4 +49,4 @@ class PythonScriptEngine : public osg::ScriptEngine
}
#endif
#endif