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

Merge branch 'Submissions2e' of https://github.com/LaurensVoerman/OpenSceneGraph into LaurensVoerman-Submissions2e

Browse Source
This commit is contained in:
Robert Osfield
2016-09-02 18:26:11 +01:00
parent c19b271586 628f8fd9dc
commit 79ff8ba273
31 changed files with 89 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/osgAnimation/Action.cpp
View File

@@ -24,7 +24,8 @@ Action::Action()
_loop = 1;
_state = Stop;
}
Action::Action(const Action&rhs,const osg::CopyOp&)
Action::Action(const Action&rhs,const osg::CopyOp& copyop):
osg::Object(rhs, copyop)
{
_numberFrame = rhs._numberFrame;
_fps = rhs._fps;

2
src/osgAnimation/AnimationManagerBase.cpp
View File

@@ -63,8 +63,6 @@ void AnimationManagerBase::operator()(osg::Node* node, osg::NodeVisitor* nv)
AnimationManagerBase::AnimationManagerBase(const AnimationManagerBase& b, const osg::CopyOp& copyop) :
osg::Object(b,copyop),
osg::Callback(b,copyop),
osg::NodeCallback(b,copyop) // TODO check this
{
const AnimationList& animationList = b.getAnimationList();

8
src/osgAnimation/BasicAnimationManager.cpp
View File

@@ -22,7 +22,7 @@ BasicAnimationManager::BasicAnimationManager()
{
}
BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) :
BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, const osg::CopyOp& copyop) :
osg::Object(b, copyop),
osg::Callback(b, copyop),
AnimationManagerBase(b,copyop),
@@ -31,8 +31,10 @@ BasicAnimationManager::BasicAnimationManager(const BasicAnimationManager& b, con
}
BasicAnimationManager::BasicAnimationManager(const AnimationManagerBase& b, const osg::CopyOp& copyop)
: AnimationManagerBase(b,copyop)
, _lastUpdate(0.0)
: osg::Object(b, copyop),
osg::Callback(b, copyop),
AnimationManagerBase(b,copyop),
_lastUpdate(0.0)
{
}

1
src/osgAnimation/MorphGeometry.cpp
View File

@@ -198,6 +198,7 @@ void MorphGeometry::transformSoftwareMethod()
UpdateMorph::UpdateMorph(const UpdateMorph& apc,const osg::CopyOp& copyop) :
osg::Object(apc, copyop),
osg::Callback(apc, copyop),
AnimationUpdateCallback<osg::NodeCallback>(apc, copyop)
{
}

7
src/osgAnimation/TimelineAnimationManager.cpp
View File

@@ -27,9 +27,12 @@ TimelineAnimationManager::TimelineAnimationManager(const AnimationManagerBase& m
_timeline = new Timeline;
}
TimelineAnimationManager::TimelineAnimationManager(const TimelineAnimationManager& nc,const osg::CopyOp& co) : AnimationManagerBase(nc, co)
TimelineAnimationManager::TimelineAnimationManager(const TimelineAnimationManager& nc,const osg::CopyOp& co):
osg::Object(nc,co),
osg::Callback(nc,co),
AnimationManagerBase(nc, co)
{
_timeline = new Timeline(*nc.getTimeline());
_timeline = new Timeline(*nc.getTimeline(), co);
}
void TimelineAnimationManager::update(double time)

2
src/osgAnimation/UpdateBone.cpp
View File

@@ -23,7 +23,7 @@ UpdateBone::UpdateBone(const std::string& name) : UpdateMatrixTransform(name)
{
}
UpdateBone::UpdateBone(const UpdateBone& apc,const osg::CopyOp& copyop) : osg::Object(apc,copyop), UpdateMatrixTransform(apc, copyop)
UpdateBone::UpdateBone(const UpdateBone& apc,const osg::CopyOp& copyop) : osg::Object(apc,copyop), osg::Callback(apc, copyop), UpdateMatrixTransform(apc, copyop)
{
}

1
src/osgAnimation/UpdateMaterial.cpp
View File

@@ -19,6 +19,7 @@ using namespace osgAnimation;
UpdateMaterial::UpdateMaterial(const UpdateMaterial& apc,const osg::CopyOp& copyop)
: osg::Object(apc, copyop),
osg::Callback(apc,copyop),
AnimationUpdateCallback<osg::StateAttributeCallback>(apc, copyop)
{
_diffuse = new osgAnimation::Vec4Target(apc._diffuse->getValue());