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

Add file name to error message.

Browse Source
This commit is contained in:
ThorstenB
2012-03-28 22:54:27 +02:00
parent ece38a6dbf
commit 6fa4c7e138
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/model/SGMaterialAnimation.cxx
+4 -3
View File
@@ -413,13 +413,14 @@ private:
SGMaterialAnimation::SGMaterialAnimation(const SGPropertyNode* configNode, SGMaterialAnimation::SGMaterialAnimation(const SGPropertyNode* configNode,
SGPropertyNode* modelRoot, SGPropertyNode* modelRoot,
const osgDB::Options* const osgDB::Options*
options) : options, const string &path) :
SGAnimation(configNode, modelRoot), SGAnimation(configNode, modelRoot),
texturePathList(options->getDatabasePathList()) texturePathList(options->getDatabasePathList())
{ {
if (configNode->hasChild("global")) if (configNode->hasChild("global"))
SG_LOG(SG_IO, SG_ALERT, "Use of <global> in material animation is " SG_LOG(SG_IO, SG_ALERT, path <<
"no longer supported"); ": Use of <global> in material animation is "
"no longer supported.");
} }
osg::Group* osg::Group*
simgear/scene/model/SGMaterialAnimation.hxx
+1 -1
View File
@@ -23,7 +23,7 @@ class SGMaterialAnimation : public SGAnimation {
public: public:
SGMaterialAnimation(const SGPropertyNode* configNode, SGMaterialAnimation(const SGPropertyNode* configNode,
SGPropertyNode* modelRoot, SGPropertyNode* modelRoot,
const osgDB::Options* options); const osgDB::Options* options,const string &path);
virtual osg::Group* createAnimationGroup(osg::Group& parent); virtual osg::Group* createAnimationGroup(osg::Group& parent);
virtual void install(osg::Node& node); virtual void install(osg::Node& node);
static SGPropertyNode_ptr makeEffectProperties(const SGPropertyNode* animProp); static SGPropertyNode_ptr makeEffectProperties(const SGPropertyNode* animProp);
simgear/scene/model/animation.cxx
+1 -1
View File
@@ -433,7 +433,7 @@ SGAnimation::animate(osg::Node* node, const SGPropertyNode* configNode,
SGInteractionAnimation animInst(configNode, modelRoot); SGInteractionAnimation animInst(configNode, modelRoot);
animInst.apply(node); animInst.apply(node);
} else if (type == "material") { } else if (type == "material") {
SGMaterialAnimation animInst(configNode, modelRoot, options); SGMaterialAnimation animInst(configNode, modelRoot, options, path);
animInst.apply(node); animInst.apply(node);
} else if (type == "noshadow") { } else if (type == "noshadow") {
SGShadowAnimation animInst(configNode, modelRoot); SGShadowAnimation animInst(configNode, modelRoot);