FGFS-4.1/OpenSceneGraph
3
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

28
examples/osgtext3D/osgtext3D.cpp
View File

@@ -41,7 +41,7 @@ int main(int argc, char** argv)
std::string fontFile("arial.ttf");
while(arguments.read("-f",fontFile)) {}
osg::ref_ptr<osgText::Font> font = osgText::readFontFile(fontFile);
osg::ref_ptr<osgText::Font> font = osgText::readRefFontFile(fontFile);
if (!font) return 1;
OSG_NOTICE<<"Read font "<<fontFile<<" font="<<font.get()<<std::endl;
@@ -62,9 +62,9 @@ int main(int argc, char** argv)
while(arguments.read("--flat",r)) { bevel = new osgText::Bevel; bevel->flatBevel(r); }
while(arguments.read("--flat")) { bevel = new osgText::Bevel; bevel->flatBevel(0.25); }
while(arguments.read("--bevel-thickness",r)) { if (bevel.valid()) bevel->setBevelThickness(r); }
if (bevel.valid())
if (bevel.valid())
{
while(arguments.read("--smooth-concave-Junctions") || arguments.read("--scj"))
{
@@ -72,7 +72,7 @@ int main(int argc, char** argv)
}
}
style->setBevel(bevel.get());
// set up outline.
@@ -139,12 +139,12 @@ int main(int argc, char** argv)
while(arguments.read("--image",imageFilename))
{
OSG_NOTICE<<"--image "<<imageFilename<<std::endl;
osg::ref_ptr<osg::Image> image = osgDB::readImageFile(imageFilename);
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(imageFilename);
if (image.valid())
{
OSG_NOTICE<<" loaded image "<<imageFilename<<std::endl;
osg::StateSet* stateset = text3D->getOrCreateStateSet();
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image.get()), osg::StateAttribute::ON);
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image), osg::StateAttribute::ON);
}
}
@@ -158,11 +158,11 @@ int main(int argc, char** argv)
while(arguments.read("--wall-image",imageFilename))
{
osg::ref_ptr<osg::Image> image = osgDB::readImageFile(imageFilename);
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(imageFilename);
if (image.valid())
{
osg::StateSet* stateset = text3D->getOrCreateWallStateSet();
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image.get()), osg::StateAttribute::ON);
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image), osg::StateAttribute::ON);
}
}
@@ -176,11 +176,11 @@ int main(int argc, char** argv)
while(arguments.read("--back-image",imageFilename))
{
osg::ref_ptr<osg::Image> image = osgDB::readImageFile(imageFilename);
if (image.valid())
osg::ref_ptr<osg::Image> image = osgDB::readRefImageFile(imageFilename);
if (image)
{
osg::StateSet* stateset = text3D->getOrCreateBackStateSet();
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image.get()), osg::StateAttribute::ON);
stateset->setTextureAttributeAndModes(0, new osg::Texture2D(image), osg::StateAttribute::ON);
}
}
@@ -190,8 +190,8 @@ int main(int argc, char** argv)
}
}
viewer.setSceneData(group.get());
viewer.setSceneData(group);
#endif