forcing users to use osgDB::readRef*File() methods. The later is preferable as it closes a potential threading bug when using paging databases in conjunction
with the osgDB::Registry Object Cache. This threading bug occurs when one thread gets an object from the Cache via an osgDB::read*File() call where only
a pointer to the object is passed back, so taking a reference to the object is delayed till it gets reassigned to a ref_ptr<>, but at the same time another
thread calls a flush of the Object Cache deleting this object as it's referenceCount is now zero. Using osgDB::readREf*File() makes sure the a ref_ptr<> is
passed back and the referenceCount never goes to zero.
To ensure the OSG builds when OSG_PROVIDE_READFILE is to OFF the many cases of osgDB::read*File() usage had to be replaced with a ref_ptr<> osgDB::readRef*File()
usage. The avoid this change causing lots of other client code to be rewritten to handle the use of ref_ptr<> in place of C pointer I introduced a serious of
templte methods in various class to adapt ref_ptr<> to the underly C pointer to be passed to old OSG API's, example of this is found in include/osg/Group:
bool addChild(Node* child); // old method which can only be used with a Node*
tempalte<class T> bool addChild(const osg::ref_ptr<T>& child) { return addChild(child.get()); } // adapter template method
These changes together cover 149 modified files, so it's a large submission. This extent of changes are warrent to make use of the Object Cache
and multi-threaded loaded more robust.
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15164 16af8721-9629-0410-8352-f15c8da7e697
157 lines
5.1 KiB
C++
157 lines
5.1 KiB
C++
#include <osg/ProxyNode>
|
|
#include <osgDB/ObjectWrapper>
|
|
#include <osgDB/InputStream>
|
|
#include <osgDB/OutputStream>
|
|
#include <osgDB/FileNameUtils>
|
|
#include <osgDB/ReadFile>
|
|
|
|
// _filenameList
|
|
static bool checkFileNames( const osg::ProxyNode& node )
|
|
{
|
|
return node.getNumFileNames()>0;
|
|
}
|
|
|
|
static bool readFileNames( osgDB::InputStream& is, osg::ProxyNode& node )
|
|
{
|
|
unsigned int size = 0; is >> size >> is.BEGIN_BRACKET;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
std::string value;
|
|
is.readWrappedString( value );
|
|
node.setFileName( i, value );
|
|
}
|
|
is >> is.END_BRACKET;
|
|
return true;
|
|
}
|
|
|
|
static bool writeFileNames( osgDB::OutputStream& os, const osg::ProxyNode& node )
|
|
{
|
|
os << node.getNumFileNames() << os.BEGIN_BRACKET << std::endl;
|
|
for ( unsigned int i=0; i<node.getNumFileNames(); ++i )
|
|
{
|
|
os.writeWrappedString( node.getFileName(i) );
|
|
os << std::endl;
|
|
}
|
|
os << os.END_BRACKET << std::endl;
|
|
return true;
|
|
}
|
|
|
|
// _children
|
|
static bool checkChildren( const osg::ProxyNode& node )
|
|
{
|
|
return node.getNumChildren()>0;
|
|
}
|
|
|
|
static bool readChildren( osgDB::InputStream& is, osg::ProxyNode& node )
|
|
{
|
|
unsigned int size = 0; is >> size;
|
|
if (size > 0)
|
|
{
|
|
is >> is.BEGIN_BRACKET;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
osg::ref_ptr<osg::Node> child = is.readObjectOfType<osg::Node>();
|
|
if ( child ) node.addChild( child );
|
|
}
|
|
is >> is.END_BRACKET;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
static bool writeChildren( osgDB::OutputStream& os, const osg::ProxyNode& node )
|
|
{
|
|
unsigned int size=node.getNumFileNames(), dynamicLoadedSize=0;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
if ( !node.getFileName(i).empty() )
|
|
dynamicLoadedSize++;
|
|
}
|
|
|
|
unsigned int realSize = size-dynamicLoadedSize; os << realSize;
|
|
if ( realSize>0 )
|
|
{
|
|
os << os.BEGIN_BRACKET << std::endl;
|
|
for ( unsigned int i=0; i<size; ++i )
|
|
{
|
|
if ( !node.getFileName(i).empty() ) continue;
|
|
if ( i<node.getNumChildren() )
|
|
os << node.getChild(i);
|
|
}
|
|
os << os.END_BRACKET;
|
|
}
|
|
os << std::endl;
|
|
return true;
|
|
}
|
|
|
|
// _userDefinedCenter, _radius
|
|
static bool checkUserCenter( const osg::ProxyNode& node )
|
|
{
|
|
return (node.getCenterMode()==osg::ProxyNode::USER_DEFINED_CENTER)||(node.getCenterMode()==osg::ProxyNode::UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED);
|
|
}
|
|
|
|
static bool readUserCenter( osgDB::InputStream& is, osg::ProxyNode& node )
|
|
{
|
|
osg::Vec3d center; double radius;
|
|
is >> center >> radius;
|
|
node.setCenter( center ); node.setRadius( radius );
|
|
return true;
|
|
}
|
|
|
|
static bool writeUserCenter( osgDB::OutputStream& os, const osg::ProxyNode& node )
|
|
{
|
|
os << osg::Vec3d(node.getCenter()) << (double)node.getRadius() << std::endl;
|
|
return true;
|
|
}
|
|
|
|
struct ProxyNodeFinishedObjectReadCallback : public osgDB::FinishedObjectReadCallback
|
|
{
|
|
virtual void objectRead(osgDB::InputStream& is, osg::Object& obj)
|
|
{
|
|
osg::ProxyNode& proxyNode = static_cast<osg::ProxyNode&>(obj);
|
|
|
|
if (proxyNode.getLoadingExternalReferenceMode() == osg::ProxyNode::LOAD_IMMEDIATELY)
|
|
{
|
|
for(unsigned int i=0; i<proxyNode.getNumFileNames(); i++)
|
|
{
|
|
if(i >= proxyNode.getNumChildren() && !proxyNode.getFileName(i).empty())
|
|
{
|
|
osgDB::FilePathList& fpl = ((osgDB::ReaderWriter::Options*)is.getOptions())->getDatabasePathList();
|
|
fpl.push_front( fpl.empty() ? osgDB::getFilePath(proxyNode.getFileName(i)) : fpl.front()+'/'+ osgDB::getFilePath(proxyNode.getFileName(i)));
|
|
osg::ref_ptr<osg::Node> node = osgDB::readRefNodeFile(proxyNode.getFileName(i), is.getOptions());
|
|
fpl.pop_front();
|
|
if(node)
|
|
proxyNode.insertChild(i, node);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
REGISTER_OBJECT_WRAPPER( ProxyNode,
|
|
new osg::ProxyNode,
|
|
osg::ProxyNode,
|
|
"osg::Object osg::Node osg::ProxyNode" )
|
|
{
|
|
// Note: osg::Group is not in the list to prevent recording dynamic loaded children
|
|
|
|
ADD_USER_SERIALIZER( FileNames ); // _filenameList
|
|
ADD_USER_SERIALIZER( Children ); // _children (which are not loaded from external)
|
|
ADD_STRING_SERIALIZER( DatabasePath, "" ); // _databasePath
|
|
|
|
BEGIN_ENUM_SERIALIZER( LoadingExternalReferenceMode, LOAD_IMMEDIATELY );
|
|
ADD_ENUM_VALUE( LOAD_IMMEDIATELY );
|
|
ADD_ENUM_VALUE( DEFER_LOADING_TO_DATABASE_PAGER );
|
|
ADD_ENUM_VALUE( NO_AUTOMATIC_LOADING );
|
|
END_ENUM_SERIALIZER(); // _loadingExtReference
|
|
|
|
BEGIN_ENUM_SERIALIZER( CenterMode, USE_BOUNDING_SPHERE_CENTER );
|
|
ADD_ENUM_VALUE( USE_BOUNDING_SPHERE_CENTER );
|
|
ADD_ENUM_VALUE( USER_DEFINED_CENTER );
|
|
ADD_ENUM_VALUE( UNION_OF_BOUNDING_SPHERE_AND_USER_DEFINED );
|
|
END_ENUM_SERIALIZER(); // _centerMode
|
|
|
|
ADD_USER_SERIALIZER( UserCenter ); // _userDefinedCenter, _radius
|
|
|
|
wrapper->addFinishedObjectReadCallback(new ProxyNodeFinishedObjectReadCallback());
|
|
}
|