Commit c2d6da34 authored by hybrid's avatar hybrid

Remove unused destructors.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2307 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 1d8adb3f
...@@ -30,20 +30,16 @@ namespace scene ...@@ -30,20 +30,16 @@ namespace scene
class ISceneNodeAnimator : public io::IAttributeExchangingObject, public IEventReceiver class ISceneNodeAnimator : public io::IAttributeExchangingObject, public IEventReceiver
{ {
public: public:
//! Destructor
virtual ~ISceneNodeAnimator() {}
//! Animates a scene node. //! Animates a scene node.
/** \param node Node to animate. /** \param node Node to animate.
\param timeMs Current time in milli seconds. */ \param timeMs Current time in milli seconds. */
virtual void animateNode(ISceneNode* node, u32 timeMs) = 0; virtual void animateNode(ISceneNode* node, u32 timeMs) =0;
//! Creates a clone of this animator. //! Creates a clone of this animator.
/** Please note that you will have to drop /** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling (IReferenceCounted::drop()) the returned pointer after calling this. */
this. */ virtual ISceneNodeAnimator* createClone(ISceneNode* node,
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) = 0; ISceneManager* newManager=0) =0;
//! Returns true if this animator receives events. //! Returns true if this animator receives events.
/** When attached to an active camera, this animator will be /** When attached to an active camera, this animator will be
...@@ -67,7 +63,7 @@ namespace scene ...@@ -67,7 +63,7 @@ namespace scene
//! Returns if the animator has finished. //! Returns if the animator has finished.
/** This is only valid for non-looping animators with a discrete end state. /** This is only valid for non-looping animators with a discrete end state.
\return true if the animator has finished, false if it is still running. */ \return true if the animator has finished, false if it is still running. */
virtual bool hasFinished(void) const virtual bool hasFinished(void) const
{ {
return false; return false;
......
...@@ -21,14 +21,6 @@ CSceneNodeAnimatorDelete::CSceneNodeAnimatorDelete(ISceneManager* manager, u32 t ...@@ -21,14 +21,6 @@ CSceneNodeAnimatorDelete::CSceneNodeAnimatorDelete(ISceneManager* manager, u32 t
} }
//! destructor
CSceneNodeAnimatorDelete::~CSceneNodeAnimatorDelete()
{
}
//! animates a scene node //! animates a scene node
void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs) void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs)
{ {
...@@ -44,6 +36,7 @@ void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs) ...@@ -44,6 +36,7 @@ void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs)
} }
} }
ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISceneManager* newManager) ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISceneManager* newManager)
{ {
CSceneNodeAnimatorDelete * newAnimator = CSceneNodeAnimatorDelete * newAnimator =
...@@ -52,6 +45,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISce ...@@ -52,6 +45,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISce
return newAnimator; return newAnimator;
} }
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
...@@ -18,9 +18,6 @@ namespace scene ...@@ -18,9 +18,6 @@ namespace scene
//! constructor //! constructor
CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when); CSceneNodeAnimatorDelete(ISceneManager* manager, u32 when);
//! destructor
virtual ~CSceneNodeAnimatorDelete();
//! animates a scene node //! animates a scene node
virtual void animateNode(ISceneNode* node, u32 timeMs); virtual void animateNode(ISceneNode* node, u32 timeMs);
......
...@@ -9,11 +9,13 @@ namespace irr ...@@ -9,11 +9,13 @@ namespace irr
namespace scene namespace scene
{ {
//! constructor //! constructor
CSceneNodeAnimatorFlyCircle::CSceneNodeAnimatorFlyCircle(u32 time, const core::vector3df& center, f32 radius, CSceneNodeAnimatorFlyCircle::CSceneNodeAnimatorFlyCircle(u32 time,
f32 speed, const core::vector3df& direction, const core::vector3df& center, f32 radius, f32 speed,
f32 radiusEllipsoid) const core::vector3df& direction, f32 radiusEllipsoid)
: Center(center), Direction(direction), Radius(radius), RadiusEllipsoid (radiusEllipsoid), Speed(speed), StartTime(time) : Center(center), Direction(direction), Radius(radius),
RadiusEllipsoid(radiusEllipsoid), Speed(speed), StartTime(time)
{ {
#ifdef _DEBUG #ifdef _DEBUG
setDebugName("CSceneNodeAnimatorFlyCircle"); setDebugName("CSceneNodeAnimatorFlyCircle");
...@@ -83,6 +85,7 @@ void CSceneNodeAnimatorFlyCircle::deserializeAttributes(io::IAttributes* in, io: ...@@ -83,6 +85,7 @@ void CSceneNodeAnimatorFlyCircle::deserializeAttributes(io::IAttributes* in, io:
init(); init();
} }
ISceneNodeAnimator* CSceneNodeAnimatorFlyCircle::createClone(ISceneNode* node, ISceneManager* newManager) ISceneNodeAnimator* CSceneNodeAnimatorFlyCircle::createClone(ISceneNode* node, ISceneManager* newManager)
{ {
CSceneNodeAnimatorFlyCircle * newAnimator = CSceneNodeAnimatorFlyCircle * newAnimator =
...@@ -91,6 +94,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFlyCircle::createClone(ISceneNode* node, I ...@@ -91,6 +94,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFlyCircle::createClone(ISceneNode* node, I
return newAnimator; return newAnimator;
} }
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
...@@ -36,14 +36,6 @@ void CSceneNodeAnimatorFlyStraight::recalculateIntermediateValues() ...@@ -36,14 +36,6 @@ void CSceneNodeAnimatorFlyStraight::recalculateIntermediateValues()
} }
//! destructor
CSceneNodeAnimatorFlyStraight::~CSceneNodeAnimatorFlyStraight()
{
}
//! animates a scene node //! animates a scene node
void CSceneNodeAnimatorFlyStraight::animateNode(ISceneNode* node, u32 timeMs) void CSceneNodeAnimatorFlyStraight::animateNode(ISceneNode* node, u32 timeMs)
{ {
...@@ -101,6 +93,7 @@ void CSceneNodeAnimatorFlyStraight::deserializeAttributes(io::IAttributes* in, i ...@@ -101,6 +93,7 @@ void CSceneNodeAnimatorFlyStraight::deserializeAttributes(io::IAttributes* in, i
recalculateIntermediateValues(); recalculateIntermediateValues();
} }
ISceneNodeAnimator* CSceneNodeAnimatorFlyStraight::createClone(ISceneNode* node, ISceneManager* newManager) ISceneNodeAnimator* CSceneNodeAnimatorFlyStraight::createClone(ISceneNode* node, ISceneManager* newManager)
{ {
CSceneNodeAnimatorFlyStraight * newAnimator = CSceneNodeAnimatorFlyStraight * newAnimator =
...@@ -109,6 +102,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFlyStraight::createClone(ISceneNode* node, ...@@ -109,6 +102,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFlyStraight::createClone(ISceneNode* node,
return newAnimator; return newAnimator;
} }
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
...@@ -21,9 +21,6 @@ namespace scene ...@@ -21,9 +21,6 @@ namespace scene
u32 timeForWay, u32 timeForWay,
bool loop, u32 now, bool pingpong); bool loop, u32 now, bool pingpong);
//! destructor
virtual ~CSceneNodeAnimatorFlyStraight();
//! animates a scene node //! animates a scene node
virtual void animateNode(ISceneNode* node, u32 timeMs); virtual void animateNode(ISceneNode* node, u32 timeMs);
...@@ -38,8 +35,7 @@ namespace scene ...@@ -38,8 +35,7 @@ namespace scene
//! Creates a clone of this animator. //! Creates a clone of this animator.
/** Please note that you will have to drop /** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling (IReferenceCounted::drop()) the returned pointer after calling this. */
this. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0); virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
private: private:
......
...@@ -9,6 +9,7 @@ namespace irr ...@@ -9,6 +9,7 @@ namespace irr
namespace scene namespace scene
{ {
//! constructor //! constructor
CSceneNodeAnimatorFollowSpline::CSceneNodeAnimatorFollowSpline(u32 time, CSceneNodeAnimatorFollowSpline::CSceneNodeAnimatorFollowSpline(u32 time,
const core::array<core::vector3df>& points, f32 speed, const core::array<core::vector3df>& points, f32 speed,
...@@ -121,6 +122,7 @@ void CSceneNodeAnimatorFollowSpline::deserializeAttributes(io::IAttributes* in, ...@@ -121,6 +122,7 @@ void CSceneNodeAnimatorFollowSpline::deserializeAttributes(io::IAttributes* in,
} }
} }
ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node, ISceneManager* newManager) ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node, ISceneManager* newManager)
{ {
CSceneNodeAnimatorFollowSpline * newAnimator = CSceneNodeAnimatorFollowSpline * newAnimator =
...@@ -129,6 +131,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node ...@@ -129,6 +131,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorFollowSpline::createClone(ISceneNode* node
return newAnimator; return newAnimator;
} }
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
...@@ -9,6 +9,7 @@ namespace irr ...@@ -9,6 +9,7 @@ namespace irr
namespace scene namespace scene
{ {
//! constructor //! constructor
CSceneNodeAnimatorRotation::CSceneNodeAnimatorRotation(u32 time, const core::vector3df& rotation) CSceneNodeAnimatorRotation::CSceneNodeAnimatorRotation(u32 time, const core::vector3df& rotation)
: Rotation(rotation), StartTime(time) : Rotation(rotation), StartTime(time)
......
...@@ -32,8 +32,7 @@ namespace scene ...@@ -32,8 +32,7 @@ namespace scene
//! Creates a clone of this animator. //! Creates a clone of this animator.
/** Please note that you will have to drop /** Please note that you will have to drop
(IReferenceCounted::drop()) the returned pointer after calling (IReferenceCounted::drop()) the returned pointer after calling this. */
this. */
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0); virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0);
private: private:
......
...@@ -33,7 +33,6 @@ CSceneNodeAnimatorTexture::CSceneNodeAnimatorTexture(const core::array<video::IT ...@@ -33,7 +33,6 @@ CSceneNodeAnimatorTexture::CSceneNodeAnimatorTexture(const core::array<video::IT
} }
//! destructor //! destructor
CSceneNodeAnimatorTexture::~CSceneNodeAnimatorTexture() CSceneNodeAnimatorTexture::~CSceneNodeAnimatorTexture()
{ {
...@@ -41,7 +40,6 @@ CSceneNodeAnimatorTexture::~CSceneNodeAnimatorTexture() ...@@ -41,7 +40,6 @@ CSceneNodeAnimatorTexture::~CSceneNodeAnimatorTexture()
} }
void CSceneNodeAnimatorTexture::clearTextures() void CSceneNodeAnimatorTexture::clearTextures()
{ {
for (u32 i=0; i<Textures.size(); ++i) for (u32 i=0; i<Textures.size(); ++i)
...@@ -50,7 +48,6 @@ void CSceneNodeAnimatorTexture::clearTextures() ...@@ -50,7 +48,6 @@ void CSceneNodeAnimatorTexture::clearTextures()
} }
//! animates a scene node //! animates a scene node
void CSceneNodeAnimatorTexture::animateNode(ISceneNode* node, u32 timeMs) void CSceneNodeAnimatorTexture::animateNode(ISceneNode* node, u32 timeMs)
{ {
...@@ -100,6 +97,7 @@ void CSceneNodeAnimatorTexture::serializeAttributes(io::IAttributes* out, io::SA ...@@ -100,6 +97,7 @@ void CSceneNodeAnimatorTexture::serializeAttributes(io::IAttributes* out, io::SA
} }
} }
//! Reads attributes of the scene node animator. //! Reads attributes of the scene node animator.
void CSceneNodeAnimatorTexture::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) void CSceneNodeAnimatorTexture::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
{ {
...@@ -127,6 +125,7 @@ void CSceneNodeAnimatorTexture::deserializeAttributes(io::IAttributes* in, io::S ...@@ -127,6 +125,7 @@ void CSceneNodeAnimatorTexture::deserializeAttributes(io::IAttributes* in, io::S
} }
} }
ISceneNodeAnimator* CSceneNodeAnimatorTexture::createClone(ISceneNode* node, ISceneManager* newManager) ISceneNodeAnimator* CSceneNodeAnimatorTexture::createClone(ISceneNode* node, ISceneManager* newManager)
{ {
CSceneNodeAnimatorTexture * newAnimator = CSceneNodeAnimatorTexture * newAnimator =
...@@ -135,6 +134,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorTexture::createClone(ISceneNode* node, ISc ...@@ -135,6 +134,7 @@ ISceneNodeAnimator* CSceneNodeAnimatorTexture::createClone(ISceneNode* node, ISc
return newAnimator; return newAnimator;
} }
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr
...@@ -20,12 +20,6 @@ namespace scene ...@@ -20,12 +20,6 @@ namespace scene
ISceneNodeAnimatorFinishing(u32 finishTime) ISceneNodeAnimatorFinishing(u32 finishTime)
: FinishTime(finishTime), HasFinished(false) { } : FinishTime(finishTime), HasFinished(false) { }
//! destructor
virtual ~ISceneNodeAnimatorFinishing() { }
//! This is a pure virtual class, so it can't be cloned directly.
virtual ISceneNodeAnimator* createClone(ISceneNode* node, ISceneManager* newManager=0) = 0;
virtual bool hasFinished(void) const { return HasFinished; } virtual bool hasFinished(void) const { return HasFinished; }
protected: protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment