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

19
source/Irrlicht/CParticleGravityAffector.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_GRAVITY_AFFECTOR_H_INCLUDED__
#define __C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED__
#ifndef IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED
#define IRR_C_PARTICLE_GRAVITY_AFFECTOR_H_INCLUDED
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_PARTICLES_
@@ -26,33 +26,33 @@ public:
u32 timeForceLost = 1000);
//! 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 time in milliseconds when the gravity force is totally
//! lost and the particle does not move any more.
virtual void setTimeForceLost( f32 timeForceLost ) _IRR_OVERRIDE_ { TimeForceLost = timeForceLost; }
virtual void setTimeForceLost( f32 timeForceLost ) IRR_OVERRIDE { TimeForceLost = timeForceLost; }
//! Set the direction and force of gravity.
virtual void setGravity( const core::vector3df& gravity ) _IRR_OVERRIDE_ { Gravity = gravity; }
virtual void setGravity( const core::vector3df& gravity ) IRR_OVERRIDE { Gravity = gravity; }
//! Set the time in milliseconds when the gravity force is totally
//! lost and the particle does not move any more.
virtual f32 getTimeForceLost() const _IRR_OVERRIDE_ { return TimeForceLost; }
virtual f32 getTimeForceLost() const IRR_OVERRIDE { return TimeForceLost; }
//! Set the direction and force of gravity.
virtual const core::vector3df& getGravity() const _IRR_OVERRIDE_ { return Gravity; }
virtual const core::vector3df& getGravity() const IRR_OVERRIDE { return Gravity; }
//! Writes attributes of the object.
//! Implement this to expose the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml serialization purposes.
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.
//! Implement this to set the attributes of your scene node animator for
//! scripting languages, editors, debuggers or xml deserialization purposes.
//! \param startIndex: start index where to start reading attributes.
//! \return: returns last index of an attribute read by this affector
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) _IRR_OVERRIDE_;
virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) IRR_OVERRIDE;
private:
f32 TimeForceLost;
@@ -65,4 +65,3 @@ private:
#endif // _IRR_COMPILE_WITH_PARTICLES_
#endif