Show
Ignore:
Timestamp:
08/26/09 11:24:02 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/osgAnimation/ReaderWriter.cpp

    r10518 r10556  
    147147    pChannel->setTargetName(target); 
    148148 
     149// we dont need this info 
    149150    float weight = 1.0; 
    150151    if (fr.matchSequence("weight %f"))  
     
    154155        iteratorAdvanced = true; 
    155156    } 
    156     pChannel->setWeight(weight); 
     157//    pChannel->setWeight(weight); 
    157158    return iteratorAdvanced; 
    158159} 
     
    547548    fw.indent() << "target \"" << pChannel->getTargetName() << "\"" << std::endl; 
    548549 
    549     fw.indent() << "weight " << pChannel->getWeight() << std::endl; 
     550//    fw.indent() << "weight " << pChannel->getWeight() << std::endl; 
    550551 
    551552    ContainerType* kfc  = pChannel->getSamplerTyped()->getKeyframeContainerTyped();