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

Implemented preliminary readNode/readImage support in the lua plugin allow a lua script to create a scene graph as return it.

Browse Source
This commit is contained in:
Robert Osfield 2013-10-09 15:32:56 +00:00
parent e8b5272b02
commit 9c53794bc7
5 changed files with 462 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/osgDB/PropertyInterface
View File

@ -174,6 +174,10 @@ protected:
bool copyPropertyDataToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType);
bool copyPropertyObjectFromObject(const osg::Object* object, const std::string& propertyName, void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType);
bool copyPropertyObjectToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType);
osgDB::ObjectWrapper* getObjectWrapper(const osg::Object* object) const;
osgDB::BaseSerializer* getSerializer(const osg::Object* object, const std::string& propertyName, osgDB::BaseSerializer::Type& type) const;
@ -214,6 +218,20 @@ bool PropertyInterface::setProperty(osg::Object* object, const std::string& prop
}
}
typedef osg::Object* ObjectPtr;
template<>
inline bool PropertyInterface::getProperty(const osg::Object* object, const std::string& propertyName, ObjectPtr& value)
{
return copyPropertyObjectFromObject(object, propertyName, &value, sizeof(ObjectPtr), getTypeEnum<ObjectPtr>());
}
template<>
inline bool PropertyInterface::setProperty(osg::Object* object, const std::string& propertyName, const ObjectPtr& value)
{
return copyPropertyObjectToObject(object, propertyName, &value, sizeof(ObjectPtr), getTypeEnum<ObjectPtr>());
}
}
#endif

45
src/osgDB/PropertyInterface.cpp
View File

@ -294,7 +294,15 @@ bool PropertyInterface::copyPropertyDataFromObject(const osg::Object* object, co
osgDB::BaseSerializer::Type sourceType;
osgDB::BaseSerializer* serializer = getSerializer(object, propertyName, sourceType);
if (serializer && areTypesCompatible(sourceType, valueType) && serializer->write(_outputStream, *object))
if (!serializer) return false;
if (!areTypesCompatible(sourceType, valueType))
{
OSG_NOTICE<<"PropertyInterface::copyPropertyDataFromObject() Types are not compatible, valueType = "<<valueType<<", sourceType="<<sourceType<<std::endl;
return false;
}
if (serializer->write(_outputStream, *object))
{
unsigned int sourceSize = _poi->_str.size();
@ -311,10 +319,15 @@ bool PropertyInterface::copyPropertyDataFromObject(const osg::Object* object, co
}
else
{
OSG_NOTICE<<"PropertyInterface::copyPropertyDataFromObject() Sizes not compatible, sourceSize = "<<sourceSize<<" valueSize = "<<valueSize<<std::endl;
return false;
}
}
else return false;
else
{
OSG_NOTICE<<"PropertyInterface::copyPropertyDataFromObject() serializer write failed."<<std::endl;
return false;
}
}
bool PropertyInterface::copyPropertyDataToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType)
@ -332,11 +345,35 @@ bool PropertyInterface::copyPropertyDataToObject(osg::Object* object, const std:
osgDB::BaseSerializer::Type destinationType;
osgDB::BaseSerializer* serializer = getSerializer(object, propertyName, destinationType);
if (serializer && areTypesCompatible(valueType, destinationType))
if (serializer)
{
if (areTypesCompatible(valueType, destinationType))
{
return serializer->read(_inputStream, *object);
}
else return false;
else
{
OSG_NOTICE<<"PropertyInterface::copyPropertyDataToObject() Types are not compatible, valueType = "<<valueType<<", destinationType="<<destinationType<<std::endl;
return false;
}
}
else
{
OSG_NOTICE<<"PropertyInterface::copyPropertyDataFromObject() no serializer available."<<std::endl;
return false;
}
}
bool PropertyInterface::copyPropertyObjectFromObject(const osg::Object* object, const std::string& propertyName, void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType)
{
OSG_NOTICE<<"PropertyInterface::copyPropertyObjectFromObject() Not Supported yet."<<std::endl;
return false;
}
bool PropertyInterface::copyPropertyObjectToObject(osg::Object* object, const std::string& propertyName, const void* valuePtr, unsigned int valueSize, osgDB::BaseSerializer::Type valueType)
{
OSG_NOTICE<<"PropertyInterface::copyPropertyObjectToObject() Not Supported yet."<<std::endl;
return false;
}

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

@ -14,6 +14,7 @@
#include "LuaScriptEngine.h"
#include <osg/io_utils>
#include <osgDB/ReadFile>
using namespace lua;
@ -115,14 +116,16 @@ static int newObject(lua_State * _lua)
LuaScriptEngine::LuaScriptEngine():
osg::ScriptEngine("lua"),
_lua(0)
_lua(0),
_scriptCount(0)
{
initialize();
}
LuaScriptEngine::LuaScriptEngine(const LuaScriptEngine& rhs, const osg::CopyOp&):
osg::ScriptEngine("lua"),
_lua(0)
_lua(0),
_scriptCount(0)
{
initialize();
}
@ -134,17 +137,34 @@ LuaScriptEngine::~LuaScriptEngine()
lua_close(_lua);
}
std::string LuaScriptEngine::createUniquieScriptName()
{
std::stringstream sstr;
sstr<<"script_"<<_scriptCount;
++_scriptCount;
OSG_NOTICE<<"uniqueScrtiptName "<<sstr.str()<<std::endl;
return sstr.str();
}
void LuaScriptEngine::initialize()
{
_lua = luaL_newstate();
luaL_openlibs(_lua);
OSG_NOTICE<<"Stack after openlibs "<<lua_gettop(_lua)<<std::endl;
// provide global new method for creating osg::Object's.
{
lua_pushlightuserdata(_lua, this);
lua_pushcclosure(_lua, newObject, 1);
lua_setglobal(_lua, "new");
}
// Set up the __newindex and __index methods for looking up implementations of Object properties
{
luaL_newmetatable(_lua, "LuaScriptEngine.Object");
lua_pushstring(_lua, "__index");
@ -157,11 +177,21 @@ void LuaScriptEngine::initialize()
lua_pushcclosure(_lua, setProperty, 1);
lua_settable(_lua, -3);
lua_pop(_lua,1);
}
// Set up the __gc methods for looking up implementations of Object pointer to do the unref when the associated Lua object is destroyed.
{
luaL_newmetatable(_lua, "LuaScriptEngine.UnrefObject");
lua_pushstring(_lua, "__gc");
lua_pushlightuserdata(_lua, this);
lua_pushcclosure(_lua, garabageCollectObject, 1);
lua_settable(_lua, -3);
lua_pop(_lua,1);
}
OSG_NOTICE<<"Stack after initialize "<<lua_gettop(_lua)<<std::endl;
}
bool LuaScriptEngine::loadScript(osg::Script* script)
@ -171,7 +201,13 @@ bool LuaScriptEngine::loadScript(osg::Script* script)
int loadResult = luaL_loadstring(_lua, script->getScript().c_str());
if (loadResult==0)
{
_loadedScripts.insert(script);
std::string scriptID = createUniquieScriptName();
lua_pushvalue(_lua, -1);
lua_setglobal(_lua, scriptID.c_str());
_loadedScripts[script] = scriptID;
return true;
}
else
@ -186,10 +222,21 @@ bool LuaScriptEngine::run(osg::Script* script, const std::string& entryPoint, Pa
{
if (!script || !_lua) return false;
if (_loadedScripts.count(script)==0)
{
OSG_NOTICE<<"Stack before load "<<lua_gettop(_lua)<<std::endl;
if (!loadScript(script)) return false;
OSG_NOTICE<<"Stack after load "<<lua_gettop(_lua)<<std::endl;
OSG_NOTICE<<" Type "<<lua_type(_lua,-1)<<std::endl;
OSG_NOTICE<<" Typename "<<lua_typename(_lua,-1)<<std::endl;
OSG_NOTICE<<" lua_isfunction "<<lua_isfunction(_lua,-1)<<std::endl;
if (!entryPoint.empty())
{
if (lua_pcall(_lua, 0, 0, 0)!=0)
{
OSG_NOTICE<< "error initialize script "<< lua_tostring(_lua, -1)<<std::endl;
@ -197,24 +244,30 @@ bool LuaScriptEngine::run(osg::Script* script, const std::string& entryPoint, Pa
}
}
OSG_NOTICE<<"Stack after init call "<<lua_gettop(_lua)<<std::endl;
}
if (entryPoint.empty())
{
int callResult = lua_pcall(_lua, 0, LUA_MULTRET, 0);
if (callResult)
{
OSG_NOTICE << "LuaScriptEngine::call(Script*) error: " << lua_tostring(_lua, -1) << std::endl;
return false;
}
return true;
ScriptMap::iterator itr = _loadedScripts.find(script);
if (itr == _loadedScripts.end()) return false;
std::string scriptID = itr->second;
OSG_NOTICE<<"Stack before pcall "<<lua_gettop(_lua)<<std::endl;
OSG_NOTICE<<" scriptID "<<std::endl;
lua_getglobal(_lua, scriptID.c_str());
}
else
{
//lua_pushglobaltable(pLuaState);
//lua_getfield(_lua, LUA_GLOBALSINDEX, entryPoint.c_str()); /* function to be called */
//lua_getfield(_lua, -1, entryPoint.c_str()); /* function to be called */
lua_getglobal(_lua, entryPoint.c_str()); /* function to be called */
}
OSG_NOTICE<<"After lua_getglobal Type "<<lua_type(_lua,-1)<<std::endl;
OSG_NOTICE<<"After lua_getglobal Typename "<<lua_typename(_lua,-1)<<std::endl;
OSG_NOTICE<<"After lua_getglobal lua_isfunction "<<lua_isfunction(_lua,-1)<<std::endl;
for(osg::ScriptEngine::Parameters::const_iterator itr = inputParameters.begin();
itr != inputParameters.end();
@ -223,22 +276,25 @@ bool LuaScriptEngine::run(osg::Script* script, const std::string& entryPoint, Pa
pushParameter(itr->get());
}
if (lua_pcall(_lua, inputParameters.size(), outputParameters.size(),0)!=0)
int topBeforeCall = lua_gettop(_lua);
if (lua_pcall(_lua, inputParameters.size(), LUA_MULTRET,0)!=0)
{
OSG_NOTICE<<"Lua error : "<<lua_tostring(_lua, -1)<<std::endl;
return false;
}
for(osg::ScriptEngine::Parameters::const_iterator itr = outputParameters.begin();
itr != outputParameters.end();
++itr)
int numReturns = (lua_gettop(_lua)+1)-topBeforeCall;
outputParameters.clear();
for(int i=0; i<numReturns; ++i)
{
popParameter(itr->get());
osg::ref_ptr<osg::Object> obj = popParameterObject();
if (obj.valid()) outputParameters.push_back(obj);
}
return true;
}
return false;
}
@ -459,6 +515,19 @@ int LuaScriptEngine::pushPropertyToStack(osg::Object* object, const std::string&
}
break;
}
case(osgDB::BaseSerializer::RW_IMAGE):
case(osgDB::BaseSerializer::RW_OBJECT):
{
osg::Object* value = 0;
if (_pi.getProperty(object, propertyName, value))
{
OSG_NOTICE<<"Sucessful getProperty("<<object<<", "<<propertyName<<" "<<value<<std::endl;
pushObject(value);
return 1;
}
OSG_NOTICE<<"Error getProperty("<<object<<", "<<propertyName<<" "<<value<<" Failed"<<std::endl;
break;
}
default:
break;
}
@ -638,6 +707,42 @@ int LuaScriptEngine::setPropertyFromStack(osg::Object* object, const std::string
}
break;
}
case(osgDB::BaseSerializer::RW_IMAGE):
case(osgDB::BaseSerializer::RW_OBJECT):
{
if (lua_istable(_lua, -1))
{
osg::Object* value = 0;
lua_pushstring(_lua, "object_ptr");
lua_rawget(_lua, -2);
if (lua_type(_lua, -1)==LUA_TUSERDATA) value = *const_cast<osg::Object**>(reinterpret_cast<const osg::Object**>(lua_touserdata(_lua,-1)));
lua_pop(_lua, 1);
if (value)
{
OSG_NOTICE<<"Assigning property object "<<value->className()<<" to to object "<<object->className()<<"::"<<propertyName<<std::endl;
_pi.setProperty(object, propertyName, value);
return 0;
}
else
{
OSG_NOTICE<<"Error: lua type '"<<lua_typename(_lua,lua_type(_lua, -1))<<"' cannot be assigned to "<<object->className()<<"::"<<propertyName<<std::endl;
}
}
else if (lua_isnil(_lua, -1))
{
OSG_NOTICE<<"Assigning property object (nil) to to object "<<object->className()<<"::"<<propertyName<<std::endl;
osg::Object* value = 0;
_pi.setProperty(object, propertyName, value);
return 0;
}
else
{
OSG_NOTICE<<"Error: lua type '"<<lua_typename(_lua,lua_type(_lua, -1))<<"' cannot be assigned to "<<object->className()<<"::"<<propertyName<<std::endl;
return 0;
}
break;
}
default:
break;
}
@ -711,6 +816,17 @@ osgDB::BaseSerializer::Type LuaScriptEngine::getType() const
case(LUA_TSTRING): return osgDB::BaseSerializer::RW_STRING;
case(LUA_TTABLE):
{
lua_pushstring(_lua, "object_ptr");
lua_rawget(_lua, -2);
bool isObject = (lua_type(_lua, -1)==LUA_TUSERDATA);
lua_pop(_lua, 1);
if (isObject)
{
return osgDB::BaseSerializer::RW_OBJECT;
}
int n = lua_gettop(_lua); /* number of arguments */
lua_pushnil(_lua);
@ -1020,6 +1136,145 @@ bool LuaScriptEngine::popParameter(osg::Object* object)
return false;
}
osg::Object* LuaScriptEngine::popParameterObject()
{
osg::ref_ptr<osg::Object> object = 0;
osgDB::BaseSerializer::Type type = getType();
switch(type)
{
case(osgDB::BaseSerializer::RW_BOOL):
{
if (lua_isboolean(_lua, -1)) object = new osg::BoolValueObject("", lua_toboolean(_lua, -1)!=0);
break;
}
case(osgDB::BaseSerializer::RW_STRING):
{
if (lua_isstring(_lua, -1)) object = new osg::StringValueObject("", lua_tostring(_lua, -1));
break;
}
case(osgDB::BaseSerializer::RW_ENUM):
case(osgDB::BaseSerializer::RW_INT):
{
if (lua_isnumber(_lua, -1)) object = new osg::IntValueObject("", static_cast<int>(lua_tonumber(_lua, -1)));
break;
}
case(osgDB::BaseSerializer::RW_UINT):
{
if (lua_isnumber(_lua, -1)) object = new osg::UIntValueObject("", static_cast<unsigned int>(lua_tonumber(_lua, -1)));
break;
}
case(osgDB::BaseSerializer::RW_FLOAT):
{
if (lua_isnumber(_lua, -1)) object = new osg::FloatValueObject("", static_cast<float>(lua_tonumber(_lua, -1)));
break;
}
case(osgDB::BaseSerializer::RW_DOUBLE):
{
if (lua_isnumber(_lua, -1)) object = new osg::DoubleValueObject("", static_cast<double>(lua_tonumber(_lua, -1)));
break;
}
case(osgDB::BaseSerializer::RW_VEC2F):
{
osg::Vec2f value;
if (getValue(value)) object = new osg::Vec2fValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_VEC3F):
{
osg::Vec3f value;
if (getValue(value)) object = new osg::Vec3fValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_VEC4F):
{
osg::Vec4f value;
if (getValue(value)) object = new osg::Vec4fValueObject("", value);
break;
}
#ifdef OSG_USE_FLOAT_MATRIX
case(osgDB::BaseSerializer::RW_MATRIX):
#endif
case(osgDB::BaseSerializer::RW_MATRIXF):
{
osg::Matrixf value;
if (getValue(value)) object = new osg::MatrixfValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_VEC2D):
{
osg::Vec2d value;
if (getValue(value)) object = new osg::Vec2dValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_VEC3D):
{
osg::Vec3d value;
if (getValue(value)) object = new osg::Vec3dValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_VEC4D):
{
osg::Vec4d value;
if (getValue(value)) object = new osg::Vec4dValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_QUAT):
{
osg::Quat value;
if (getValue(value)) object = new osg::QuatValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_PLANE):
{
osg::Plane value;
if (getValue(value)) object = new osg::PlaneValueObject("", value);
break;
}
#ifndef OSG_USE_FLOAT_MATRIX
case(osgDB::BaseSerializer::RW_MATRIX):
#endif
case(osgDB::BaseSerializer::RW_MATRIXD):
{
osg::Matrixd value;
if (getValue(value)) object = new osg::MatrixdValueObject("", value);
break;
}
case(osgDB::BaseSerializer::RW_IMAGE):
case(osgDB::BaseSerializer::RW_OBJECT):
{
lua_pushstring(_lua, "object_ptr");
lua_rawget(_lua, -2);
if (lua_type(_lua, -1)==LUA_TUSERDATA)
{
object = *const_cast<osg::Object**>(reinterpret_cast<const osg::Object**>(lua_touserdata(_lua,-1)));
}
lua_pop(_lua, 1);
}
default:
break;
}
lua_pop(_lua, 1);
return object.release();
#if 0
osg::ValueObject* vo = dynamic_cast<osg::ValueObject*>(object);
if (vo)
{
GetStackValueVisitor pvv(this, -1);
vo->set(pvv);
lua_pop(_lua, pvv._numberToPop);
}
else
{
lua_pop(_lua, 1);
}
#endif
return object.release();
}
void LuaScriptEngine::createAndPushObject(const std::string& compoundName) const
{
osg::ref_ptr<osg::Object> object = _pi.createObject(compoundName);
@ -1034,8 +1289,6 @@ void LuaScriptEngine::pushObject(osg::Object* object) const
{
if (object)
{
OSG_NOTICE<<"Creating lua object representation for "<<object<<" "<<object->getCompoundClassName()<<std::endl;
lua_newtable(_lua);
// set up objbect_ptr to handle ref/unref of the object

9
src/osgPlugins/lua/LuaScriptEngine.h
View File

@ -85,6 +85,7 @@ class LuaScriptEngine : public osg::ScriptEngine
bool pushParameter(osg::Object* object);
bool popParameter(osg::Object* object);
osg::Object* popParameterObject();
void createAndPushObject(const std::string& compoundName) const;
@ -96,11 +97,13 @@ class LuaScriptEngine : public osg::ScriptEngine
virtual ~LuaScriptEngine();
lua_State* _lua;
typedef std::set< osg::ref_ptr<osg::Script> > ScriptSet;
ScriptSet _loadedScripts;
unsigned int _scriptCount;
std::string createUniquieScriptName();
typedef std::map< osg::ref_ptr<osg::Script>, std::string> ScriptMap;
ScriptMap _loadedScripts;
mutable osgDB::PropertyInterface _pi;
};

83
src/osgPlugins/lua/ReaderWriterLua.cpp
View File

@ -63,6 +63,89 @@ class ReaderWriterLua : public osgDB::ReaderWriter
return readObject(istream, options);
}
virtual ReadResult readObjectFromScript(std::istream& fin, const osgDB::ReaderWriter::Options* options =NULL) const
{
ReadResult result = readObject(fin, options);
if (!result.validObject()) return result;
osg::ref_ptr<osg::Script> script = dynamic_cast<osg::Script*>(result.getObject());
if (!script) return ReadResult::ERROR_IN_READING_FILE;
std::string entryPoint = "";
osg::ScriptEngine::Parameters inputParameters;
osg::ScriptEngine::Parameters outputParameters;
osg::ref_ptr<lua::LuaScriptEngine> se = new lua::LuaScriptEngine();
if (!se->run(script.get(), entryPoint, inputParameters, outputParameters)) return 0;
if (outputParameters.empty()) return 0;
typedef std::vector< osg::ref_ptr<osg::Object> > Objects;
Objects objects;
for(osg::ScriptEngine::Parameters::iterator itr = outputParameters.begin();
itr != outputParameters.end();
++itr)
{
osg::Object* object = dynamic_cast<osg::Object*>(itr->get());
if (object) objects.push_back(object);
}
if (objects.empty()) return 0;
if (objects.size()==1) return objects[0].get();
osg::ref_ptr<osg::Group> group = new osg::Group;
for(Objects::iterator itr = objects.begin();
itr != objects.end();
++itr)
{
osg::Node* node = dynamic_cast<osg::Node*>(itr->get());
if (node) group->addChild(node);
}
if (group->getNumChildren()>0) return group.get();
else return 0;
}
virtual ReadResult readImage(std::istream& fin, const osgDB::ReaderWriter::Options* options =NULL) const
{
return readObjectFromScript(fin, options);
}
virtual ReadResult readImage(const std::string& file, const osgDB::ReaderWriter::Options* options =NULL) const
{
std::string ext = osgDB::getLowerCaseFileExtension(file);
if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
std::string fileName = osgDB::findDataFile( file, options );
if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
osgDB::ifstream istream(fileName.c_str(), std::ios::in);
if(!istream) return ReadResult::FILE_NOT_HANDLED;
return readImage(istream, options);
}
virtual ReadResult readNode(std::istream& fin, const osgDB::ReaderWriter::Options* options =NULL) const
{
return readObjectFromScript(fin, options);
}
virtual ReadResult readNode(const std::string& file, const osgDB::ReaderWriter::Options* options =NULL) const
{
std::string ext = osgDB::getLowerCaseFileExtension(file);
if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
std::string fileName = osgDB::findDataFile( file, options );
if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
osgDB::ifstream istream(fileName.c_str(), std::ios::in);
if(!istream) return ReadResult::FILE_NOT_HANDLED;
return readNode(istream, options);
}
};
// now register with Registry to instantiate the above