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

Moved osgDB::MethodObject from lua plugin into osgDB, added support for running methods via the osgDB::PropertyInterface class.

Browse Source 
Updated lua plugin to use new osgDB::PropertyInterface to run methods.

Added addChild/removeChild() etc to Group.cpp, and addDrawable/removeDrawable() etc. to Geode.cpp serializers.
This commit is contained in:
Robert Osfield
2014-01-06 15:45:46 +00:00
parent 534d21dffd
commit 6490f1b6a5
10 changed files with 262 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/lua/LuaScriptEngine.cpp
View File

@@ -12,7 +12,6 @@
*/
#include "LuaScriptEngine.h"
#include "MethodObject.h"
#include <osg/io_utils>
#include <osgDB/ReadFile>
@@ -101,7 +100,8 @@ static int callClassMethod(lua_State* _lua)
inputParameters.push_back(lse->popParameterObject());
}
if (osgDB::MethodsObjectManager::instance()->run(object, object->getCompoundClassName(), methodName, inputParameters, outputParameters))
// if (osgDB::MethodsObjectManager::instance()->run(object, object->getCompoundClassName(), methodName, inputParameters, outputParameters))
if (lse->getPropertyInterface().run(object, object->getCompoundClassName(), methodName, inputParameters, outputParameters))
{
for(osg::Parameters::iterator itr = outputParameters.begin();
itr != outputParameters.end();
@@ -556,7 +556,7 @@ int LuaScriptEngine::pushPropertyToStack(osg::Object* object, const std::string&
osgDB::BaseSerializer::Type type;
if (!_pi.getPropertyType(object, propertyName, type))
{
if (osgDB::MethodsObjectManager::instance()->hasMethod(object->getCompoundClassName(), propertyName))
if (_pi.hasMethod(object, propertyName))
{
OSG_NOTICE<<"LuaScriptEngine::pushPropertyToStack("<<object<<", "<<propertyName<<") has method need to call it."<<std::endl;
lua_pushlightuserdata(_lua, const_cast<LuaScriptEngine*>(this));