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

SGMaterialAnimation: Better handling of missing texture

Browse Source 
Don't retry loading a missing texture on every frame.
Emit a warning message instead and retry on the next
change of the textures name.
This commit is contained in:
Torsten Dreyer
2015-11-27 11:09:16 +01:00
parent 81d668784a
commit 589c5ba35a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGMaterialAnimation.cxx
+7 -1
View File
@@ -364,6 +364,8 @@ public:
if (_textureProp) { if (_textureProp) {
std::string textureName = _textureProp->getStringValue(); std::string textureName = _textureProp->getStringValue();
if (_textureName != textureName) { if (_textureName != textureName) {
_textureName = textureName;
while (stateSet->getTextureAttribute(0, while (stateSet->getTextureAttribute(0,
osg::StateAttribute::TEXTURE)) { osg::StateAttribute::TEXTURE)) {
stateSet->removeTextureAttribute(0, osg::StateAttribute::TEXTURE); stateSet->removeTextureAttribute(0, osg::StateAttribute::TEXTURE);
@@ -377,8 +379,12 @@ public:
osg::StateAttribute::OVERRIDE); osg::StateAttribute::OVERRIDE);
stateSet->setTextureMode(0, GL_TEXTURE_2D, stateSet->setTextureMode(0, GL_TEXTURE_2D,
osg::StateAttribute::ON); osg::StateAttribute::ON);
_textureName = textureName;
} }
} else {
SG_LOG(SG_IO, SG_WARN, "texture animation: requested texture : " << textureName << " not found. Searched paths:" );
for( osgDB::FilePathList::iterator it = _texturePathList.begin(); it != _texturePathList.end(); ++it ) {
SG_LOG(SG_IO, SG_WARN, " - " << *it );
}
} }
} }
} }