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

24
examples/osgtext/osgtext.cpp
View File

@@ -75,7 +75,7 @@ osg::Group* createHUDText()
osg::Group* rootNode = new osg::Group;
osgText::Font* font = osgText::readFontFile("fonts/arial.ttf");
osg::ref_ptr<osgText::Font> font = osgText::readRefFontFile("fonts/arial.ttf");
//osg::setNotifyLevel(osg::INFO);
@@ -344,7 +344,7 @@ osg::Group* createHUDText()
float spacing = 40.0f;
{
osgText::Text* text = new osgText::Text;
osg::ref_ptr<osgText::Text> text = new osgText::Text;
text->setUseVertexBufferObjects(useVBOs);
text->setColor(fontColor);
text->setPosition(cursor);
@@ -358,9 +358,9 @@ osg::Group* createHUDText()
}
{
osgText::Font* arial = osgText::readFontFile("fonts/arial.ttf");
osg::ref_ptr<osgText::Font> arial = osgText::readRefFontFile("fonts/arial.ttf");
osgText::Text* text = new osgText::Text;
osg::ref_ptr<osgText::Text> text = new osgText::Text;
text->setUseVertexBufferObjects(useVBOs);
text->setColor(fontColor);
text->setPosition(cursor);
@@ -376,9 +376,9 @@ osg::Group* createHUDText()
}
{
osgText::Font* times = osgText::readFontFile("fonts/times.ttf");
osg::ref_ptr<osgText::Font> times = osgText::readRefFontFile("fonts/times.ttf");
osgText::Text* text = new osgText::Text;
osg::ref_ptr<osgText::Text> text = new osgText::Text;
text->setUseVertexBufferObjects(useVBOs);
text->setColor(fontColor);
text->setPosition(cursor);
@@ -397,9 +397,9 @@ osg::Group* createHUDText()
cursor.y() = margin;
{
osgText::Font* dirtydoz = osgText::readFontFile("fonts/dirtydoz.ttf");
osg::ref_ptr<osgText::Font> dirtydoz = osgText::readRefFontFile("fonts/dirtydoz.ttf");
osgText::Text* text = new osgText::Text;
osg::ref_ptr<osgText::Text> text = new osgText::Text;
text->setUseVertexBufferObjects(useVBOs);
text->setColor(fontColor);
text->setPosition(cursor);
@@ -415,9 +415,9 @@ osg::Group* createHUDText()
}
{
osgText::Font* fudd = osgText::readFontFile("fonts/fudd.ttf");
osg::ref_ptr<osgText::Font> fudd = osgText::readRefFontFile("fonts/fudd.ttf");
osgText::Text* text = new osgText::Text;
osg::ref_ptr<osgText::Text> text = new osgText::Text;
text->setUseVertexBufferObjects(useVBOs);
text->setColor(fontColor);
text->setPosition(cursor);
@@ -706,10 +706,10 @@ int main(int argc, char** argv)
osg::Vec3 center(0.5f,0.5f,0.5f);
float diameter = 1.0f;
osg::ref_ptr<osg::Node> loadedModel = osgDB::readNodeFiles(arguments);
osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
if (loadedModel.valid())
{
mainGroup->addChild(loadedModel.get());
mainGroup->addChild(loadedModel);
center = loadedModel->getBound().center();
diameter = loadedModel->getBound().radius() * 2.0f;