dd996a3289
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
99 lines
2.9 KiB
C++
99 lines
2.9 KiB
C++
#include "osg/Texture3D"
|
|
#include "osg/ImageSequence"
|
|
|
|
#include "osgDB/Registry"
|
|
#include "osgDB/Input"
|
|
#include "osgDB/Output"
|
|
#include "osgDB/WriteFile"
|
|
|
|
using namespace osg;
|
|
using namespace osgDB;
|
|
|
|
// forward declare functions to use later.
|
|
bool Texture3D_readLocalData(Object& obj, Input& fr);
|
|
bool Texture3D_writeLocalData(const Object& obj, Output& fw);
|
|
|
|
bool Texture3D_matchWrapStr(const char* str,Texture3D::WrapMode& wrap);
|
|
const char* Texture3D_getWrapStr(Texture3D::WrapMode wrap);
|
|
bool Texture3D_matchFilterStr(const char* str,Texture3D::FilterMode& filter);
|
|
const char* Texture3D_getFilterStr(Texture3D::FilterMode filter);
|
|
bool Texture3D_matchInternalFormatModeStr(const char* str,Texture3D::InternalFormatMode& mode);
|
|
const char* Texture3D_getInternalFormatModeStr(Texture3D::InternalFormatMode mode);
|
|
bool Texture3D_matchInternalFormatStr(const char* str,int& value);
|
|
const char* Texture3D_getInternalFormatStr(int value);
|
|
|
|
// register the read and write functions with the osgDB::Registry.
|
|
REGISTER_DOTOSGWRAPPER(Texture3D)
|
|
(
|
|
new osg::Texture3D,
|
|
"Texture3D",
|
|
"Object StateAttribute Texture3D TextureBase",
|
|
&Texture3D_readLocalData,
|
|
&Texture3D_writeLocalData
|
|
);
|
|
|
|
bool Texture3D_readLocalData(Object& obj, Input& fr)
|
|
{
|
|
bool iteratorAdvanced = false;
|
|
|
|
Texture3D& texture = static_cast<Texture3D&>(obj);
|
|
|
|
if (fr[0].matchWord("file") && fr[1].isString())
|
|
{
|
|
std::string filename = fr[1].getStr();
|
|
osg::ref_ptr<Image> image = fr.readImage(filename.c_str());
|
|
if (image)
|
|
{
|
|
// name will have already been set by the image plugin,
|
|
// but it will have absolute path, so will override it
|
|
// here to keep the original name intact.
|
|
//image->setFileName(filename);
|
|
texture.setImage(image);
|
|
}
|
|
|
|
fr += 2;
|
|
iteratorAdvanced = true;
|
|
}
|
|
|
|
if (fr[0].matchWord("ImageSequence") || fr[0].matchWord("Image"))
|
|
{
|
|
osg::ref_ptr<osg::Image> image = fr.readImage();
|
|
if (image) texture.setImage(image);
|
|
}
|
|
|
|
return iteratorAdvanced;
|
|
}
|
|
|
|
bool Texture3D_writeLocalData(const Object& obj, Output& fw)
|
|
{
|
|
const Texture3D& texture = static_cast<const Texture3D&>(obj);
|
|
|
|
if (texture.getImage())
|
|
{
|
|
const osg::ImageSequence* is = dynamic_cast<const osg::ImageSequence*>(texture.getImage());
|
|
if (is)
|
|
{
|
|
fw.writeObject(*is);
|
|
}
|
|
else
|
|
{
|
|
std::string fileName = texture.getImage()->getFileName();
|
|
if (fw.getOutputTextureFiles())
|
|
{
|
|
if (fileName.empty())
|
|
{
|
|
fileName = fw.getTextureFileNameForOutput();
|
|
}
|
|
osgDB::writeImageFile(*texture.getImage(), fileName);
|
|
}
|
|
|
|
if (!fileName.empty())
|
|
{
|
|
fw.indent() << "file "<<fw.wrapString(fw.getFileNameForOutput(fileName))<< std::endl;
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|