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

From Cedric Pinson, Add UpdateMaterial callback to animate material\nUpdate LinkVisitor to traverse stateset\nUpdate ReaderWriter to read osgAnimation::UpdateMaterial Callback\nUpdate nathan.osg data file to demonstrate the MaterialAnimation

Browse Source
This commit is contained in:
Cedric Pinson
2009-08-03 09:48:12 +00:00
parent 239aed9a88
commit d2af7efc61
9 changed files with 242 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/osgAnimation/Bone
View File

@@ -23,6 +23,7 @@
#include <osg/Geometry>
#include <osg/Notify>
#include <osg/io_utils>
#include <osg/NodeVisitor>
#include <osgAnimation/Export>
#include <osgAnimation/Target>
#include <osgAnimation/Sampler>
@@ -91,7 +92,7 @@ namespace osgAnimation
};
class OSGANIMATION_EXPORT UpdateBone : public AnimationUpdateCallback
class OSGANIMATION_EXPORT UpdateBone : public AnimationUpdateCallback <osg::NodeCallback>
{
protected:
osg::ref_ptr<osgAnimation::Vec3Target> _position;
@@ -102,7 +103,7 @@ namespace osgAnimation
META_Object(osgAnimation, UpdateBone);
UpdateBone(const UpdateBone& apc,const osg::CopyOp& copyop);
UpdateBone(const std::string& name = "")
UpdateBone(const std::string& name = "") : AnimationUpdateCallback <osg::NodeCallback>(name)
{
setName(name);
_quaternion = new osgAnimation::QuatTarget;
@@ -155,7 +156,7 @@ namespace osgAnimation
}
else
{
std::cerr << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << std::endl;
osg::notify(osg::WARN) << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << className() << std::endl;
}
return false;
}

9
include/osgAnimation/LinkVisitor
View File

@@ -16,10 +16,13 @@
#define OSGANIMATION_NODE_VISITOR_H
#include <osg/NodeVisitor>
#include <osg/StateSet>
#include <osgAnimation/Animation>
namespace osgAnimation
{
class AnimationUpdateCallbackBase;
/** This class is instancied by the AnimationManagerBase, it will link animation target to updatecallback that have the same name
*/
class OSGANIMATION_EXPORT LinkVisitor : public osg::NodeVisitor
@@ -30,10 +33,16 @@ namespace osgAnimation
META_NodeVisitor("osgAnimation","LinkVisitor");
void apply(osg::Node& node);
void apply(osg::Geode& node);
AnimationList& getAnimationList();
void reset();
protected:
void handle_stateset(osg::StateSet* stateset);
void link(osgAnimation::AnimationUpdateCallbackBase* cb);
// animation list to link
AnimationList _animations;

2
include/osgAnimation/MorphGeometry
View File

@@ -131,7 +131,7 @@ namespace osgAnimation
bool _morphNormals;
};
class OSGANIMATION_EXPORT UpdateMorph : public AnimationUpdateCallback
class OSGANIMATION_EXPORT UpdateMorph : public AnimationUpdateCallback<osg::NodeCallback>
{
protected:
std::map<int, osg::ref_ptr<osgAnimation::FloatTarget> > _weightTargets;

101
include/osgAnimation/UpdateCallback
View File

@@ -17,6 +17,8 @@
#include <osg/Vec3>
#include <osg/NodeCallback>
#include <osg/StateAttribute>
#include <osg/Material>
#include <osg/observer_ptr>
#include <osgAnimation/AnimationManagerBase>
#include <osgAnimation/Export>
@@ -24,23 +26,80 @@
namespace osgAnimation
{
class OSGANIMATION_EXPORT AnimationUpdateCallback : public osg::NodeCallback
class AnimationUpdateCallbackBase
{
public:
virtual AnimationManagerBase* getAnimationManager() = 0;
virtual bool needLink() const = 0;
virtual bool link(osgAnimation::Channel* channel) = 0;
virtual int link(osgAnimation::Animation* animation) = 0;
virtual void updateLink() = 0;
virtual const std::string& getName() const = 0;
};
template <class T>
class AnimationUpdateCallback : public AnimationUpdateCallbackBase, public T
{
protected:
osg::observer_ptr<osgAnimation::AnimationManagerBase> _manager;
public:
AnimationUpdateCallback(const std::string& name = "") { setName(name); }
AnimationUpdateCallback(const AnimationUpdateCallback& apc,const osg::CopyOp& copyop);
osgAnimation::AnimationManagerBase* getAnimationManager();
virtual bool needLink() const = 0;
virtual bool link(osgAnimation::Channel* channel) = 0;
virtual int link(osgAnimation::Animation* animation);
virtual void updateLink();
};
AnimationUpdateCallback(const std::string& name) { T::setName(name);}
AnimationUpdateCallback(const AnimationUpdateCallback& apc,const osg::CopyOp& copyop):
T(apc, copyop),
_manager(apc._manager) {}
class OSGANIMATION_EXPORT UpdateTransform : public AnimationUpdateCallback
osgAnimation::AnimationManagerBase* getAnimationManager() { return _manager.get(); }
const std::string& getName() const { return T::getName(); }
int link(osgAnimation::Animation* animation)
{
if (T::getName().empty())
osg::notify(osg::WARN) << "An update callback has no name, it means it can link only with \"\" named Target, often an error" << std::endl;
int nbLinks = 0;
for (osgAnimation::ChannelList::iterator it = animation->getChannels().begin();
it != animation->getChannels().end();
it++)
{
std::string targetName = (*it)->getTargetName();
if (targetName == T::getName())
{
AnimationUpdateCallbackBase* a = this;
a->link((*it).get());
nbLinks++;
}
}
return nbLinks;
}
void updateLink()
{
if (_manager.valid())
{
if (needLink())
{
/** this item is not linked yet then we do it for all animation
registered in the manager.
Maybe this function should be on the manager side like
_manager->linkItem(Bone);
*/
const AnimationList& animationList = _manager->getAnimationList();
for (AnimationList::const_iterator it = animationList.begin(); it != animationList.end(); it++)
{
AnimationUpdateCallbackBase* a = this;
a->link(it->get());
}
_manager->buildTargetReference();
}
}
}
};
class OSGANIMATION_EXPORT UpdateTransform : public AnimationUpdateCallback<osg::NodeCallback>
{
protected:
osg::ref_ptr<osgAnimation::Vec3Target> _euler;
@@ -63,6 +122,26 @@ namespace osgAnimation
};
class OSGANIMATION_EXPORT UpdateMaterial : public AnimationUpdateCallback<osg::StateAttribute::Callback>
{
protected:
osg::ref_ptr<osgAnimation::Vec4Target> _diffuse;
public:
META_Object(osgAnimation, UpdateMaterial);
UpdateMaterial(const std::string& name = "");
UpdateMaterial(const UpdateMaterial& apc,const osg::CopyOp& copyop);
/** Callback method called by the NodeVisitor when visiting a node.*/
virtual void operator () (osg::StateAttribute*, osg::NodeVisitor*);
void update(osg::Material& material);
bool needLink() const;
bool link(osgAnimation::Channel* channel);
};
}
#endif