Changeset 10656

Timestamp:

10/21/09 17:45:13 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, this commit contains the following change:
* Change ref_ptr to observer_ptr to avoid cross reference and leak in Skinning
* Set invalidate to true to re run the check visitor in Skeleton
* Shallow copy Sampler in channel copy constructor
* Add accessor in VertexInfluence?
* Remove dead code in Timeline.cpp
* Dont force linking in Bone::UpdateBone?, the decision is done by the user or the manager
* Add offset in timeline stats to display each manager on the screen
* Add a flag in animation manager base to enable or not automatic link when modifying the manager

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/AnimationManagerBase (modified) (2 diffs)
• include/osgAnimation/Channel (modified) (2 diffs)
• include/osgAnimation/Skeleton (modified) (1 diff)
• include/osgAnimation/Skinning (modified) (2 diffs)
• include/osgAnimation/VertexInfluence (modified) (2 diffs)
• src/osgAnimation/Animation.cpp (modified) (1 diff)
• src/osgAnimation/AnimationManagerBase.cpp (modified) (5 diffs)
• src/osgAnimation/Bone.cpp (modified) (2 diffs)
• src/osgAnimation/StatsHandler.cpp (modified) (2 diffs)
• src/osgAnimation/Timeline.cpp (modified) (1 diff)
• src/osgAnimation/VertexInfluence.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/include/osgAnimation/AnimationManagerBase

@@ -45 +45 @@
         virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
 
-        /// Operation that must be done each frame
+        /** Reset the value of targets
+            this Operation must be done each frame */
         void clearTargets();
+        
 
         LinkVisitor* getOrCreateLinkVisitor();
         void setLinkVisitor(LinkVisitor*);
+
+        /// set a flag to define the behaviour
+        void setAutomaticLink(bool);
+        bool isAutomaticLink() const;
+
+        void dirty();
 
     protected:
@@ -57 +65 @@
         TargetSet _targets;
         bool _needToLink;
+        bool _automaticLink;
     };
 }

OpenSceneGraph/trunk/include/osgAnimation/Channel

@@ -78 +78 @@
 
         TemplateChannel (const TemplateChannel& channel) :
-            Channel(channel),
-            _target(new TargetType(*channel.getTargetTyped())),
-            _sampler(channel._sampler.get())
+            Channel(channel)
         {
+            if (channel.getTargetTyped())
+                _target = new TargetType(*channel.getTargetTyped());
+
+            if (channel.getSamplerTyped())
+                _sampler = new SamplerType(*channel.getSamplerTyped());
         }
 
@@ -103 +106 @@
             typename KeyframeContainerType::KeyType key(0, _target->getValue());
             // recreate the keyframe container
-            _sampler = 0;
+            getOrCreateSampler()->setKeyframeContainer(0);
             getOrCreateSampler()->getOrCreateKeyframeContainer();
             // add the key

OpenSceneGraph/trunk/include/osgAnimation/Skeleton

@@ -33 +33 @@
             META_Object(osgAnimation, UpdateSkeleton);
             UpdateSkeleton() : _needValidate(true) {}
-            UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : osg::Object(us, copyop), osg::NodeCallback(us, copyop) {}
+            UpdateSkeleton(const UpdateSkeleton& us, const osg::CopyOp& copyop= osg::CopyOp::SHALLOW_COPY) : osg::Object(us, copyop), osg::NodeCallback(us, copyop) { _needValidate = true;}
             virtual void operator()(osg::Node* node, osg::NodeVisitor* nv);
 

OpenSceneGraph/trunk/include/osgAnimation/Skinning

@@ -47 +47 @@
         public:
             BoneWeight(BoneType* bone, float weight) : _bone(bone), _weight(weight) {}
-            const BoneType* getBone() const { return &(*_bone); }
+            const BoneType* getBone() const { return _bone.get(); }
             float getWeight() const { return _weight; }
             void setWeight(float w) { _weight = w; }
         protected:
-            osg::ref_ptr<BoneType> _bone;
+            osg::observer_ptr<BoneType> _bone;
             float _weight;
         };
@@ -192 +192 @@
                 const VertexList& vertexes = uniq.getVertexes();
                 int vertexSize = vertexes.size();
-                for (int j = 0; j < vertexSize; j++) 
+                for (int j = 0; j < vertexSize; j++)
                 {
                     int idx = vertexes[j];

OpenSceneGraph/trunk/include/osgAnimation/VertexInfluence

@@ -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  
@@ -97 +97 @@
             _uniqVertexSetToBoneSet.clear();
         }
+
+        const VertexIndexToBoneWeightMap& getVertexToBoneList() const;
     protected:
         BoneToVertexList _bone2Vertexes;

OpenSceneGraph/trunk/src/osgAnimation/Animation.cpp

@@ -134 +134 @@
     }
 
-    //  std::cout << "t " << t << " / " << _duration << std::endl;
-
     ChannelList::const_iterator chan;
     for( chan=_channels.begin(); chan!=_channels.end(); ++chan)

OpenSceneGraph/trunk/src/osgAnimation/AnimationManagerBase.cpp

@@ -24 +24 @@
 {
     _needToLink = false;
+    _automaticLink = true;
 }
 
@@ -31 +32 @@
         (*it).get()->reset();
 }
+
+void AnimationManagerBase::dirty()
+{
+    _needToLink = true;
+}
+
+void AnimationManagerBase::setAutomaticLink(bool state) { _automaticLink = state; }
+bool AnimationManagerBase::isAutomaticLink() const { return _automaticLink; }
 
 void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
@@ -65 +74 @@
     }
     _needToLink = true;
+    _automaticLink = b._automaticLink;
     buildTargetReference();
 }
@@ -71 +81 @@
 {
     _targets.clear();
-    for( AnimationList::iterator iterAnim = _animations.begin(); iterAnim != _animations.end(); ++iterAnim ) 
+    for( AnimationList::iterator iterAnim = _animations.begin(); iterAnim != _animations.end(); ++iterAnim )
     {
         Animation* anim = (*iterAnim).get();
@@ -99 +109 @@
 }
 
-bool AnimationManagerBase::needToLink() const { return _needToLink; }
+bool AnimationManagerBase::needToLink() const { return _needToLink && isAutomaticLink(); }
 
 

OpenSceneGraph/trunk/src/osgAnimation/Bone.cpp

@@ -70 +70 @@
         }
 
-        if (!_manager.valid())
-        {
-            FindParentAnimationManagerVisitor finder;
-
-            if (b->getParents().size() > 1)
-            {
-                osg::notify(osg::WARN) << "A Bone should not have multi parent ( " << b->getName() << " ) has parents ";
-                osg::notify(osg::WARN) << "( " << b->getParents()[0]->getName();
-                for (int i = 1; i < (int)b->getParents().size(); i++)
-                    osg::notify(osg::WARN) << ", " << b->getParents()[i]->getName();
-                osg::notify(osg::WARN) << ")" << std::endl;
-                return;
-            }
-            b->getParents()[0]->accept(finder);
-
-            if (!finder.getAnimationManager())
-            {
-                osg::notify(osg::WARN) << "Warning can't update Bone, path to parent AnimationManagerBase not found" << std::endl;
-                return;
-            }
-
-            _manager = finder.getAnimationManager();
-        }
-
-        updateLink();
         update(*b);
 
@@ -118 +93 @@
     _boneInSkeletonSpace(b._boneInSkeletonSpace)
 {
-#if 0
-    osg::ref_ptr<osg::NodeCallback> updatecallback = getUpdateCallback();
-    setUpdateCallback(0);
-    while (updatecallback.valid()) {
-        osg::NodeCallback* ucb = dynamic_cast<osg::NodeCallback*>(updatecallback->clone(copyop));
-        ucb->setNestedCallback(0);
-        addUpdateCallback(ucb);
-        updatecallback = updatecallback->getNestedCallback();
-    }
-#endif
 }
 

OpenSceneGraph/trunk/src/osgAnimation/StatsHandler.cpp

@@ -564 +564 @@
 
                     for (int i = 0; i < (int)finder._timelines.size(); i++)
-                        statsList.push_back(finder._timelines[0]->getStats());
+                        statsList.push_back(finder._timelines[i]->getStats());
 
                     for(int i = statsList[0]->getEarliestFrameNumber(); i<= statsList[0]->getLatestFrameNumber()-1; ++i)
@@ -654 +654 @@
         osg::MatrixTransform* m = s->createStatsForTimeline(finder._timelines[i].get());
         m->setUpdateCallback(s);
+        m->setMatrix(osg::Matrix::translate(0, -i * 100, 0));
         _group->addChild(m);
     }

OpenSceneGraph/trunk/src/osgAnimation/Timeline.cpp

@@ -202 +202 @@
 {
     _actions[priority].insert(_actions[priority].begin(), ftl);
-//    _actions[priority].push_back(ftl);
-}
-
-#if 0
-void osgAnimation::Timeline::evaluateCallback(unsigned int frame)
-{
-    // update from high priority to low priority
-    for( ActionLayers::reverse_iterator iterAnim = _actions.rbegin(); iterAnim != _actions.rend(); ++iterAnim )
-    {
-        // update all animation
-        ActionList& list = iterAnim->second;
-        for (unsigned int i = 0; i < list.size(); i++)
-        {
-            unsigned int firstFrame = list[i].first;
-            Action* action = list[i].second.get();
-            // check if current frame of timeline hit an action interval
-            if (frame >= firstFrame && 
-                frame < (firstFrame + action->getNumFrames()) )
-                action->evaluateCallback(frame - firstFrame);
-        }
-    }
-    processPendingOperation();
-}
-#endif
+}
 
 bool osgAnimation::Timeline::isActive(Action* activeAction)

OpenSceneGraph/trunk/src/osgAnimation/VertexInfluence.cpp

@@ -14 +14 @@
 
 #include <osgAnimation/VertexInfluence>
+#include <osg/Notify>
 #include <iostream>
 #include <algorithm>
@@ -19 +20 @@
 using namespace osgAnimation;
 
+const osgAnimation::VertexInfluenceSet::VertexIndexToBoneWeightMap& osgAnimation::VertexInfluenceSet::getVertexToBoneList() const { return _vertex2Bones;}
 // this class manage VertexInfluence database by mesh
 // reference bones per vertex ...
@@ -34 +36 @@
             float weight = viw.second;
             if (vi.getName().empty())
-                std::cout << "osgAnimation::VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
+                osg::notify(osg::WARN) << "osgAnimation::VertexInfluenceSet::buildVertex2BoneList warning vertex " << index << " is not assigned to a bone" << std::endl;
             _vertex2Bones[index].push_back(BoneWeight(vi.getName(), weight));
         }
@@ -40 +42 @@
 
     // normalize weight per vertex
-    for (VertexIndexToBoneWeightMap::iterator it = _vertex2Bones.begin(); it != _vertex2Bones.end(); it++) 
+    for (VertexIndexToBoneWeightMap::iterator it = _vertex2Bones.begin(); it != _vertex2Bones.end(); it++)
     {
         BoneWeightList& bones = it->second;
@@ -49 +51 @@
         if (sum < 1e-4) 
         {
-            std::cerr << "VertexInfluenceSet::buildVertex2BoneList warning the vertex " << it->first << " seems to have 0 weight, skip normalize for this vertex" << std::endl;
+            osg::notify(osg::WARN) << "VertexInfluenceSet::buildVertex2BoneList warning the vertex " << it->first << " seems to have 0 weight, skip normalize for this vertex" << std::endl;
         }
         else