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

From Marco Jez, adding osgDB::findDataFile() usage.

Browse Source
This commit is contained in:
Robert Osfield
2006-01-18 12:16:45 +00:00
parent fe3b68dbb1
commit cc1ee1fa26
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/hdr/ReaderWriterHDR.cpp
View File

@@ -51,7 +51,11 @@ public:
virtual ReadResult readImage(const std::string &_file, const osgDB::ReaderWriter::Options *_opts) const
{
if (!HDRLoader::isHDRFile(_file.c_str()))
std::string filepath = osgDB::findDataFile(_file, _opts);
if (filepath.empty())
return ReadResult::FILE_NOT_FOUND;
if (!HDRLoader::isHDRFile(filepath.c_str()))
return ReadResult::FILE_NOT_HANDLED;
float mul = 1.0f;
@@ -96,9 +100,9 @@ public:
}
HDRLoaderResult res;
bool ret = HDRLoader::load(_file.c_str(), rawRGBE, res);
bool ret = HDRLoader::load(filepath.c_str(), rawRGBE, res);
if (!ret)
return ReadResult::FILE_NOT_FOUND;
return ReadResult::ERROR_IN_READING_FILE;
// create the osg::Image to fill in.
osg::Image *img = new osg::Image;
@@ -126,7 +130,7 @@ public:
int pixelFormat = GL_RGB;
int dataType = GL_UNSIGNED_BYTE;
img->setFileName(_file.c_str());
img->setFileName(filepath.c_str());
img->setImage( res.width, res.height, 1,
3, // Why this value are here?
pixelFormat,
@@ -154,7 +158,7 @@ public:
pixelFormat = GL_RGB;
}
img->setFileName(_file.c_str());
img->setFileName(filepath.c_str());
img->setImage( res.width, res.height, 1,
internalFormat,
pixelFormat,