Changeset 10599 for OpenSceneGraph/trunk/src/osgAnimation/MorphGeometry.cpp

Timestamp:

10/01/09 19:08:16 (4 years ago)

Author:

cedricpinson

Message:

From Michael Platings, In Target, the default constructor is explicitly called on _target. This is necessary for FloatTarget? and DoubleTarget? so that _target is initialised to 0, otherwise you get a junk value. In MorphGeometry?.cpp, UpdateMorph::link now links channels of the same index to the same target. Previously a new FloatTarget? was created for each channel, so multiple animations didn't work.

Files:

• OpenSceneGraph/trunk/src/osgAnimation/MorphGeometry.cpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgAnimation/MorphGeometry.cpp

@@ -262 +262 @@
     if (weightIndex >= 0)
     {
-      osgAnimation::FloatLinearChannel* fc = dynamic_cast<osgAnimation::FloatLinearChannel*>(channel);
-      if (fc)
-      {
-          osgAnimation::FloatTarget* ft = new osgAnimation::FloatTarget;
-          _weightTargets[weightIndex] = ft;
-          ft->setValue(-1);
-          fc->setTarget(ft);
-          return true;
-      }
-  }
+        osgAnimation::FloatLinearChannel* fc = dynamic_cast<osgAnimation::FloatLinearChannel*>(channel);
+        if (fc)
+        {
+            osgAnimation::FloatTarget* ft = _weightTargets[weightIndex].get();
+            if (ft == 0)
+            {
+                ft = new osgAnimation::FloatTarget;
+                _weightTargets[weightIndex] = ft;
+            }
+            fc->setTarget(ft);
+            return true;
+        }
+    }
     else
-  {
-      osg::notify(osg::WARN) << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << std::endl;
-  }
-  return false;
-}
+    {
+        osg::notify(osg::WARN) << "Channel " << channel->getName() << " does not contain a valid symbolic name for this class" << std::endl;
+    }
+    return false;
+}