From Cedric Pinson, "updated osgAnimation with the trunk here the update:
examples/osganimationviewer/AnimtkViewer.cpp: - add option to display bone (--drawbone) - dont crash if the file does not contains a AnimationManagerBase, display the content only examples/osganimationviewer/AnimtkViewerGUI.cpp: - adjust the path of image for the gui include/osgAnimation/Interpolator: - add warn message instead of old assert include/osgAnimation/Bone: src/osgAnimation/Skeleton.cpp: - change a method name to fit better with what it does. setMatrixInSkeletonSpace instead of setBoneInSkeletonSpace include/osgAnimation/Skinning: src/osgAnimation/RigGeometry.cpp: - add patch from Fabien Lavignotte to compute normal correctly include/osgAnimation/Sampler: - adjust behviour without assert, return 0 instead of crashing "
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#ifndef OSGANIMATION_INTERPOLATOR_H
|
||||
#define OSGANIMATION_INTERPOLATOR_H
|
||||
|
||||
#include <osg/Notify>
|
||||
#include <osgAnimation/Interpolator>
|
||||
#include <osgAnimation/Keyframe>
|
||||
|
||||
@@ -38,8 +39,12 @@ namespace osgAnimation
|
||||
{
|
||||
// todo use a cache
|
||||
int key_size = keys.size();
|
||||
if (!key_size) {
|
||||
osg::notify(osg::WARN) << "TemplateInterpolatorBase::getKeyIndexFromTime the container is empty, impossible to get key index from time" << std::endl;;
|
||||
return -1;
|
||||
}
|
||||
const TemplateKeyframe<KeyframeType>* keysVector = &keys.front();
|
||||
for (int i = 0; i < key_size-1; i++)
|
||||
for (int i = 0; i < key_size-1; i++)
|
||||
{
|
||||
float time0 = keysVector[i].getTime();
|
||||
float time1 = keysVector[i+1].getTime();
|
||||
@@ -50,9 +55,7 @@ namespace osgAnimation
|
||||
return i;
|
||||
}
|
||||
}
|
||||
std::cout << time << " first key " << keysVector[0].getTime() << " last key " << keysVector[key_size-1].getTime() << std::endl;
|
||||
*((int *)0) = 0;
|
||||
|
||||
osg::notify(osg::WARN) << time << " first key " << keysVector[0].getTime() << " last key " << keysVector[key_size-1].getTime() << std::endl;
|
||||
return -1;
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user