From David Callu, warning fixes and removal of spaces at end of lines.

This commit is contained in:
Robert Osfield
2013-06-28 12:00:43 +00:00
parent d82768417d
commit 097aedf23c
100 changed files with 496 additions and 428 deletions

View File

@@ -62,7 +62,7 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
}
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::NodeCallback(b,copyop)
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) : osg::Object(b, copyop), osg::NodeCallback(b,copyop) // TODO check this
{
const AnimationList& animationList = b.getAnimationList();
for (AnimationList::const_iterator it = animationList.begin();

View File

@@ -41,7 +41,7 @@ class ValidateSkeletonVisitor : public osg::NodeVisitor
{
public:
ValidateSkeletonVisitor(): osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN) {}
void apply(osg::Node& node) { return; }
void apply(osg::Node& /*node*/) { return; }
void apply(osg::Transform& node)
{
// the idea is to traverse the skeleton or bone but to stop if other node is found

View File

@@ -33,7 +33,7 @@ Target* StackedMatrixElement::getOrCreateTarget()
return _target.get();
}
void StackedMatrixElement::update(float t)
void StackedMatrixElement::update(float /*t*/)
{
if (_target.valid())
_matrix = _target->getValue();

View File

@@ -37,7 +37,7 @@ void StackedQuaternionElement::applyToMatrix(osg::Matrix& matrix) const {matrix.
osg::Matrix StackedQuaternionElement::getAsMatrix() const { return osg::Matrix(_quaternion); }
bool StackedQuaternionElement::isIdentity() const { return (_quaternion[0] == 0 && _quaternion[1] == 0 && _quaternion[2] == 0 && _quaternion[3] == 1.0); }
void StackedQuaternionElement::update(float t)
void StackedQuaternionElement::update(float /*t*/)
{
if (_target.valid())
_quaternion = _target->getValue();

View File

@@ -27,7 +27,7 @@ StackedRotateAxisElement::StackedRotateAxisElement(const StackedRotateAxisElemen
osg::Matrix StackedRotateAxisElement::getAsMatrix() const { return osg::Matrix::rotate(osg::Quat(_angle, _axis)); }
void StackedRotateAxisElement::update(float t)
void StackedRotateAxisElement::update(float /*t*/)
{
if (_target.valid())
_angle = _target->getValue();

View File

@@ -42,7 +42,7 @@ StackedScaleElement::StackedScaleElement()
_scale = osg::Vec3(1,1,1);
}
void StackedScaleElement::update(float t)
void StackedScaleElement::update(float /*t*/)
{
if (_target.valid())
_scale = _target->getValue();

View File

@@ -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):
osg::MixinVector<osg::ref_ptr<StackedTransformElement> >(rhs)
{
reserve(rhs.size());
for (StackedTransform::const_iterator it = rhs.begin(); it != rhs.end(); ++it)

View File

@@ -43,7 +43,7 @@ Target* StackedTranslateElement::getOrCreateTarget()
Target* StackedTranslateElement::getTarget() {return _target.get();}
const Target* StackedTranslateElement::getTarget() const {return _target.get();}
void StackedTranslateElement::update(float t)
void StackedTranslateElement::update(float /*t*/)
{
if (_target.valid())
_translate = _target->getValue();

View File

@@ -109,7 +109,7 @@ struct StatsGraph : public osg::MatrixTransform
struct NeverCull : public osg::Drawable::CullCallback
{
NeverCull() {}
bool cull(osg::NodeVisitor* nv, osg::Drawable* drawable, osg::RenderInfo* renderInfo) const { return false;}
bool cull(osg::NodeVisitor* /*nv*/, osg::Drawable* /*drawable*/, osg::RenderInfo* /*renderInfo*/) const { return false;}
};