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

Fixed build of V8 and Python plugins

Browse Source
This commit is contained in:
Robert Osfield
2014-01-03 14:36:58 +00:00
parent afab78ed40
commit bfdcf4d8d1
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/V8/V8ScriptEngine.cpp
View File

@@ -41,7 +41,7 @@ void V8ScriptEngine::initialize()
}
bool V8ScriptEngine::run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters)
bool V8ScriptEngine::run(osg::Script* script, const std::string& entryPoint, osg::Parameters& inputParameters, osg::Parameters& outputParameters)
{
if (!script || !_isolate) return false;

2
src/osgPlugins/V8/V8ScriptEngine.h
View File

@@ -32,7 +32,7 @@ class V8ScriptEngine : public osg::ScriptEngine
virtual const std::string& getLanguage() const { return _language; }
/** run a Script.*/
virtual bool run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters);
virtual bool run(osg::Script* script, const std::string& entryPoint, osg::Parameters& inputParameters, osg::Parameters& outputParameters);
v8::Isolate* getIsolate() { return _isolate; }

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

@@ -41,7 +41,7 @@ void PythonScriptEngine::initialize()
_py_main = PyModule_GetDict(PyImport_AddModule("__main__"));
}
bool PythonScriptEngine::run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters)
bool PythonScriptEngine::run(osg::Script* script, const std::string& entryPoint, osg::Parameters& inputParameters, osg::Parameters& outputParameters)
{
if (!script || !_py_main) return false;

2
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 bool run(osg::Script* script, const std::string& entryPoint, Parameters& inputParameters, Parameters& outputParameters);
virtual bool run(osg::Script* script, const std::string& entryPoint, osg::Parameters& inputParameters, osg::Parameters& outputParameters);
/** get the Python main object.*/
PyObject* getPythonMain() { return _py_main; }