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

added call to copy constructor for virtual base classes in copy constructor of derived classes, removed these for abstract classes

Browse Source
This commit is contained in:
Laurens Voerman
2016-08-29 10:41:40 +02:00
parent 2bdf56cb4b
commit 628f8fd9dc
31 changed files with 88 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgAnimation/Action
View File

@@ -41,7 +41,8 @@ namespace osgAnimation
{
public:
Callback(){}
Callback(const Callback& nc,const osg::CopyOp&) :
Callback(const Callback& nc,const osg::CopyOp& copyop) :
osg::Object(nc, copyop),
_nestedCallback(nc._nestedCallback) {}
META_Object(osgAnimation,Callback);

5
include/osgAnimation/MorphGeometry
View File

@@ -182,7 +182,10 @@ namespace osgAnimation
{
UpdateMorphGeometry() {}
UpdateMorphGeometry(const UpdateMorphGeometry&, const osg::CopyOp&) {}
UpdateMorphGeometry(const UpdateMorphGeometry& org, const osg::CopyOp& copyop):
osg::Object(org, copyop),
osg::Callback(org, copyop),
osg::DrawableUpdateCallback(org, copyop) {}
META_Object(osgAnimation, UpdateMorphGeometry);

5
include/osgAnimation/RigGeometry
View File

@@ -128,7 +128,10 @@ namespace osgAnimation
{
UpdateRigGeometry() {}
UpdateRigGeometry(const UpdateRigGeometry&, const osg::CopyOp&) {}
UpdateRigGeometry(const UpdateRigGeometry& org, const osg::CopyOp& copyop):
osg::Object(org, copyop),
osg::Callback(org, copyop),
osg::DrawableUpdateCallback(org, copyop) {}
META_Object(osgAnimation, UpdateRigGeometry);

3
include/osgAnimation/RigTransform
View File

@@ -26,7 +26,8 @@ namespace osgAnimation
{
public:
RigTransform() {}
RigTransform(const RigTransform&, const osg::CopyOp&) {}
RigTransform(const RigTransform& org, const osg::CopyOp& copyop):
osg::Object(org, copyop) {}
META_Object(osgAnimation,RigTransform)

5
include/osgAnimation/VertexInfluence
View File

@@ -44,7 +44,10 @@ namespace osgAnimation
META_Object(osgAnimation, VertexInfluenceMap);
VertexInfluenceMap() {}
VertexInfluenceMap(const osgAnimation::VertexInfluenceMap&, const osg::CopyOp&) {}
VertexInfluenceMap(const osgAnimation::VertexInfluenceMap& org, const osg::CopyOp& copyop):
std::map<std::string, VertexInfluence>(org),
osg::Object(org, copyop)
{}
};