Changeset 10556 for OpenSceneGraph/trunk/src/osgPlugins/osgAnimation/ReaderWriter.cpp

Timestamp:

08/26/09 11:24:02 (4 years ago)

Author:

cedricpinson

Message:

From Michael Platings,
- Animations with equal priority are now weighted correctly relative to each other
- (minor) Channels no longer store their weight as the only time it's used is in update() when Animation can pass in the weight directly
From Cedric Pinson,
- I adjusted the quaternion blending to keep the commutativy property

Files:

• OpenSceneGraph/trunk/src/osgPlugins/osgAnimation/ReaderWriter.cpp (modified) (3 diffs)

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

@@ -147 +147 @@
     pChannel->setTargetName(target);
 
+// we dont need this info
     float weight = 1.0;
     if (fr.matchSequence("weight %f")) 
@@ -154 +155 @@
         iteratorAdvanced = true;
     }
-    pChannel->setWeight(weight);
+//    pChannel->setWeight(weight);
     return iteratorAdvanced;
 }
@@ -547 +548 @@
     fw.indent() << "target \"" << pChannel->getTargetName() << "\"" << std::endl;
 
-    fw.indent() << "weight " << pChannel->getWeight() << std::endl;
+//    fw.indent() << "weight " << pChannel->getWeight() << std::endl;
 
     ContainerType* kfc  = pChannel->getSamplerTyped()->getKeyframeContainerTyped();