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

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),

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;

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();

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

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<osg::NodeCallback>(apc, copyop)
 {
 }

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)

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

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<osg::StateAttributeCallback>(apc, copyop)
 {
     _diffuse = new osgAnimation::Vec4Target(apc._diffuse->getValue());

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),

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 ),

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),

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),

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();

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),

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

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),