diff --git a/include/osg/AnimationPath b/include/osg/AnimationPath index 15df5f685..9a6313d50 100644 --- a/include/osg/AnimationPath +++ b/include/osg/AnimationPath @@ -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), diff --git a/include/osg/BufferObject b/include/osg/BufferObject index a776dbcc8..c542e4121 100644 --- a/include/osg/BufferObject +++ b/include/osg/BufferObject @@ -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); diff --git a/include/osg/Callback b/include/osg/Callback index 30cd1aa6f..e81315f48 100644 --- a/include/osg/Callback +++ b/include/osg/Callback @@ -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); diff --git a/include/osg/Camera b/include/osg/Camera index 8a1272441..987549fd1 100644 --- a/include/osg/Camera +++ b/include/osg/Camera @@ -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); diff --git a/include/osg/Drawable b/include/osg/Drawable index 2ebefcc33..b7ad13f43 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -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); diff --git a/include/osg/Node b/include/osg/Node index 4476dde39..32ff5c3d2 100644 --- a/include/osg/Node +++ b/include/osg/Node @@ -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); diff --git a/include/osg/Object b/include/osg/Object index aee80a8be..28a3db472 100644 --- a/include/osg/Object +++ b/include/osg/Object @@ -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() {} diff --git a/include/osg/StateSet b/include/osg/StateSet index 6a7b204f0..7d35ea44e 100644 --- a/include/osg/StateSet +++ b/include/osg/StateSet @@ -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); diff --git a/include/osgAnimation/Action b/include/osgAnimation/Action index 162168c87..147091639 100644 --- a/include/osgAnimation/Action +++ b/include/osgAnimation/Action @@ -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); diff --git a/include/osgAnimation/MorphGeometry b/include/osgAnimation/MorphGeometry index 565e070f1..1a242efd7 100644 --- a/include/osgAnimation/MorphGeometry +++ b/include/osgAnimation/MorphGeometry @@ -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); diff --git a/include/osgAnimation/RigGeometry b/include/osgAnimation/RigGeometry index d4fd5a90a..74a5cf00f 100644 --- a/include/osgAnimation/RigGeometry +++ b/include/osgAnimation/RigGeometry @@ -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); diff --git a/include/osgAnimation/RigTransform b/include/osgAnimation/RigTransform index 750adad00..66ae0a219 100644 --- a/include/osgAnimation/RigTransform +++ b/include/osgAnimation/RigTransform @@ -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) diff --git a/include/osgAnimation/VertexInfluence b/include/osgAnimation/VertexInfluence index c385ea1a7..47941a43f 100644 --- a/include/osgAnimation/VertexInfluence +++ b/include/osgAnimation/VertexInfluence @@ -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(org), + osg::Object(org, copyop) + {} }; diff --git a/include/osgManipulator/Constraint b/include/osgManipulator/Constraint index 2e18cf8da..30efb3658 100644 --- a/include/osgManipulator/Constraint +++ b/include/osgManipulator/Constraint @@ -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); diff --git a/include/osgPresentation/AnimationMaterial b/include/osgPresentation/AnimationMaterial index ab4ff07e3..39d43786a 100644 --- a/include/osgPresentation/AnimationMaterial +++ b/include/osgPresentation/AnimationMaterial @@ -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), diff --git a/src/osg/ClusterCullingCallback.cpp b/src/osg/ClusterCullingCallback.cpp index 8c0e78002..b0b620bea 100644 --- a/src/osg/ClusterCullingCallback.cpp +++ b/src/osg/ClusterCullingCallback.cpp @@ -29,7 +29,10 @@ ClusterCullingCallback::ClusterCullingCallback(): } ClusterCullingCallback::ClusterCullingCallback(const ClusterCullingCallback& ccc,const CopyOp& copyop): - DrawableCullCallback(ccc,copyop), + Object(ccc, copyop), + Callback(ccc, copyop), + DrawableCullCallback(ccc, copyop), + NodeCallback(ccc, copyop), _controlPoint(ccc._controlPoint), _normal(ccc._normal), _radius(ccc._radius), diff --git a/src/osgAnimation/Action.cpp b/src/osgAnimation/Action.cpp index 4c89143a5..965608391 100644 --- a/src/osgAnimation/Action.cpp +++ b/src/osgAnimation/Action.cpp @@ -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; diff --git a/src/osgAnimation/AnimationManagerBase.cpp b/src/osgAnimation/AnimationManagerBase.cpp index da6b8b040..7e3255b18 100644 --- a/src/osgAnimation/AnimationManagerBase.cpp +++ b/src/osgAnimation/AnimationManagerBase.cpp @@ -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(); diff --git a/src/osgAnimation/BasicAnimationManager.cpp b/src/osgAnimation/BasicAnimationManager.cpp index a13eadfaf..c6ccd15e3 100644 --- a/src/osgAnimation/BasicAnimationManager.cpp +++ b/src/osgAnimation/BasicAnimationManager.cpp @@ -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) { } diff --git a/src/osgAnimation/MorphGeometry.cpp b/src/osgAnimation/MorphGeometry.cpp index 7d8213654..9735c06f9 100644 --- a/src/osgAnimation/MorphGeometry.cpp +++ b/src/osgAnimation/MorphGeometry.cpp @@ -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(apc, copyop) { } diff --git a/src/osgAnimation/TimelineAnimationManager.cpp b/src/osgAnimation/TimelineAnimationManager.cpp index 521d87854..8f313a7d6 100644 --- a/src/osgAnimation/TimelineAnimationManager.cpp +++ b/src/osgAnimation/TimelineAnimationManager.cpp @@ -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) diff --git a/src/osgAnimation/UpdateBone.cpp b/src/osgAnimation/UpdateBone.cpp index eb892a076..88f9115aa 100644 --- a/src/osgAnimation/UpdateBone.cpp +++ b/src/osgAnimation/UpdateBone.cpp @@ -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) { } diff --git a/src/osgAnimation/UpdateMaterial.cpp b/src/osgAnimation/UpdateMaterial.cpp index 0e7abdb62..0fa5b88f6 100644 --- a/src/osgAnimation/UpdateMaterial.cpp +++ b/src/osgAnimation/UpdateMaterial.cpp @@ -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(apc, copyop) { _diffuse = new osgAnimation::Vec4Target(apc._diffuse->getValue()); diff --git a/src/osgGA/CameraManipulator.cpp b/src/osgGA/CameraManipulator.cpp index a206e0f12..1423d077b 100644 --- a/src/osgGA/CameraManipulator.cpp +++ b/src/osgGA/CameraManipulator.cpp @@ -20,9 +20,7 @@ CameraManipulator::CameraManipulator() } -CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp) - : osg::Object(mm, copyOp), - osg::Callback(mm, copyOp), +CameraManipulator::CameraManipulator(const CameraManipulator& mm, const CopyOp& copyOp): inherited(mm, copyOp), _intersectTraversalMask(mm._intersectTraversalMask), _autoComputeHomePosition(mm._autoComputeHomePosition), diff --git a/src/osgGA/StandardManipulator.cpp b/src/osgGA/StandardManipulator.cpp index fcfbffb80..a8d8f13f7 100644 --- a/src/osgGA/StandardManipulator.cpp +++ b/src/osgGA/StandardManipulator.cpp @@ -47,9 +47,7 @@ StandardManipulator::StandardManipulator( int flags ) /// Constructor. -StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp ) - : osg::Object(uim, copyOp), - osg::Callback(uim, copyOp), +StandardManipulator::StandardManipulator( const StandardManipulator& uim, const CopyOp& copyOp ): inherited( uim, copyOp ), _thrown( uim._thrown ), _allowThrow( uim._allowThrow ), diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index f3f6b81d8..d88ba4c3f 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -883,6 +883,8 @@ SlideEventHandler::SlideEventHandler(osgViewer::Viewer* viewer): } SlideEventHandler::SlideEventHandler(const SlideEventHandler& seh,const osg::CopyOp& copyop): + osg::Object(seh, copyop), + osg::Callback(seh, copyop), osgGA::GUIEventHandler(seh,copyop), _viewer(seh._viewer), _activePresentation(seh._activePresentation), diff --git a/src/osgUI/Widget.cpp b/src/osgUI/Widget.cpp index 7da623bf9..1b9aafd13 100644 --- a/src/osgUI/Widget.cpp +++ b/src/osgUI/Widget.cpp @@ -40,7 +40,7 @@ Widget::Widget(): } Widget::Widget(const Widget& widget, const osg::CopyOp& copyop): - osg::Group(), + osg::Group(widget, copyop), _focusBehaviour(widget._focusBehaviour), _hasEventFocus(false), _graphicsInitialized(false), diff --git a/src/osgViewer/CompositeViewer.cpp b/src/osgViewer/CompositeViewer.cpp index 03fddadd5..d4b9a2567 100644 --- a/src/osgViewer/CompositeViewer.cpp +++ b/src/osgViewer/CompositeViewer.cpp @@ -30,8 +30,8 @@ CompositeViewer::CompositeViewer() constructorInit(); } -CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& /*copyop*/): - osg::Object(true), +CompositeViewer::CompositeViewer(const CompositeViewer& cv,const osg::CopyOp& copyop): + osg::Object(cv, copyop), ViewerBase(cv) { constructorInit(); diff --git a/src/osgViewer/View.cpp b/src/osgViewer/View.cpp index a04433404..2e7265aa9 100644 --- a/src/osgViewer/View.cpp +++ b/src/osgViewer/View.cpp @@ -177,7 +177,7 @@ View::View(): View::View(const osgViewer::View& view, const osg::CopyOp& copyop): - osg::Object(true), + osg::Object(view, copyop), osg::View(view,copyop), osgGA::GUIActionAdapter(), _startTick(0), diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index d27d228b7..aef8c7878 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -194,7 +194,7 @@ Viewer::Viewer(osg::ArgumentParser& arguments) } Viewer::Viewer(const osgViewer::Viewer& viewer, const osg::CopyOp& copyop): - osg::Object(true), + osg::Object(viewer, copyop), ViewerBase(viewer), View(viewer,copyop) { diff --git a/src/osgVolume/Property.cpp b/src/osgVolume/Property.cpp index 01fede11c..be261a8f6 100644 --- a/src/osgVolume/Property.cpp +++ b/src/osgVolume/Property.cpp @@ -369,7 +369,11 @@ PropertyAdjustmentCallback::PropertyAdjustmentCallback(): { } -PropertyAdjustmentCallback::PropertyAdjustmentCallback(const PropertyAdjustmentCallback& pac,const osg::CopyOp&): +PropertyAdjustmentCallback::PropertyAdjustmentCallback(const PropertyAdjustmentCallback& pac,const osg::CopyOp& copyop): + osg::Object(pac, copyop), + osg::Callback(pac, copyop), + osg::StateSet::Callback(pac, copyop), + osgGA::GUIEventHandler(pac, copyop), _cyleForwardKey(pac._cyleForwardKey), _cyleBackwardKey(pac._cyleBackwardKey), _transparencyKey(pac._transparencyKey),