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

Merge pull request #123 from LaurensVoerman/Submissions2f

Browse Source 
Submissions2f
This commit is contained in:
OpenSceneGraph git repository 2016-09-02 17:44:57 +01:00 committed by GitHub
commit 14bdadaf86
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgAnimation/BasicAnimationManager
View File

@ -29,6 +29,7 @@ namespace osgAnimation
META_Object(osgAnimation, BasicAnimationManager); META_Object(osgAnimation, BasicAnimationManager);
BasicAnimationManager(); BasicAnimationManager();
BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY);
virtual ~BasicAnimationManager(); virtual ~BasicAnimationManager();

8
src/osgAnimation/BasicAnimationManager.cpp
View File

@ -22,6 +22,14 @@ BasicAnimationManager::BasicAnimationManager()
{ {
} }
BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) :
osg::Object(b, copyop),
osg::Callback(b, copyop),
AnimationManagerBase(b,copyop),
_lastUpdate(0.0)
{
}
BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop) BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop)
: AnimationManagerBase(b,copyop) : AnimationManagerBase(b,copyop)
, _lastUpdate(0.0) , _lastUpdate(0.0)