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

Fixed -Wextra warnings

Browse Source
This commit is contained in:
Robert Osfield 2016-06-08 09:46:09 +01:00
parent 7bb0f437c1
commit aef2574b8d
6 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgAnimation/StackedTransform
View File

@ -32,6 +32,9 @@ namespace osgAnimation
const osg::Matrix& getMatrix() const; const osg::Matrix& getMatrix() const;
protected: protected:
typedef osg::MixinVector<osg::ref_ptr<StackedTransformElement> > inherited;
osg::Matrix _matrix; osg::Matrix _matrix;
}; };

2
src/osgAnimation/ActionCallback.cpp
View File

@ -15,7 +15,7 @@
#include <osgAnimation/ActionCallback> #include <osgAnimation/ActionCallback>
#include <osgAnimation/Timeline> #include <osgAnimation/Timeline>
void osgAnimation::RunAction::operator()(Action* action, ActionVisitor* visitor) void osgAnimation::RunAction::operator()(Action* /*action*/, ActionVisitor* visitor)
{ {
Timeline* tm = visitor->getCurrentTimeline(); Timeline* tm = visitor->getCurrentTimeline();
tm->addActionNow(_action.get(), _priority); tm->addActionNow(_action.get(), _priority);

5
src/osgAnimation/AnimationManagerBase.cpp
View File

@ -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(); const AnimationList& animationList = b.getAnimationList();
for (AnimationList::const_iterator it = animationList.begin(); for (AnimationList::const_iterator it = animationList.begin();

1
src/osgAnimation/Skeleton.cpp
View File

@ -26,6 +26,7 @@ Skeleton::UpdateSkeleton::UpdateSkeleton() : _needValidate(true) {}
Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop) : Skeleton::UpdateSkeleton::UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop) :
osg::Object(us, copyop), osg::Object(us, copyop),
osg::Callback(us, copyop),
osg::NodeCallback(us, copyop) osg::NodeCallback(us, copyop)
{ {
_needValidate = true; _needValidate = true;

3
src/osgAnimation/StackedTransform.cpp
View File

@ -18,7 +18,8 @@ using namespace osgAnimation;
StackedTransform::StackedTransform() {} 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()); reserve(rhs.size());
for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it) for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)

5
src/osgAnimation/UpdateMatrixTransform.cpp
View File

@ -18,7 +18,10 @@
using namespace osgAnimation; 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); _transforms = StackedTransform(apc.getStackedTransforms(), copyop);
} }