Fixed -Wextra warnings
This commit is contained in:
parent
7bb0f437c1
commit
aef2574b8d
@ -32,6 +32,9 @@ namespace osgAnimation
|
||||
const osg::Matrix& getMatrix() const;
|
||||
|
||||
protected:
|
||||
|
||||
typedef osg::MixinVector<osg::ref_ptr<StackedTransformElement> > inherited;
|
||||
|
||||
osg::Matrix _matrix;
|
||||
};
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <osgAnimation/ActionCallback>
|
||||
#include <osgAnimation/Timeline>
|
||||
|
||||
void osgAnimation::RunAction::operator()(Action* action, ActionVisitor* visitor)
|
||||
void osgAnimation::RunAction::operator()(Action* /*action*/, ActionVisitor* visitor)
|
||||
{
|
||||
Timeline* tm = visitor->getCurrentTimeline();
|
||||
tm->addActionNow(_action.get(), _priority);
|
||||
|
@ -62,7 +62,10 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
|
||||
}
|
||||
|
||||
|
||||
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop) // TODO check this
|
||||
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) :
|
||||
osg::Object(b,copyop),
|
||||
osg::Callback(b,copyop),
|
||||
osg::NodeCallback(b,copyop) // TODO check this
|
||||
{
|
||||
const AnimationList& animationList = b.getAnimationList();
|
||||
for (AnimationList::const_iterator it = animationList.begin();
|
||||
|
@ -26,6 +26,7 @@ Skeleton::UpdateSkeleton::UpdateSkeleton() : _needValidate(true) {}
|
||||
|
||||
Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop) :
|
||||
osg::Object(us, copyop),
|
||||
osg::Callback(us, copyop),
|
||||
osg::NodeCallback(us, copyop)
|
||||
{
|
||||
_needValidate = true;
|
||||
|
@ -18,7 +18,8 @@ using namespace osgAnimation;
|
||||
|
||||
StackedTransform::StackedTransform() {}
|
||||
|
||||
StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co)
|
||||
StackedTransform::StackedTransform(const StackedTransform& rhs, const osg::CopyOp& co):
|
||||
inherited(rhs)
|
||||
{
|
||||
reserve(rhs.size());
|
||||
for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)
|
||||
|
@ -18,7 +18,10 @@
|
||||
|
||||
using namespace osgAnimation;
|
||||
|
||||
UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) : osg::Object(apc,copyop), AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
|
||||
UpdateMatrixTransform::UpdateMatrixTransform( const UpdateMatrixTransform& apc,const osg::CopyOp& copyop) :
|
||||
osg::Object(apc,copyop),
|
||||
osg::Callback(apc,copyop),
|
||||
AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
|
||||
{
|
||||
_transforms = StackedTransform(apc.getStackedTransforms(), copyop);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user