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

Introduced CMake option OSG_PROVIDE_READFILE option that defaults to ON, but when switched to OFF disables the building of the osgDB::read*File() methods,

Browse Source 
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/branches/OpenSceneGraph-3.4@15165 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-10-22 14:14:53 +00:00
parent 74f1838960
commit 6a67be2e32
281 changed files with 2443 additions and 2050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
examples/osgvirtualprogram/osgvirtualprogram.cpp
View File

@@ -14,7 +14,7 @@ extern osg::Node * CreateAdvancedHierarchy( osg::Node * model );
////////////////////////////////////////////////////////////////////////////////
osg::Node * CreateGlobe( void )
{
// File not found - create textured sphere
// File not found - create textured sphere
osg::Geode * geode = new osg::Geode;
osg::ref_ptr<osg::TessellationHints> hints = new osg::TessellationHints;
hints->setDetailRatio( 0.3 );
@@ -33,8 +33,8 @@ osg::Node * CreateGlobe( void )
osg::StateSet * stateSet = new osg::StateSet;
osg::Texture2D * texture = new osg::Texture2D(
osgDB::readImageFile("Images/land_shallow_topo_2048.jpg")
osg::Texture2D * texture = new osg::Texture2D(
osgDB::readRefImageFile("Images/land_shallow_topo_2048.jpg")
);
osg::Material * material = new osg::Material;
@@ -68,14 +68,15 @@ int main( int argc, char **argv )
bool useSimpleExample = arguments.read("-s") || arguments.read("--simple") ;
osg::Node * model = NULL;
osg::ref_ptr<osg::Node> model;
if (arguments.argc()>1 && !arguments.isOption(1) ) {
if (arguments.argc()>1 && !arguments.isOption(1) )
{
std::string filename = arguments[1];
model = osgDB::readNodeFile( filename );
model = osgDB::readRefNodeFile( filename );
if ( !model ) {
osg::notify( osg::NOTICE )
<< "Error, cannot read " << filename
osg::notify( osg::NOTICE )
<< "Error, cannot read " << filename
<< ". Loading default earth model instead." << std::endl;
}
}
@@ -83,9 +84,9 @@ int main( int argc, char **argv )
if( model == NULL )
model = CreateGlobe( );
osg::Node * node = useSimpleExample ?
CreateSimpleHierarchy( model ):
CreateAdvancedHierarchy( model );
osg::ref_ptr<osg::Node> node = useSimpleExample ?
CreateSimpleHierarchy( model.get() ):
CreateAdvancedHierarchy( model.get() );
viewer.setSceneData( node );
viewer.realize( );