Changeset 10656 for OpenSceneGraph/trunk/include/osgAnimation/Channel

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/include/osgAnimation/Channel (modified) (2 diffs)

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