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

Refactored the DotOsgWrapper support in osgDB::Registry so it's now provided by the osgDB::DeprecatedDotOsgWrapperManager.

Browse Source
This commit is contained in:
Robert Osfield
2010-01-25 17:07:25 +00:00
parent 470abf4527
commit 27c99ff0c8
8 changed files with 828 additions and 762 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osgDB/Input.cpp
View File

@@ -44,42 +44,42 @@ void Input::registerUniqueIDForObject(const std::string& uniqueID,osg::Object* o
osg::Object* Input::readObjectOfType(const osg::Object& compObj)
{
return Registry::instance()->readObjectOfType(compObj,*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readObjectOfType(compObj,*this);
}
osg::Object* Input::readObjectOfType(const basic_type_wrapper &btw)
{
return Registry::instance()->readObjectOfType(btw,*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readObjectOfType(btw,*this);
}
osg::Object* Input::readObject()
{
return Registry::instance()->readObject(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readObject(*this);
}
osg::Image* Input::readImage()
{
return Registry::instance()->readImage(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readImage(*this);
}
osg::Drawable* Input::readDrawable()
{
return Registry::instance()->readDrawable(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readDrawable(*this);
}
osg::StateAttribute* Input::readStateAttribute()
{
return Registry::instance()->readStateAttribute(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readStateAttribute(*this);
}
osg::Uniform* Input::readUniform()
{
return Registry::instance()->readUniform(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readUniform(*this);
}
osg::Node* Input::readNode()
{
return Registry::instance()->readNode(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readNode(*this);
}
osg::Object* Input::readObject(const std::string& fileName)
@@ -89,7 +89,7 @@ osg::Object* Input::readObject(const std::string& fileName)
osg::Shader* Input::readShader()
{
return Registry::instance()->readShader(*this);
return Registry::instance()->getDeprecatedDotOsgObjectWrapperManager()->readShader(*this);
}
osg::Image* Input::readImage(const std::string& fileName)