FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates osgAnimation

Browse Source 
This updates is mainly for the gles plugint to work correctly.

* adds Quaternion array
* reintroduces `KeyframeContainer::linearInterpolationDeduplicate`
* fixes MorphGeometry OSG serialization (target names)
This commit is contained in:
Marc Helbling
2016-07-01 17:04:09 +02:00
parent 7c0c98b504
commit 43443928d0
6 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgAnimation/Animation
View File

@@ -70,6 +70,7 @@ namespace osgAnimation
*/
void computeDuration();
double getDuration() const;
double computeDurationFromChannels() const;
void setWeight (float weight);
float getWeight() const;
@@ -87,8 +88,6 @@ namespace osgAnimation
~Animation() {}
double computeDurationFromChannels() const;
double _duration;
double _originalDuration;
float _weight;

33
include/osgAnimation/Keyframe
View File

@@ -68,6 +68,7 @@ namespace osgAnimation
public:
KeyframeContainer() {}
virtual unsigned int size() const = 0;
virtual unsigned int linearInterpolationDeduplicate() = 0;
protected:
~KeyframeContainer() {}
std::string _name;
@@ -83,7 +84,39 @@ namespace osgAnimation
typedef TemplateKeyframe<T> KeyType;
typedef typename osg::MixinVector< TemplateKeyframe<T> > VectorType;
virtual unsigned int size() const { return (unsigned int)osg::MixinVector<TemplateKeyframe<T> >::size(); }
virtual unsigned int linearInterpolationDeduplicate() {
if(size() <= 1) {
return 0;
}
typename VectorType::iterator keyframe = VectorType::begin(),
previous = VectorType::begin();
// 1. find number of consecutives identical keyframes
std::vector<unsigned int> intervalSizes;
unsigned int intervalSize = 1;
for(++ keyframe ; keyframe != VectorType::end() ; ++ keyframe, ++ previous, ++ intervalSize) {
if(!(previous->getValue() == keyframe->getValue())) {
intervalSizes.push_back(intervalSize);
intervalSize = 0;
}
}
intervalSizes.push_back(intervalSize);
// 2. build deduplicated list of keyframes
unsigned int cumul = 0;
VectorType deduplicated;
for(std::vector<unsigned int>::iterator iterator = intervalSizes.begin() ; iterator != intervalSizes.end() ; ++ iterator) {
deduplicated.push_back((*this)[cumul]);
if(*iterator > 1) {
deduplicated.push_back((*this)[cumul + (*iterator) - 1]);
}
cumul += *iterator;
}
unsigned int count = size() - deduplicated.size();
this->swap(deduplicated);
return count;
}
};
template <>