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

@@ -46,7 +46,7 @@ namespace osgAnimation
META_Object(osgAnimation,Callback);
virtual void operator()(Action* action, osgAnimation::ActionVisitor* nv) {}
virtual void operator()(Action* /*action*/, osgAnimation::ActionVisitor* /*nv*/) {}
Callback* getNestedCallback() { return _nestedCallback.get(); }
void addNestedCallback(Callback* callback)
@@ -119,7 +119,7 @@ namespace osgAnimation
// get the number of loop, the frame relative to loop.
// return true if in range, and false if out of range.
bool evaluateFrame(unsigned int frame, unsigned int& resultframe, unsigned int& nbloop );
virtual void traverse(ActionVisitor& visitor) {}
virtual void traverse(ActionVisitor& /*visitor*/) {}
//virtual void evaluate(unsigned int frame);
protected:

View File

@@ -42,7 +42,7 @@ namespace osgAnimation
META_Object(osgAnimation, AnimationUpdateCallback<T>);
const std::string& getName() const { return T::getName(); }
bool link(Channel* channel) { return 0; }
bool link(Channel* /*channel*/) { return 0; }
int link(Animation* animation)
{
if (T::getName().empty())

View File

@@ -40,7 +40,7 @@ namespace osgAnimation
public:
MorphTarget(osg::Geometry* geom, float w = 1.0) : _geom(geom), _weight(w) {}
void setWeight(float weight) { _weight = weight; }
const float getWeight() const { return _weight; }
float getWeight() const { return _weight; }
osg::Geometry* getGeometry() { return _geom.get(); }
const osg::Geometry* getGeometry() const { return _geom.get(); }
void setGeometry(osg::Geometry* geom) { _geom = geom; }