Changeset 10518

Timestamp:

08/03/09 11:48:12 (4 years ago)

Author:

cedricpinson

Message:

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?

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Bone (modified) (4 diffs)
• include/osgAnimation/LinkVisitor (modified) (2 diffs)
• include/osgAnimation/MorphGeometry (modified) (1 diff)
• include/osgAnimation/UpdateCallback (modified) (3 diffs)
• src/osgAnimation/Bone.cpp (modified) (1 diff)
• src/osgAnimation/LinkVisitor.cpp (modified) (2 diffs)
• src/osgAnimation/MorphGeometry.cpp (modified) (3 diffs)
• src/osgAnimation/UpdateCallback.cpp (modified) (4 diffs)
• src/osgPlugins/osgAnimation/ReaderWriter.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Bone

@@ -24 +24 @@
 #include <osg/Notify>
 #include <osg/io_utils>
+#include <osg/NodeVisitor>
 #include <osgAnimation/Export>
 #include <osgAnimation/Target>
@@ -92 +93 @@
 
 
-        class OSGANIMATION_EXPORT UpdateBone : public AnimationUpdateCallback
+        class OSGANIMATION_EXPORT UpdateBone : public AnimationUpdateCallback <osg::NodeCallback>
         {
         protected:
@@ -103 +104 @@
             UpdateBone(const UpdateBone& apc,const osg::CopyOp& copyop);
 
-            UpdateBone(const std::string& name = "")
+            UpdateBone(const std::string& name = "") : AnimationUpdateCallback <osg::NodeCallback>(name)
             {
                 setName(name);
@@ -156 +157 @@
                 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;

OpenSceneGraph/trunk/include/osgAnimation/LinkVisitor

@@ -17 +17 @@
 
 #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
      */
@@ -31 +34 @@
 
         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;

OpenSceneGraph/trunk/include/osgAnimation/MorphGeometry

@@ -132 +132 @@
     };
     
-    class OSGANIMATION_EXPORT UpdateMorph : public AnimationUpdateCallback
+    class OSGANIMATION_EXPORT UpdateMorph : public AnimationUpdateCallback<osg::NodeCallback>
     {
     protected:

OpenSceneGraph/trunk/include/osgAnimation/UpdateCallback

@@ -18 +18 @@
 #include <osg/Vec3>
 #include <osg/NodeCallback>
+#include <osg/StateAttribute>
+#include <osg/Material>
 #include <osg/observer_ptr>
 #include <osgAnimation/AnimationManagerBase>
@@ -25 +27 @@
 {
 
-    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) {}
+
+        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
+
+
+
+    class OSGANIMATION_EXPORT UpdateTransform : public AnimationUpdateCallback<osg::NodeCallback>
     {
     protected:
@@ -64 +123 @@
 
 
+
+    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);
+    };
+
 }
 

OpenSceneGraph/trunk/src/osgAnimation/Bone.cpp

@@ -19 +19 @@
 osgAnimation::Bone::UpdateBone::UpdateBone(const osgAnimation::Bone::UpdateBone& apc,const osg::CopyOp& copyop) :
     osg::Object(apc, copyop),
-    osgAnimation::AnimationUpdateCallback(apc, copyop)
+    osgAnimation::AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
 {
     _quaternion = new osgAnimation::QuatTarget(apc._quaternion->getValue());

OpenSceneGraph/trunk/src/osgAnimation/LinkVisitor.cpp

@@ -16 +16 @@
 #include <osgAnimation/UpdateCallback>
 #include <osg/Notify>
+#include <osg/Geode>
 
 using namespace osgAnimation;
@@ -33 +34 @@
     return _animations;
 }
+void LinkVisitor::link(osgAnimation::AnimationUpdateCallbackBase* cb)
+{
+    int result = 0;
+    for (int i = 0; i < (int)_animations.size(); i++)
+    {
+        result += cb->link(_animations[i].get());
+        _nbLinkedTarget += result;
+    }
+    osg::notify(osg::NOTICE) << "LinkVisitor links " << result << " for \"" << cb->getName() << '"' << std::endl;
+}
+
+void LinkVisitor::handle_stateset(osg::StateSet* stateset)
+{
+    if (!stateset)
+        return;
+    osg::StateSet::AttributeList& attr = stateset->getAttributeList();
+    for (osg::StateSet::AttributeList::iterator it = attr.begin(); it != attr.end(); it++)
+    {
+        osg::StateAttribute* sattr = it->second.first.get();
+        osgAnimation::AnimationUpdateCallbackBase* cb = dynamic_cast<osgAnimation::AnimationUpdateCallbackBase*>(sattr->getUpdateCallback());
+        if (cb)
+            link(cb);
+    }
+}
 
 void LinkVisitor::apply(osg::Node& node)
 {
-    osgAnimation::AnimationUpdateCallback* cb = dynamic_cast<osgAnimation::AnimationUpdateCallback*>(node.getUpdateCallback());
-    if (cb) 
+    osg::StateSet* st = node.getStateSet();
+    if (st)
+        handle_stateset(st);
+
+    osg::NodeCallback* cb = node.getUpdateCallback();
+    while (cb)
     {
-        int result = 0;
-        for (int i = 0; i < (int)_animations.size(); i++)
-        {
-            result += cb->link(_animations[i].get());
-            _nbLinkedTarget += result;
-        }
-        osg::notify(osg::NOTICE) << "LinkVisitor links " << result << " for \"" << cb->getName() << '"' << std::endl;
+        osgAnimation::AnimationUpdateCallbackBase* cba = dynamic_cast<osgAnimation::AnimationUpdateCallbackBase*>(cb);
+        if (cba)
+            link(cba);
+        cb = cb->getNestedCallback();
     }
     traverse(node);
 }
+
+void LinkVisitor::apply(osg::Geode& node)
+{
+    for (unsigned int i = 0; i < node.getNumDrawables(); i++)
+    {
+        osg::Drawable* drawable = node.getDrawable(i);
+        if (drawable && drawable->getStateSet())
+            handle_stateset(drawable->getStateSet());
+    }
+    apply(static_cast<osg::Node&>(node));
+}

OpenSceneGraph/trunk/src/osgAnimation/MorphGeometry.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19 +19 @@
  *
  * Roland Smeenk
- * Cedric Pinson <mornifle@plopbyte.net>
+ * Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  */
@@ -203 +203 @@
 }
 
-UpdateMorph::UpdateMorph(const UpdateMorph& apc,const osg::CopyOp& copyop) : AnimationUpdateCallback(apc, copyop)
-{
-}
-
-UpdateMorph::UpdateMorph(const std::string& name) : AnimationUpdateCallback(name) 
+UpdateMorph::UpdateMorph(const UpdateMorph& apc,const osg::CopyOp& copyop) : AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
+{
+}
+
+UpdateMorph::UpdateMorph(const std::string& name) : AnimationUpdateCallback<osg::NodeCallback>(name) 
 {
 }

OpenSceneGraph/trunk/src/osgAnimation/UpdateCallback.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -19 +19 @@
 using namespace osgAnimation;
 
-osgAnimation::AnimationManagerBase* AnimationUpdateCallback::getAnimationManager() { return _manager.get(); }
-
-AnimationUpdateCallback::AnimationUpdateCallback(const AnimationUpdateCallback& apc,const osg::CopyOp& copyop):
-    osg::NodeCallback(apc, copyop),
-    _manager(apc._manager) {}
-
-int AnimationUpdateCallback::link(osgAnimation::Animation* animation)
-{
-    if (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 == getName()) 
-        {
-            link((*it).get());
-            nbLinks++;
-        }
-    }
-    return nbLinks;
-}
-    
-void AnimationUpdateCallback::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++)
-                link(it->get());
-            _manager->buildTargetReference();
-        }
-    }
-}
-
-
-
 
 UpdateTransform::UpdateTransform(const UpdateTransform& apc,const osg::CopyOp& copyop) 
     : osg::Object(apc, copyop),
-      AnimationUpdateCallback(apc, copyop)
+      AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
 {
     _euler = new osgAnimation::Vec3Target(apc._euler->getValue());
@@ -75 +29 @@
 }
 
-UpdateTransform::UpdateTransform(const std::string& name) : AnimationUpdateCallback(name) 
+UpdateTransform::UpdateTransform(const std::string& name):
+    AnimationUpdateCallback<osg::NodeCallback>(name)
 {
     _euler = new osgAnimation::Vec3Target;
@@ -168 +123 @@
     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;
 }
+
+
+
+
+
+UpdateMaterial::UpdateMaterial(const UpdateMaterial& apc,const osg::CopyOp& copyop) 
+    : osg::Object(apc, copyop),
+      AnimationUpdateCallback<osg::StateAttribute::Callback>(apc, copyop)
+{
+    _diffuse = new osgAnimation::Vec4Target(apc._diffuse->getValue());
+}
+
+UpdateMaterial::UpdateMaterial(const std::string& name):
+    AnimationUpdateCallback<osg::StateAttribute::Callback>(name)
+{
+    _diffuse = new osgAnimation::Vec4Target(osg::Vec4(1,1,1,1));
+}
+
+/** Callback method called by the NodeVisitor when visiting a node.*/
+void UpdateMaterial::operator()(osg::StateAttribute* sa, osg::NodeVisitor* nv)
+{
+    if (nv && nv->getVisitorType() == osg::NodeVisitor::UPDATE_VISITOR)
+    {
+        osg::Material* material = dynamic_cast<osg::Material*>(sa);
+        if (material)
+            update(*material);
+    }
+}
+
+void UpdateMaterial::update(osg::Material& material) 
+{
+    osg::Vec4 diffuse = _diffuse->getValue();
+    material.setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
+}
+
+bool UpdateMaterial::needLink() const
+{
+    // the idea is to return true if nothing is linked
+    return (_diffuse->getCount() < 2);
+}
+
+bool UpdateMaterial::link(osgAnimation::Channel* channel)
+{
+    if (channel->getName().find("diffuse") != std::string::npos)
+    {
+        osgAnimation::Vec4LinearChannel* d = dynamic_cast<osgAnimation::Vec4LinearChannel*>(channel);
+        if (d) 
+        {
+            d->setTarget(_diffuse.get());
+            return true;
+        }
+    }
+    else 
+    {
+        osg::notify(osg::WARN) << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class " << className() << std::endl;
+    }
+    return false;
+}

OpenSceneGraph/trunk/src/osgPlugins/osgAnimation/ReaderWriter.cpp

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -1042 +1042 @@
 );
 
+
+
+bool UpdateMaterial_readLocalData(Object& obj, Input& fr) 
+{
+    bool iteratorAdvanced = false;
+    return iteratorAdvanced;
+}
+
+bool UpdateMaterial_writeLocalData(const Object& obj, Output& fw)
+{
+    return true;
+}
+
+RegisterDotOsgWrapperProxy g_UpdateMaterialProxy
+(
+    new osgAnimation::UpdateMaterial,
+    "osgAnimation::UpdateMaterial",
+    "Object StateAttribute::Callback osgAnimation::UpdateMaterial",
+    &UpdateMaterial_readLocalData,
+    &UpdateMaterial_writeLocalData,
+    DotOsgWrapper::READ_AND_WRITE
+);
+
 bool UpdateMorph_readLocalData(Object& obj, Input& fr) 
 {