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

Added ability to assign callbacks from lua scripts

Browse Source
This commit is contained in:
Robert Osfield 2016-07-06 11:36:25 +01:00
parent dba3fa00b9
commit c753a99a38
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,10 @@ using namespace lua;
class LuaCallbackObject : public osg::CallbackObject class LuaCallbackObject : public osg::CallbackObject
{ {
public: public:
LuaCallbackObject(const std::string& methodName, const LuaScriptEngine* lse, int ref):_lse(lse),_ref(ref) { setName(methodName); } LuaCallbackObject(const std::string& methodName, const LuaScriptEngine* lse, int ref):_lse(lse),_ref(ref)
{
setName(methodName);
}
virtual bool run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const virtual bool run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const
{ {
@ -3271,6 +3274,15 @@ int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string
OSG_NOTICE<<"Error: lua type '"<<lua_typename(_lua,lua_type(_lua, -1))<<"' cannot be assigned to "<<object->className()<<"::"<<propertyName<<std::endl; OSG_NOTICE<<"Error: lua type '"<<lua_typename(_lua,lua_type(_lua, -1))<<"' cannot be assigned to "<<object->className()<<"::"<<propertyName<<std::endl;
} }
} }
else if (lua_type(_lua,-1)==LUA_TFUNCTION)
{
int ref = luaL_ref(_lua, LUA_REGISTRYINDEX);
osg::ref_ptr<LuaCallbackObject> lco = new LuaCallbackObject(propertyName, this, ref);
osg::Object* value = lco.get();
_ci.setProperty(object, propertyName, value);
return 0;
}
else if (lua_isnil(_lua, -1)) else if (lua_isnil(_lua, -1))
{ {
OSG_NOTICE<<"Assigning property object (nil) to to object "<<object->className()<<"::"<<propertyName<<std::endl; OSG_NOTICE<<"Assigning property object (nil) to to object "<<object->className()<<"::"<<propertyName<<std::endl;