From 8a83bd73bbcbaa6cf418f93fdaefc4bc1a942bda Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Jun 2016 11:39:11 +0100 Subject: [PATCH] Added missing initializers --- include/osgPresentation/AnimationMaterial | 1 + include/osgPresentation/SlideEventHandler | 3 ++- src/osgPresentation/SlideEventHandler.cpp | 33 +++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/include/osgPresentation/AnimationMaterial b/include/osgPresentation/AnimationMaterial index c1b15da92..ab4ff07e3 100644 --- a/include/osgPresentation/AnimationMaterial +++ b/include/osgPresentation/AnimationMaterial @@ -94,6 +94,7 @@ class OSGPRESENTATION_EXPORT AnimationMaterialCallback : public osg::NodeCallbac public: AnimationMaterialCallback(): + _useInverseMatrix(false), _timeOffset(0.0), _timeMultiplier(1.0), _firstTime(DBL_MAX), diff --git a/include/osgPresentation/SlideEventHandler b/include/osgPresentation/SlideEventHandler index 6f41310dd..ed8089e49 100644 --- a/include/osgPresentation/SlideEventHandler +++ b/include/osgPresentation/SlideEventHandler @@ -330,6 +330,8 @@ public: SlideEventHandler(osgViewer::Viewer* viewer=0); + SlideEventHandler(const SlideEventHandler& seh,const osg::CopyOp& copyop); + static SlideEventHandler* instance(); META_Object(osgPresentation,SlideEventHandler); @@ -411,7 +413,6 @@ public: protected: ~SlideEventHandler() {} - SlideEventHandler(const SlideEventHandler&,const osg::CopyOp&) {} bool home(const osgGA::GUIEventAdapter& ea,osgGA::GUIActionAdapter& aa); diff --git a/src/osgPresentation/SlideEventHandler.cpp b/src/osgPresentation/SlideEventHandler.cpp index 0702eafd4..14556344d 100644 --- a/src/osgPresentation/SlideEventHandler.cpp +++ b/src/osgPresentation/SlideEventHandler.cpp @@ -853,6 +853,7 @@ public: // SlideEventHandler::SlideEventHandler(osgViewer::Viewer* viewer): _viewer(viewer), + _activePresentation(0), _presentationSwitch(0), _activeSlide(0), _slideSwitch(0), @@ -881,6 +882,38 @@ SlideEventHandler::SlideEventHandler(osgViewer::Viewer* viewer): s_seh = this; } +SlideEventHandler::SlideEventHandler(const SlideEventHandler& seh,const osg::CopyOp& copyop): + osgGA::GUIEventHandler(seh,copyop), + _viewer(seh._viewer), + _activePresentation(seh._activePresentation), + _presentationSwitch(seh._presentationSwitch), + _activeSlide(seh._activeSlide), + _slideSwitch(seh._slideSwitch), + _activeLayer(seh._activeLayer), + _firstTraversal(true), + _referenceTime(seh._referenceTime), + _previousTime(seh._previousTime), + _timePerSlide(seh._timePerSlide), + _autoSteppingActive(seh._autoSteppingActive), + _loopPresentation(seh._loopPresentation), + _pause(seh._pause), + _hold(seh._hold), + _updateLightActive(seh._updateLightActive), + _updateOpacityActive(seh._updateOpacityActive), + _previousX(seh._previousX), _previousY(seh._previousY), + _cursorOn(seh._cursorOn), + _releaseAndCompileOnEachNewSlide(seh._releaseAndCompileOnEachNewSlide), + _firstSlideOrLayerChange(seh._firstSlideOrLayerChange), + _tickAtFirstSlideOrLayerChange(seh._tickAtFirstSlideOrLayerChange), + _tickAtLastSlideOrLayerChange(seh._tickAtLastSlideOrLayerChange), + _timeDelayOnNewSlideWithMovies(seh._timeDelayOnNewSlideWithMovies), + _minimumTimeBetweenKeyPresses(seh._minimumTimeBetweenKeyPresses), + _timeLastKeyPresses(seh._timeLastKeyPresses), + _requestReload(false) +{ + s_seh = this; +} + double SlideEventHandler::getDuration(const osg::Node* node) const { const LayerAttributes* la = dynamic_cast(node->getUserData());