Fixed compilation error in src/osgDB/FileUtils.cpp.
Added support for nested NodeCallbacks, allowing them to be chained together so that multiple operations can be applied.
This commit is contained in:
@@ -57,7 +57,7 @@ class TransformCallback : public osg::NodeCallback{
|
||||
}
|
||||
|
||||
// must continue subgraph traversal.
|
||||
nv->traverse(*node);
|
||||
traverse(node,nv);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -84,8 +84,7 @@ class TransformCallback : public osg::NodeCallback{
|
||||
}
|
||||
|
||||
// must continue subgraph traversal.
|
||||
nv->traverse(*node);
|
||||
|
||||
traverse(node,nv);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -31,6 +31,7 @@ C++FILES = \
|
||||
Material.cpp\
|
||||
Matrix.cpp\
|
||||
Node.cpp\
|
||||
NodeCallback.cpp\
|
||||
NodeVisitor.cpp\
|
||||
Notify.cpp\
|
||||
Object.cpp\
|
||||
|
||||
@@ -99,9 +99,6 @@ void Matrix::set( float a00, float a01, float a02, float a03,
|
||||
|
||||
void Matrix::setTrans( float tx, float ty, float tz )
|
||||
{
|
||||
#ifdef WARN_DEPRECATED
|
||||
notify(NOTICE) << "Matrix::setTrans is deprecated."<<endl;
|
||||
#endif
|
||||
ensureRealized();
|
||||
|
||||
_mat[3][0] = tx;
|
||||
|
||||
@@ -206,7 +206,7 @@ char *osgDB::findDSO( const char *name )
|
||||
}
|
||||
else
|
||||
{
|
||||
return (char *)strdup(_name);
|
||||
return (char *)strdup(name);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user