1 files changed, 177 insertions, 177 deletions

diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CParticleRingEmitter.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CParticleRingEmitter.cpp
index 5f398cd..dfe3068 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/CParticleRingEmitter.cpp
+++ b/libraries/irrlicht-1.8/source/Irrlicht/CParticleRingEmitter.cpp
@@ -1,177 +1,177 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt

-// This file is part of the "Irrlicht Engine".

-// For conditions of distribution and use, see copyright notice in irrlicht.h

-

-#include "CParticleRingEmitter.h"

-#include "os.h"

-#include "IAttributes.h"

-

-namespace irr

-{

-namespace scene

-{

-

-//! constructor

-CParticleRingEmitter::CParticleRingEmitter(

-        const core::vector3df& center, f32 radius, f32 ringThickness,

-        const core::vector3df& direction, u32 minParticlesPerSecond,

-        u32 maxParticlesPerSecond, const video::SColor& minStartColor,

-        const video::SColor& maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,

-        s32 maxAngleDegrees,

-        const core::dimension2df& minStartSize,

-        const core::dimension2df& maxStartSize )

-        : Center(center), Radius(radius), RingThickness(ringThickness),

-                Direction(direction),

-                MaxStartSize(maxStartSize), MinStartSize(minStartSize),

-                MinParticlesPerSecond(minParticlesPerSecond),

-                MaxParticlesPerSecond(maxParticlesPerSecond),

-                MinStartColor(minStartColor), MaxStartColor(maxStartColor),

-                MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),

-                Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)

-{

-        #ifdef _DEBUG

-        setDebugName("CParticleRingEmitter");

-        #endif

-}

-

-

-//! Prepares an array with new particles to emitt into the system

-//! and returns how much new particles there are.

-s32 CParticleRingEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)

-{

-        Time += timeSinceLastCall;

-

-        u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);

-        f32 perSecond = pps ? ((f32)MinParticlesPerSecond + os::Randomizer::frand() * pps) : MinParticlesPerSecond;

-        f32 everyWhatMillisecond = 1000.0f / perSecond;

-

-        if(Time > everyWhatMillisecond)

-        {

-                Particles.set_used(0);

-                u32 amount = (u32)((Time / everyWhatMillisecond) + 0.5f);

-                Time = 0;

-                SParticle p;

-

-                if(amount > MaxParticlesPerSecond*2)

-                        amount = MaxParticlesPerSecond * 2;

-

-                for(u32 i=0; i<amount; ++i)

-                {

-                        f32 distance = os::Randomizer::frand() * RingThickness * 0.5f;

-                        if (os::Randomizer::rand() % 2)

-                                distance -= Radius;

-                        else

-                                distance += Radius;

-

-                        p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);

-                        p.pos.rotateXZBy(os::Randomizer::frand() * 360, Center );

-

-                        p.startTime = now;

-                        p.vector = Direction;

-

-                        if(MaxAngleDegrees)

-                        {

-                                core::vector3df tgt = Direction;

-                                tgt.rotateXYBy(os::Randomizer::frand() * MaxAngleDegrees, Center );

-                                tgt.rotateYZBy(os::Randomizer::frand() * MaxAngleDegrees, Center );

-                                tgt.rotateXZBy(os::Randomizer::frand() * MaxAngleDegrees, Center );

-                                p.vector = tgt;

-                        }

-

-                        p.endTime = now + MinLifeTime;

-                        if (MaxLifeTime != MinLifeTime)

-                                p.endTime += os::Randomizer::rand() % (MaxLifeTime - MinLifeTime);

-

-                        if (MinStartColor==MaxStartColor)

-                                p.color=MinStartColor;

-                        else

-                                p.color = MinStartColor.getInterpolated(MaxStartColor, os::Randomizer::frand());

-

-                        p.startColor = p.color;

-                        p.startVector = p.vector;

-

-                        if (MinStartSize==MaxStartSize)

-                                p.startSize = MinStartSize;

-                        else

-                                p.startSize = MinStartSize.getInterpolated(MaxStartSize, os::Randomizer::frand());

-                        p.size = p.startSize;

-

-                        Particles.push_back(p);

-                }

-

-                outArray = Particles.pointer();

-

-                return Particles.size();

-        }

-

-        return 0;

-}

-

-//! Writes attributes of the object.

-void CParticleRingEmitter::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const

-{

-        out->addVector3d("Center", Center);

-        out->addFloat("Radius", Radius);

-        out->addFloat("RingThickness", RingThickness);

-

-        out->addVector3d("Direction", Direction);

-        out->addFloat("MinStartSizeWidth", MinStartSize.Width);

-        out->addFloat("MinStartSizeHeight", MinStartSize.Height);

-        out->addFloat("MaxStartSizeWidth", MaxStartSize.Width);

-        out->addFloat("MaxStartSizeHeight", MaxStartSize.Height); 

-        out->addInt("MinParticlesPerSecond", MinParticlesPerSecond);

-        out->addInt("MaxParticlesPerSecond", MaxParticlesPerSecond);

-        out->addColor("MinStartColor", MinStartColor);

-        out->addColor("MaxStartColor", MaxStartColor);

-        out->addInt("MinLifeTime", MinLifeTime);

-        out->addInt("MaxLifeTime", MaxLifeTime);

-        out->addInt("MaxAngleDegrees", MaxAngleDegrees);

-}

-

-//! Reads attributes of the object.

-void CParticleRingEmitter::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)

-{

-        Center = in->getAttributeAsVector3d("Center");

-        Radius = in->getAttributeAsFloat("Radius"); 

-        RingThickness = in->getAttributeAsFloat("RingThickness"); 

-

-        Direction = in->getAttributeAsVector3d("Direction");

-        if (Direction.getLength() == 0)

-                Direction.set(0,0.01f,0);

-

-        int idx = -1;

-        idx = in->findAttribute("MinStartSizeWidth");

-        if ( idx >= 0 )

-                MinStartSize.Width = in->getAttributeAsFloat(idx);

-        idx = in->findAttribute("MinStartSizeHeight");

-        if ( idx >= 0 )

-                MinStartSize.Height = in->getAttributeAsFloat(idx);

-        idx = in->findAttribute("MaxStartSizeWidth");

-        if ( idx >= 0 )

-                MaxStartSize.Width = in->getAttributeAsFloat(idx);

-        idx = in->findAttribute("MaxStartSizeHeight");

-        if ( idx >= 0 )

-                MaxStartSize.Height = in->getAttributeAsFloat(idx);

-

-        MinParticlesPerSecond = in->getAttributeAsInt("MinParticlesPerSecond");

-        MaxParticlesPerSecond = in->getAttributeAsInt("MaxParticlesPerSecond");

-

-        MinParticlesPerSecond = core::max_(1u, MinParticlesPerSecond);

-        MaxParticlesPerSecond = core::max_(MaxParticlesPerSecond, 1u);

-        MaxParticlesPerSecond = core::min_(MaxParticlesPerSecond, 200u);

-        MinParticlesPerSecond = core::min_(MinParticlesPerSecond, MaxParticlesPerSecond);

-

-        MinStartColor = in->getAttributeAsColor("MinStartColor");

-        MaxStartColor = in->getAttributeAsColor("MaxStartColor");

-        MinLifeTime = in->getAttributeAsInt("MinLifeTime");

-        MaxLifeTime = in->getAttributeAsInt("MaxLifeTime");

-        MinLifeTime = core::max_(0u, MinLifeTime);

-        MaxLifeTime = core::max_(MaxLifeTime, MinLifeTime);

-        MinLifeTime = core::min_(MinLifeTime, MaxLifeTime);

-

-        MaxAngleDegrees = in->getAttributeAsInt("MaxAngleDegrees");

-}

-

-} // end namespace scene

-} // end namespace irr

-

+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CParticleRingEmitter.h"
+#include "os.h"
+#include "IAttributes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CParticleRingEmitter::CParticleRingEmitter(
+        const core::vector3df& center, f32 radius, f32 ringThickness,
+        const core::vector3df& direction, u32 minParticlesPerSecond,
+        u32 maxParticlesPerSecond, const video::SColor& minStartColor,
+        const video::SColor& maxStartColor, u32 lifeTimeMin, u32 lifeTimeMax,
+        s32 maxAngleDegrees,
+        const core::dimension2df& minStartSize,
+        const core::dimension2df& maxStartSize )
+        : Center(center), Radius(radius), RingThickness(ringThickness),
+                Direction(direction),
+                MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+                MinParticlesPerSecond(minParticlesPerSecond),
+                MaxParticlesPerSecond(maxParticlesPerSecond),
+                MinStartColor(minStartColor), MaxStartColor(maxStartColor),
+                MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+                Time(0), Emitted(0), MaxAngleDegrees(maxAngleDegrees)
+{
+        #ifdef _DEBUG
+        setDebugName("CParticleRingEmitter");
+        #endif
+}
+
+
+//! Prepares an array with new particles to emitt into the system
+//! and returns how much new particles there are.
+s32 CParticleRingEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)
+{
+        Time += timeSinceLastCall;
+
+        u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+        f32 perSecond = pps ? ((f32)MinParticlesPerSecond + os::Randomizer::frand() * pps) : MinParticlesPerSecond;
+        f32 everyWhatMillisecond = 1000.0f / perSecond;
+
+        if(Time > everyWhatMillisecond)
+        {
+                Particles.set_used(0);
+                u32 amount = (u32)((Time / everyWhatMillisecond) + 0.5f);
+                Time = 0;
+                SParticle p;
+
+                if(amount > MaxParticlesPerSecond*2)
+                        amount = MaxParticlesPerSecond * 2;
+
+                for(u32 i=0; i<amount; ++i)
+                {
+                        f32 distance = os::Randomizer::frand() * RingThickness * 0.5f;
+                        if (os::Randomizer::rand() % 2)
+                                distance -= Radius;
+                        else
+                                distance += Radius;
+
+                        p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);
+                        p.pos.rotateXZBy(os::Randomizer::frand() * 360, Center );
+
+                        p.startTime = now;
+                        p.vector = Direction;
+
+                        if(MaxAngleDegrees)
+                        {
+                                core::vector3df tgt = Direction;
+                                tgt.rotateXYBy(os::Randomizer::frand() * MaxAngleDegrees, Center );
+                                tgt.rotateYZBy(os::Randomizer::frand() * MaxAngleDegrees, Center );
+                                tgt.rotateXZBy(os::Randomizer::frand() * MaxAngleDegrees, Center );
+                                p.vector = tgt;
+                        }
+
+                        p.endTime = now + MinLifeTime;
+                        if (MaxLifeTime != MinLifeTime)
+                                p.endTime += os::Randomizer::rand() % (MaxLifeTime - MinLifeTime);
+
+                        if (MinStartColor==MaxStartColor)
+                                p.color=MinStartColor;
+                        else
+                                p.color = MinStartColor.getInterpolated(MaxStartColor, os::Randomizer::frand());
+
+                        p.startColor = p.color;
+                        p.startVector = p.vector;
+
+                        if (MinStartSize==MaxStartSize)
+                                p.startSize = MinStartSize;
+                        else
+                                p.startSize = MinStartSize.getInterpolated(MaxStartSize, os::Randomizer::frand());
+                        p.size = p.startSize;
+
+                        Particles.push_back(p);
+                }
+
+                outArray = Particles.pointer();
+
+                return Particles.size();
+        }
+
+        return 0;
+}
+
+//! Writes attributes of the object.
+void CParticleRingEmitter::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
+{
+        out->addVector3d("Center", Center);
+        out->addFloat("Radius", Radius);
+        out->addFloat("RingThickness", RingThickness);
+
+        out->addVector3d("Direction", Direction);
+        out->addFloat("MinStartSizeWidth", MinStartSize.Width);
+        out->addFloat("MinStartSizeHeight", MinStartSize.Height);
+        out->addFloat("MaxStartSizeWidth", MaxStartSize.Width);
+        out->addFloat("MaxStartSizeHeight", MaxStartSize.Height); 
+        out->addInt("MinParticlesPerSecond", MinParticlesPerSecond);
+        out->addInt("MaxParticlesPerSecond", MaxParticlesPerSecond);
+        out->addColor("MinStartColor", MinStartColor);
+        out->addColor("MaxStartColor", MaxStartColor);
+        out->addInt("MinLifeTime", MinLifeTime);
+        out->addInt("MaxLifeTime", MaxLifeTime);
+        out->addInt("MaxAngleDegrees", MaxAngleDegrees);
+}
+
+//! Reads attributes of the object.
+void CParticleRingEmitter::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
+{
+        Center = in->getAttributeAsVector3d("Center");
+        Radius = in->getAttributeAsFloat("Radius"); 
+        RingThickness = in->getAttributeAsFloat("RingThickness"); 
+
+        Direction = in->getAttributeAsVector3d("Direction");
+        if (Direction.getLength() == 0)
+                Direction.set(0,0.01f,0);
+
+        int idx = -1;
+        idx = in->findAttribute("MinStartSizeWidth");
+        if ( idx >= 0 )
+                MinStartSize.Width = in->getAttributeAsFloat(idx);
+        idx = in->findAttribute("MinStartSizeHeight");
+        if ( idx >= 0 )
+                MinStartSize.Height = in->getAttributeAsFloat(idx);
+        idx = in->findAttribute("MaxStartSizeWidth");
+        if ( idx >= 0 )
+                MaxStartSize.Width = in->getAttributeAsFloat(idx);
+        idx = in->findAttribute("MaxStartSizeHeight");
+        if ( idx >= 0 )
+                MaxStartSize.Height = in->getAttributeAsFloat(idx);
+
+        MinParticlesPerSecond = in->getAttributeAsInt("MinParticlesPerSecond");
+        MaxParticlesPerSecond = in->getAttributeAsInt("MaxParticlesPerSecond");
+
+        MinParticlesPerSecond = core::max_(1u, MinParticlesPerSecond);
+        MaxParticlesPerSecond = core::max_(MaxParticlesPerSecond, 1u);
+        MaxParticlesPerSecond = core::min_(MaxParticlesPerSecond, 200u);
+        MinParticlesPerSecond = core::min_(MinParticlesPerSecond, MaxParticlesPerSecond);
+
+        MinStartColor = in->getAttributeAsColor("MinStartColor");
+        MaxStartColor = in->getAttributeAsColor("MaxStartColor");
+        MinLifeTime = in->getAttributeAsInt("MinLifeTime");
+        MaxLifeTime = in->getAttributeAsInt("MaxLifeTime");
+        MinLifeTime = core::max_(0u, MinLifeTime);
+        MaxLifeTime = core::max_(MaxLifeTime, MinLifeTime);
+        MinLifeTime = core::min_(MinLifeTime, MaxLifeTime);
+
+        MaxAngleDegrees = in->getAttributeAsInt("MaxAngleDegrees");
+}
+
+} // end namespace scene
+} // end namespace irr
+