luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/Irrlicht/CParticleAttractionAffector.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
#define __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
#ifndef IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
#define IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PARTICLES_
@@ -26,49 +26,49 @@ public:
bool affectY = true, bool affectZ = true );
//! Affects a particle.
virtual void affect(u32 now, SParticle* particlearray, u32 count) _IRR_OVERRIDE_;
virtual void affect(u32 now, SParticle* particlearray, u32 count) IRR_OVERRIDE;
//! Set the point that particles will attract to
virtual void setPoint( const core::vector3df& point ) _IRR_OVERRIDE_ { Point = point; }
virtual void setPoint( const core::vector3df& point ) IRR_OVERRIDE { Point = point; }
//! Set the speed, in game units per second that the particles will attract to the specified point
virtual void setSpeed( f32 speed ) _IRR_OVERRIDE_ { Speed = speed; }
virtual void setSpeed( f32 speed ) IRR_OVERRIDE { Speed = speed; }
//! Set whether or not the particles are attracting or detracting
virtual void setAttract( bool attract ) _IRR_OVERRIDE_ { Attract = attract; }
virtual void setAttract( bool attract ) IRR_OVERRIDE { Attract = attract; }
//! Set whether or not this will affect particles in the X direction
virtual void setAffectX( bool affect ) _IRR_OVERRIDE_ { AffectX = affect; }
virtual void setAffectX( bool affect ) IRR_OVERRIDE { AffectX = affect; }
//! Set whether or not this will affect particles in the Y direction
virtual void setAffectY( bool affect ) _IRR_OVERRIDE_ { AffectY = affect; }
virtual void setAffectY( bool affect ) IRR_OVERRIDE { AffectY = affect; }
//! Set whether or not this will affect particles in the Z direction
virtual void setAffectZ( bool affect ) _IRR_OVERRIDE_ { AffectZ = affect; }
virtual void setAffectZ( bool affect ) IRR_OVERRIDE { AffectZ = affect; }
//! Get the point that particles are attracted to
virtual const core::vector3df& getPoint() const _IRR_OVERRIDE_ { return Point; }
virtual const core::vector3df& getPoint() const IRR_OVERRIDE { return Point; }
//! Get the speed that points attract to the specified point
virtual f32 getSpeed() const _IRR_OVERRIDE_ { return Speed; }
virtual f32 getSpeed() const IRR_OVERRIDE { return Speed; }
//! Get whether or not the particles are attracting or detracting
virtual bool getAttract() const _IRR_OVERRIDE_ { return Attract; }
virtual bool getAttract() const IRR_OVERRIDE { return Attract; }
//! Get whether or not the particles X position are affected
virtual bool getAffectX() const _IRR_OVERRIDE_ { return AffectX; }
virtual bool getAffectX() const IRR_OVERRIDE { return AffectX; }
//! Get whether or not the particles Y position are affected
virtual bool getAffectY() const _IRR_OVERRIDE_ { return AffectY; }
virtual bool getAffectY() const IRR_OVERRIDE { return AffectY; }
//! Get whether or not the particles Z position are affected
virtual bool getAffectZ() const _IRR_OVERRIDE_ { return AffectZ; }
virtual bool getAffectZ() const IRR_OVERRIDE { return AffectZ; }
//! 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:
@@ -86,5 +86,4 @@ private:
#endif // _IRR_COMPILE_WITH_PARTICLES_
#endif // __C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED__
#endif // IRR_C_PARTICLE_ATTRACTION_AFFECTOR_H_INCLUDED