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

4
include/osg/AnimationPath
View File

@@ -229,7 +229,9 @@ class OSG_EXPORT AnimationPathCallback : public NodeCallback
_pauseTime(0.0) {}
AnimationPathCallback(const AnimationPathCallback& apc,const CopyOp& copyop):
NodeCallback(apc,copyop),
Object(apc, copyop),
Callback(apc, copyop),
NodeCallback(apc, copyop),
_animationPath(apc._animationPath),
_pivotPoint(apc._pivotPoint),
_useInverseMatrix(apc._useInverseMatrix),

3
include/osg/BufferObject
View File

@@ -533,7 +533,8 @@ class OSG_EXPORT BufferData : public Object
{
ModifiedCallback() {}
ModifiedCallback(const ModifiedCallback&,const CopyOp&) {}
ModifiedCallback(const ModifiedCallback& org, const CopyOp& copyop) :
Object(org, copyop) {}
META_Object(osg,ModifiedCallback);

23
include/osg/Callback
View File

@@ -213,7 +213,8 @@ class OSG_EXPORT NodeCallback : public virtual Callback {
NodeCallback(){}
NodeCallback(const NodeCallback& nc,const CopyOp& copyop):
Callback(nc,copyop) {}
Object(nc, copyop),
Callback(nc, copyop) {}
META_Object(osg,NodeCallback);
@@ -240,7 +241,9 @@ class OSG_EXPORT StateAttributeCallback : public virtual osg::Callback
public:
StateAttributeCallback() {}
StateAttributeCallback(const StateAttributeCallback&,const CopyOp&) {}
StateAttributeCallback(const StateAttributeCallback& org,const CopyOp& copyop) :
Object(org, copyop),
Callback(org, copyop) {}
META_Object(osg,StateAttributeCallback);
@@ -263,7 +266,9 @@ class OSG_EXPORT UniformCallback : public virtual osg::Callback
public:
UniformCallback() {}
UniformCallback(const UniformCallback&, const CopyOp&) {}
UniformCallback(const UniformCallback& org, const CopyOp& copyop) :
Object(org, copyop),
Callback(org, copyop) {}
META_Object(osg, UniformCallback);
@@ -288,7 +293,9 @@ class OSG_EXPORT DrawableUpdateCallback : public virtual Callback
public:
DrawableUpdateCallback() {}
DrawableUpdateCallback(const DrawableUpdateCallback&,const CopyOp&) {}
DrawableUpdateCallback(const DrawableUpdateCallback& org,const CopyOp& copyop):
Object(org, copyop),
Callback(org, copyop) {}
META_Object(osg,DrawableUpdateCallback);
@@ -308,7 +315,9 @@ class OSG_EXPORT DrawableEventCallback : public virtual Callback
public:
DrawableEventCallback() {}
DrawableEventCallback(const DrawableEventCallback&,const CopyOp&) {}
DrawableEventCallback(const DrawableEventCallback& org, const CopyOp& copyop) :
Object(org, copyop),
Callback(org, copyop) {}
META_Object(osg,DrawableEventCallback);
@@ -327,7 +336,9 @@ class OSG_EXPORT DrawableCullCallback : public virtual Callback
public:
DrawableCullCallback() {}
DrawableCullCallback(const DrawableCullCallback&,const CopyOp&) {}
DrawableCullCallback(const DrawableCullCallback& org, const CopyOp& copyop) :
Object(org, copyop),
Callback(org, copyop) {}
META_Object(osg,DrawableCullCallback);

3
include/osg/Camera
View File

@@ -590,7 +590,8 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
{
DrawCallback() {}
DrawCallback(const DrawCallback&,const CopyOp&) {}
DrawCallback(const DrawCallback& org,const CopyOp& copyop):
Object(org, copyop) {}
META_Object(osg, DrawCallback);

6
include/osg/Drawable
View File

@@ -168,7 +168,8 @@ class OSG_EXPORT Drawable : public Node
{
ComputeBoundingBoxCallback() {}
ComputeBoundingBoxCallback(const ComputeBoundingBoxCallback&,const CopyOp&) {}
ComputeBoundingBoxCallback(const ComputeBoundingBoxCallback& org,const CopyOp& copyop):
Object(org, copyop) {}
META_Object(osg,ComputeBoundingBoxCallback);
@@ -285,7 +286,8 @@ class OSG_EXPORT Drawable : public Node
{
DrawCallback() {}
DrawCallback(const DrawCallback&,const CopyOp&) {}
DrawCallback(const DrawCallback& org,const CopyOp& copyop):
Object(org, copyop) {}
META_Object(osg,DrawCallback);

3
include/osg/Node
View File

@@ -447,7 +447,8 @@ class OSG_EXPORT Node : public Object
{
ComputeBoundingSphereCallback() {}
ComputeBoundingSphereCallback(const ComputeBoundingSphereCallback&,const CopyOp&) {}
ComputeBoundingSphereCallback(const ComputeBoundingSphereCallback& org,const CopyOp& copyop):
Object(org, copyop) {}
META_Object(osg,ComputeBoundingSphereCallback);

4
include/osg/Object
View File

@@ -367,7 +367,9 @@ class DummyObject : public osg::Object
{
public:
DummyObject() {}
DummyObject(const DummyObject&, const osg::CopyOp&) {}
DummyObject(const DummyObject& org, const CopyOp& copyop) :
Object(org, copyop) {}
META_Object(osg, DummyObject)
protected:
virtual ~DummyObject() {}

4
include/osg/StateSet
View File

@@ -438,7 +438,9 @@ class OSG_EXPORT StateSet : public Object
{
Callback() {}
Callback(const Callback&,const CopyOp&) {}
Callback(const Callback& org,const CopyOp& copyop):
osg::Object(org, copyop),
osg::Callback(org, copyop) {}
META_Object(osg,Callback);

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)
{}
};

4
include/osgManipulator/Constraint
View File

@@ -38,8 +38,8 @@ class DraggerCallback : virtual public osg::Object
DraggerCallback():
osg::Object(true) {}
DraggerCallback(const DraggerCallback&, const osg::CopyOp& /*copyop*/ = osg::CopyOp::SHALLOW_COPY):
osg::Object(true) {}
DraggerCallback(const DraggerCallback& org, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY):
osg::Object(org, copyop) {}
META_Object(osgManipulator, DraggerCallback);

2
include/osgPresentation/AnimationMaterial
View File

@@ -104,6 +104,8 @@ class OSGPRESENTATION_EXPORT AnimationMaterialCallback : public osg::NodeCallbac
AnimationMaterialCallback(const AnimationMaterialCallback& apc,const osg::CopyOp& copyop):
osg::Object(apc, copyop),
osg::Callback(apc, copyop),
osg::NodeCallback(apc,copyop),
_animationMaterial(apc._animationMaterial),
_useInverseMatrix(apc._useInverseMatrix),