Added missing initializers

This commit is contained in:
Robert Osfield 2016-06-22 11:39:11 +01:00
parent 471e556e91
commit 8a83bd73bb
3 changed files with 36 additions and 1 deletions

View File

@ -94,6 +94,7 @@ class OSGPRESENTATION_EXPORT AnimationMaterialCallback : public osg::NodeCallbac
public:
AnimationMaterialCallback():
_useInverseMatrix(false),
_timeOffset(0.0),
_timeMultiplier(1.0),
_firstTime(DBL_MAX),

View File

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

View File

@ -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<const LayerAttributes*>(node->getUserData());