From 2bce4dda751290d60ee89c91a23caa2d074a4d71 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 22 Jul 2003 12:48:31 +0000 Subject: [PATCH] Made BlinkSequence subclass from osg::Object. --- include/osgSim/BlinkSequence | 6 ++++-- src/osgSim/BlinkSequence.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/osgSim/BlinkSequence b/include/osgSim/BlinkSequence index fe88c8e97..9ec2ee1ab 100644 --- a/include/osgSim/BlinkSequence +++ b/include/osgSim/BlinkSequence @@ -25,7 +25,7 @@ namespace osgSim { -class OSGSIM_EXPORT BlinkSequence : public osg::Referenced +class OSGSIM_EXPORT BlinkSequence : public osg::Object { public: @@ -43,7 +43,9 @@ class OSGSIM_EXPORT BlinkSequence : public osg::Referenced BlinkSequence(); - BlinkSequence(const BlinkSequence& bs); + BlinkSequence(const BlinkSequence& bs, const osg::CopyOp& copyop = osg::CopyOp::SHALLOW_COPY); + + META_Object(osgSim,BlinkSequence); /** add a pulse of specified color and duration to the BlinkSequence.*/ diff --git a/src/osgSim/BlinkSequence.cpp b/src/osgSim/BlinkSequence.cpp index b444a0fbd..73152f54a 100644 --- a/src/osgSim/BlinkSequence.cpp +++ b/src/osgSim/BlinkSequence.cpp @@ -25,8 +25,8 @@ BlinkSequence::BlinkSequence(): { } -BlinkSequence::BlinkSequence(const BlinkSequence& bs): - osg::Referenced(), +BlinkSequence::BlinkSequence(const BlinkSequence& bs, const osg::CopyOp& copyop): + osg::Object(bs,copyop), _pulsePeriod(bs._pulsePeriod), _phaseShift(bs._phaseShift), _pulseData(bs._pulseData),