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

Fixed support for reading imagery relative to the .osg being loaded

Browse Source
This commit is contained in:
Robert Osfield
2009-05-05 12:18:24 +00:00
parent e2f4e96416
commit 9da4bb1387
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/osgVolume/ImageLayer.cpp
View File

@@ -56,7 +56,7 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
osgDB::FileType fileType = osgDB::fileType(filename);
if (fileType == osgDB::FILE_NOT_FOUND)
{
filename = osgDB::findDataFile(filename);
filename = osgDB::findDataFile(filename, fr.getOptions());
fileType = osgDB::fileType(filename);
}
@@ -71,10 +71,10 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
image = osgDB::readRefImageFile( filename );
}
osg::notify(osg::INFO)<<"osgVolume::ImageLayer image read: "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::dec<<std::endl;
if (image.valid())
{
osg::notify(osg::INFO)<<"osgVolume::ImageLayer image read: "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::dec<<std::endl;
layer.setImage(image.get());
layer.rescaleToZeroToOneRange();
}