API BREAKER: Replacing defines in irrTypes.h which are conflicting with c++ reserved identifier rules.
C++ has undefined behavior for identifiers starting with __ or with _ followed by an uppercase letter. We still have many more (in IrrCompileConfig.h and in all header-guards), will likely replace those later as well. As a workaround for users which might use irrlicht defines in their code, I've added the header irrLegacyDefines.h Including that allows to continue using old defines for a while - or make it easier to have code which compiles with old and new Irrlicht library versions. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6251 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
@@ -39,103 +39,103 @@ public:
|
||||
|
||||
//! Prepares an array with new particles to emitt into the system
|
||||
//! and returns how much new particles there are.
|
||||
virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) _IRR_OVERRIDE_;
|
||||
virtual s32 emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray) IRR_OVERRIDE;
|
||||
|
||||
//! Set the center of the radius for the cylinder, at one end of the cylinder
|
||||
virtual void setCenter( const core::vector3df& center ) _IRR_OVERRIDE_ { Center = center; }
|
||||
virtual void setCenter( const core::vector3df& center ) IRR_OVERRIDE { Center = center; }
|
||||
|
||||
//! Set the normal of the cylinder
|
||||
virtual void setNormal( const core::vector3df& normal ) _IRR_OVERRIDE_ { Normal = normal; }
|
||||
virtual void setNormal( const core::vector3df& normal ) IRR_OVERRIDE { Normal = normal; }
|
||||
|
||||
//! Set the radius of the cylinder
|
||||
virtual void setRadius( f32 radius ) _IRR_OVERRIDE_ { Radius = radius; }
|
||||
virtual void setRadius( f32 radius ) IRR_OVERRIDE { Radius = radius; }
|
||||
|
||||
//! Set the length of the cylinder
|
||||
virtual void setLength( f32 length ) _IRR_OVERRIDE_ { Length = length; }
|
||||
virtual void setLength( f32 length ) IRR_OVERRIDE { Length = length; }
|
||||
|
||||
//! Set whether or not to draw points inside the cylinder
|
||||
virtual void setOutlineOnly( bool outlineOnly ) _IRR_OVERRIDE_ { OutlineOnly = outlineOnly; }
|
||||
virtual void setOutlineOnly( bool outlineOnly ) IRR_OVERRIDE { OutlineOnly = outlineOnly; }
|
||||
|
||||
//! Set direction the emitter emits particles
|
||||
virtual void setDirection( const core::vector3df& newDirection ) _IRR_OVERRIDE_ { Direction = newDirection; }
|
||||
virtual void setDirection( const core::vector3df& newDirection ) IRR_OVERRIDE { Direction = newDirection; }
|
||||
|
||||
//! Set direction the emitter emits particles
|
||||
virtual void setMinParticlesPerSecond( u32 minPPS ) _IRR_OVERRIDE_ { MinParticlesPerSecond = minPPS; }
|
||||
virtual void setMinParticlesPerSecond( u32 minPPS ) IRR_OVERRIDE { MinParticlesPerSecond = minPPS; }
|
||||
|
||||
//! Set direction the emitter emits particles
|
||||
virtual void setMaxParticlesPerSecond( u32 maxPPS ) _IRR_OVERRIDE_ { MaxParticlesPerSecond = maxPPS; }
|
||||
virtual void setMaxParticlesPerSecond( u32 maxPPS ) IRR_OVERRIDE { MaxParticlesPerSecond = maxPPS; }
|
||||
|
||||
//! Set direction the emitter emits particles
|
||||
virtual void setMinStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MinStartColor = color; }
|
||||
virtual void setMinStartColor( const video::SColor& color ) IRR_OVERRIDE { MinStartColor = color; }
|
||||
|
||||
//! Set direction the emitter emits particles
|
||||
virtual void setMaxStartColor( const video::SColor& color ) _IRR_OVERRIDE_ { MaxStartColor = color; }
|
||||
virtual void setMaxStartColor( const video::SColor& color ) IRR_OVERRIDE { MaxStartColor = color; }
|
||||
|
||||
//! Set the maximum starting size for particles
|
||||
virtual void setMaxStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MaxStartSize = size; }
|
||||
virtual void setMaxStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MaxStartSize = size; }
|
||||
|
||||
//! Set the minimum starting size for particles
|
||||
virtual void setMinStartSize( const core::dimension2df& size ) _IRR_OVERRIDE_ { MinStartSize = size; }
|
||||
virtual void setMinStartSize( const core::dimension2df& size ) IRR_OVERRIDE { MinStartSize = size; }
|
||||
|
||||
//! Set the minimum particle life-time in milliseconds
|
||||
virtual void setMinLifeTime( u32 lifeTimeMin ) _IRR_OVERRIDE_ { MinLifeTime = lifeTimeMin; }
|
||||
virtual void setMinLifeTime( u32 lifeTimeMin ) IRR_OVERRIDE { MinLifeTime = lifeTimeMin; }
|
||||
|
||||
//! Set the maximum particle life-time in milliseconds
|
||||
virtual void setMaxLifeTime( u32 lifeTimeMax ) _IRR_OVERRIDE_ { MaxLifeTime = lifeTimeMax; }
|
||||
virtual void setMaxLifeTime( u32 lifeTimeMax ) IRR_OVERRIDE { MaxLifeTime = lifeTimeMax; }
|
||||
|
||||
//! Maximal random derivation from the direction
|
||||
virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) _IRR_OVERRIDE_ { MaxAngleDegrees = maxAngleDegrees; }
|
||||
virtual void setMaxAngleDegrees( s32 maxAngleDegrees ) IRR_OVERRIDE { MaxAngleDegrees = maxAngleDegrees; }
|
||||
|
||||
//! Get the center of the cylinder
|
||||
virtual const core::vector3df& getCenter() const _IRR_OVERRIDE_ { return Center; }
|
||||
virtual const core::vector3df& getCenter() const IRR_OVERRIDE { return Center; }
|
||||
|
||||
//! Get the normal of the cylinder
|
||||
virtual const core::vector3df& getNormal() const _IRR_OVERRIDE_ { return Normal; }
|
||||
virtual const core::vector3df& getNormal() const IRR_OVERRIDE { return Normal; }
|
||||
|
||||
//! Get the radius of the cylinder
|
||||
virtual f32 getRadius() const _IRR_OVERRIDE_ { return Radius; }
|
||||
virtual f32 getRadius() const IRR_OVERRIDE { return Radius; }
|
||||
|
||||
//! Get the center of the cylinder
|
||||
virtual f32 getLength() const _IRR_OVERRIDE_ { return Length; }
|
||||
virtual f32 getLength() const IRR_OVERRIDE { return Length; }
|
||||
|
||||
//! Get whether or not to draw points inside the cylinder
|
||||
virtual bool getOutlineOnly() const _IRR_OVERRIDE_ { return OutlineOnly; }
|
||||
virtual bool getOutlineOnly() const IRR_OVERRIDE { return OutlineOnly; }
|
||||
|
||||
//! Gets direction the emitter emits particles
|
||||
virtual const core::vector3df& getDirection() const _IRR_OVERRIDE_ { return Direction; }
|
||||
virtual const core::vector3df& getDirection() const IRR_OVERRIDE { return Direction; }
|
||||
|
||||
//! Gets direction the emitter emits particles
|
||||
virtual u32 getMinParticlesPerSecond() const _IRR_OVERRIDE_ { return MinParticlesPerSecond; }
|
||||
virtual u32 getMinParticlesPerSecond() const IRR_OVERRIDE { return MinParticlesPerSecond; }
|
||||
|
||||
//! Gets direction the emitter emits particles
|
||||
virtual u32 getMaxParticlesPerSecond() const _IRR_OVERRIDE_ { return MaxParticlesPerSecond; }
|
||||
virtual u32 getMaxParticlesPerSecond() const IRR_OVERRIDE { return MaxParticlesPerSecond; }
|
||||
|
||||
//! Gets direction the emitter emits particles
|
||||
virtual const video::SColor& getMinStartColor() const _IRR_OVERRIDE_ { return MinStartColor; }
|
||||
virtual const video::SColor& getMinStartColor() const IRR_OVERRIDE { return MinStartColor; }
|
||||
|
||||
//! Gets direction the emitter emits particles
|
||||
virtual const video::SColor& getMaxStartColor() const _IRR_OVERRIDE_ { return MaxStartColor; }
|
||||
virtual const video::SColor& getMaxStartColor() const IRR_OVERRIDE { return MaxStartColor; }
|
||||
|
||||
//! Gets the maximum starting size for particles
|
||||
virtual const core::dimension2df& getMaxStartSize() const _IRR_OVERRIDE_ { return MaxStartSize; }
|
||||
virtual const core::dimension2df& getMaxStartSize() const IRR_OVERRIDE { return MaxStartSize; }
|
||||
|
||||
//! Gets the minimum starting size for particles
|
||||
virtual const core::dimension2df& getMinStartSize() const _IRR_OVERRIDE_ { return MinStartSize; }
|
||||
virtual const core::dimension2df& getMinStartSize() const IRR_OVERRIDE { return MinStartSize; }
|
||||
|
||||
//! Get the minimum particle life-time in milliseconds
|
||||
virtual u32 getMinLifeTime() const _IRR_OVERRIDE_ { return MinLifeTime; }
|
||||
virtual u32 getMinLifeTime() const IRR_OVERRIDE { return MinLifeTime; }
|
||||
|
||||
//! Get the maximum particle life-time in milliseconds
|
||||
virtual u32 getMaxLifeTime() const _IRR_OVERRIDE_ { return MaxLifeTime; }
|
||||
virtual u32 getMaxLifeTime() const IRR_OVERRIDE { return MaxLifeTime; }
|
||||
|
||||
//! Maximal random derivation from the direction
|
||||
virtual s32 getMaxAngleDegrees() const _IRR_OVERRIDE_ { return MaxAngleDegrees; }
|
||||
virtual s32 getMaxAngleDegrees() const IRR_OVERRIDE { return MaxAngleDegrees; }
|
||||
|
||||
//! Writes attributes of the object.
|
||||
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const _IRR_OVERRIDE_;
|
||||
virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const IRR_OVERRIDE;
|
||||
|
||||
//! Reads attributes of the object.
|
||||
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_;
|
||||
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user