Changeset 10656 for OpenSceneGraph/trunk/src/osgAnimation/AnimationManagerBase.cpp

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

Files:

• OpenSceneGraph/trunk/src/osgAnimation/AnimationManagerBase.cpp (modified) (5 diffs)

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(); }