From Fabien Lavignotte, "Here is some various small fixes i have done while playing with
osgAnimation. - Animation : removed the _name attribute that is never used. - BasicAnimationManager : fix a crash on Windows with the example osganimationviewer. The _lastUpdate attribute was not initialized when using copy constructor. - CMakeLists.txt : add RigGeometry to the headers list"
This commit is contained in:
@@ -84,7 +84,6 @@ namespace osgAnimation
|
||||
|
||||
~Animation() {}
|
||||
|
||||
std::string _name;
|
||||
double _duration;
|
||||
double _originalDuration;
|
||||
float _weight;
|
||||
|
||||
@@ -29,7 +29,7 @@ namespace osgAnimation
|
||||
META_Object(osgAnimation, BasicAnimationManager);
|
||||
|
||||
BasicAnimationManager();
|
||||
BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY) : AnimationManagerBase(b,copyop) {}
|
||||
BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
|
||||
virtual ~BasicAnimationManager();
|
||||
|
||||
void update (double time);
|
||||
|
||||
@@ -17,7 +17,20 @@
|
||||
|
||||
using namespace osgAnimation;
|
||||
|
||||
BasicAnimationManager::~BasicAnimationManager() {}
|
||||
BasicAnimationManager::BasicAnimationManager()
|
||||
: _lastUpdate(0.0)
|
||||
{
|
||||
}
|
||||
|
||||
BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop)
|
||||
: AnimationManagerBase(b,copyop)
|
||||
, _lastUpdate(0.0)
|
||||
{
|
||||
}
|
||||
|
||||
BasicAnimationManager::~BasicAnimationManager()
|
||||
{
|
||||
}
|
||||
|
||||
void BasicAnimationManager::stopAll()
|
||||
{
|
||||
@@ -31,10 +44,6 @@ void BasicAnimationManager::stopAll()
|
||||
_animationsPlaying.clear();
|
||||
}
|
||||
|
||||
BasicAnimationManager::BasicAnimationManager()
|
||||
{
|
||||
_lastUpdate = 0;
|
||||
}
|
||||
void BasicAnimationManager::playAnimation(Animation* pAnimation, int priority, float weight)
|
||||
{
|
||||
if (!findAnimation(pAnimation))
|
||||
|
||||
@@ -31,6 +31,7 @@ SET(LIB_PUBLIC_HEADERS
|
||||
${HEADER_PATH}/EaseMotion
|
||||
${HEADER_PATH}/Assert
|
||||
${HEADER_PATH}/Timeline
|
||||
${HEADER_PATH}/RigGeometry
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user