From bc3998303037ef6c6440a165eb5ec5b636fd1d48 Mon Sep 17 00:00:00 2001 From: Cedric Pinson Date: Fri, 10 Apr 2009 15:30:02 +0000 Subject: [PATCH] From Cedric Pinson, remove unsused method in Bone class\nadd namespace osgAnimation for Timeline constructors\nadd OSGANIMATION_EXPORT on VertexInfluence and Timeline class --- include/osgAnimation/Bone | 2 -- include/osgAnimation/Timeline | 2 +- include/osgAnimation/VertexInfluence | 2 +- src/osgAnimation/Timeline.cpp | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/osgAnimation/Bone b/include/osgAnimation/Bone index 6fac97db2..af5f90241 100644 --- a/include/osgAnimation/Bone +++ b/include/osgAnimation/Bone @@ -223,8 +223,6 @@ namespace osgAnimation inline bool needToComputeBindMatrix() { return _needToRecomputeBindMatrix;} virtual void computeBindMatrix(); - bool needLink() const; - void setNeedToComputeBindMatrix(bool state) { _needToRecomputeBindMatrix = state; } /** Add Node to Group. diff --git a/include/osgAnimation/Timeline b/include/osgAnimation/Timeline index 130823f45..147dfef16 100644 --- a/include/osgAnimation/Timeline +++ b/include/osgAnimation/Timeline @@ -162,7 +162,7 @@ namespace osgAnimation }; - class Timeline : public osg::Object + class OSGANIMATION_EXPORT Timeline : public osg::Object { public: diff --git a/include/osgAnimation/VertexInfluence b/include/osgAnimation/VertexInfluence index 337e0d792..172bf79cd 100644 --- a/include/osgAnimation/VertexInfluence +++ b/include/osgAnimation/VertexInfluence @@ -52,7 +52,7 @@ namespace osgAnimation // this class manage VertexInfluence database by mesh // reference bones per vertex ... - class VertexInfluenceSet + class OSGANIMATION_EXPORT VertexInfluenceSet { public: typedef std::vector BoneToVertexList; diff --git a/src/osgAnimation/Timeline.cpp b/src/osgAnimation/Timeline.cpp index 2d6097f2a..5ab6b0d3c 100644 --- a/src/osgAnimation/Timeline.cpp +++ b/src/osgAnimation/Timeline.cpp @@ -18,7 +18,7 @@ using namespace osgAnimation; -Timeline::Timeline() +osgAnimation::Timeline::Timeline() { _lastUpdate = 0; _currentFrame = 0; @@ -32,7 +32,7 @@ Timeline::Timeline() setName("Timeline"); } -Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op) : osg::Object(nc, op), +osgAnimation::Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op) : osg::Object(nc, op), _actions(nc._actions) { _lastUpdate = 0;