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

Allow (ab)using findDataFile to also search directories again.

Browse Source
This commit is contained in:
ThorstenB 2012-02-19 14:38:52 +01:00
parent ae0b8eb3b3
commit 2a9d39f201
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
simgear/scene/material/TextureBuilder.cxx
View File

@ -243,8 +243,11 @@ void setAttrs(const TexTuple& attrs, Texture* tex,
} else { } else {
osgDB::ReaderWriter::ReadResult result; osgDB::ReaderWriter::ReadResult result;
result = osgDB::readImageFile(imageName, options); result = osgDB::readImageFile(imageName, options);
if (result.success()) { osg::ref_ptr<osg::Image> image;
osg::ref_ptr<osg::Image> image = result.getImage(); if (result.success())
image = result.getImage();
if (image.valid())
{
image = computeMipmap( image.get(), attrs.get<7>() ); image = computeMipmap( image.get(), attrs.get<7>() );
tex->setImage(GL_FRONT_AND_BACK, image.get()); tex->setImage(GL_FRONT_AND_BACK, image.get());
int s = image->s(); int s = image->s();
@ -360,7 +363,7 @@ osg::Image* make3DNoiseImage(int texSize)
GLubyte *ptr; GLubyte *ptr;
double amp = 0.5; double amp = 0.5;
osg::notify(osg::WARN) << "creating 3D noise texture... "; SG_LOG(SG_INPUT, SG_INFO, "creating 3D noise texture... ");
for (f = 0, inc = 0; f < numOctaves; ++f, frequency *= 2, ++inc, amp *= 0.5) for (f = 0, inc = 0; f < numOctaves; ++f, frequency *= 2, ++inc, amp *= 0.5)
{ {
@ -383,7 +386,7 @@ osg::Image* make3DNoiseImage(int texSize)
} }
} }
osg::notify(osg::WARN) << "DONE" << std::endl; SG_LOG(SG_INPUT, SG_INFO, "creating 3D noise textures complete!");
return image; return image;
} }

2
simgear/scene/model/modellib.cxx
View File

@ -71,7 +71,7 @@ std::string SGModelLib::findDataFile(const std::string& file,
if (file.empty()) if (file.empty())
return file; return file;
SGPath p = ResourceManager::instance()->findPath(file, currentPath); SGPath p = ResourceManager::instance()->findPath(file, currentPath);
if (p.exists()&&p.isFile()) { if (p.exists()) {
return p.str(); return p.str();
} }