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

Removed the dual inheritance from the AnimationPathCallback, moving the

Browse Source 
NodeVisitor implemention into the .cpp.

Small tweak to the lighpoint drawable implmenentation to improve the additive
blending and state resotoration.
This commit is contained in:
Robert Osfield
2003-01-03 21:42:02 +00:00
parent fe64942c54
commit 141f065b17
3 changed files with 57 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/osg/AnimationPath.cpp
View File

@@ -70,6 +70,30 @@ bool AnimationPath::getInterpolatedControlPoint(double time,ControlPoint& contro
}
class AnimationPathCallbackVisitor : public NodeVisitor
{
public:
AnimationPathCallbackVisitor(const AnimationPath::ControlPoint& cp):
_cp(cp) {}
virtual void apply(MatrixTransform& mt)
{
Matrix matrix;
_cp.getMatrix(matrix);
mt.setMatrix(matrix);
}
virtual void apply(PositionAttitudeTransform& pat)
{
pat.setPosition(_cp._position);
pat.setAttitude(_cp._rotation);
}
AnimationPath::ControlPoint _cp;
};
void AnimationPathCallback::operator()(Node* node, NodeVisitor* nv)
{
if (_animationPath.valid() &&
@@ -81,30 +105,15 @@ void AnimationPathCallback::operator()(Node* node, NodeVisitor* nv)
_animationTime = ((time-_firstTime)-_timeOffset)*_timeMultiplier;
node->accept(*this);
AnimationPath::ControlPoint cp;
if (_animationPath->getInterpolatedControlPoint(_animationTime,cp))
{
AnimationPathCallbackVisitor apcv(cp);
node->accept(apcv);
}
}
// must call any nested node callbacks and continue subgraph traversal.
NodeCallback::traverse(node,nv);
}
void AnimationPathCallback::apply(MatrixTransform& mt)
{
Matrix matrix;
if (_animationPath->getMatrix(_animationTime,matrix))
{
mt.setMatrix(matrix);
}
}
void AnimationPathCallback::apply(PositionAttitudeTransform& pat)
{
AnimationPath::ControlPoint cp;
if (_animationPath->getInterpolatedControlPoint(_animationTime,cp))
{
pat.setPosition(cp._position);
pat.setAttitude(cp._rotation);
}
}