From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 13 Jan 2013 18:54:10 +1000
Subject: Remove damned ancient DOS line endings from Irrlicht.  Hopefully I
 did not go overboard.

---
 .../source/Irrlicht/CParticleCylinderEmitter.cpp   | 374 ++++++++++-----------
 1 file changed, 187 insertions(+), 187 deletions(-)

(limited to 'libraries/irrlicht-1.8/source/Irrlicht/CParticleCylinderEmitter.cpp')

diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CParticleCylinderEmitter.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CParticleCylinderEmitter.cpp
index a2078f9..3e7eafc 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/CParticleCylinderEmitter.cpp
+++ b/libraries/irrlicht-1.8/source/Irrlicht/CParticleCylinderEmitter.cpp
@@ -1,187 +1,187 @@
-// 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 "CParticleCylinderEmitter.h"
-#include "os.h"
-#include "IAttributes.h"
-
-namespace irr
-{
-namespace scene
-{
-
-//! constructor
-CParticleCylinderEmitter::CParticleCylinderEmitter(
-	const core::vector3df& center, f32 radius,
-	const core::vector3df& normal, f32 length,
-	bool outlineOnly, 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), Normal(normal), Direction(direction),
-	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
-	MinParticlesPerSecond(minParticlesPerSecond),
-	MaxParticlesPerSecond(maxParticlesPerSecond),
-	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
-	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
-	Radius(radius), Length(length), Time(0), Emitted(0),
-	MaxAngleDegrees(maxAngleDegrees), OutlineOnly(outlineOnly)
-{
-	#ifdef _DEBUG
-	setDebugName("CParticleCylinderEmitter");
-	#endif
-}
-
-
-//! Prepares an array with new particles to emitt into the system
-//! and returns how much new particles there are.
-s32 CParticleCylinderEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)
-{
-	Time += timeSinceLastCall;
-
-	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
-	const f32 perSecond = pps ? ((f32)MinParticlesPerSecond + os::Randomizer::frand() * pps) : MinParticlesPerSecond;
-	const 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)
-		{
-			// Random distance from center if outline only is not true
-			const f32 distance = (!OutlineOnly) ? (os::Randomizer::frand() * Radius) : Radius;
-
-			// Random direction from center
-			p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);
-			p.pos.rotateXZBy(os::Randomizer::frand() * 360, Center);
-
-			// Random length
-			const f32 length = os::Randomizer::frand() * Length;
-
-			// Random point along the cylinders length
-			p.pos += Normal * length;
-
-			p.startTime = now;
-			p.vector = Direction;
-
-			if( MaxAngleDegrees )
-			{
-				core::vector3df tgt = Direction;
-				tgt.rotateXYBy(os::Randomizer::frand() * MaxAngleDegrees);
-				tgt.rotateYZBy(os::Randomizer::frand() * MaxAngleDegrees);
-				tgt.rotateXZBy(os::Randomizer::frand() * MaxAngleDegrees);
-				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 CParticleCylinderEmitter::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
-{
-	out->addVector3d("Center", Center);
-	out->addVector3d("Normal", Normal);
-	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->addFloat("Radius", Radius); 
-	out->addFloat("Length", Length); 
-	out->addInt("MaxAngleDegrees", MaxAngleDegrees);
-	out->addBool("OutlineOnly", OutlineOnly);
-}
-
-//! Reads attributes of the object.
-void CParticleCylinderEmitter::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
-{
-	Center = in->getAttributeAsVector3d("Center");
-	Normal = in->getAttributeAsVector3d("Normal");
-	if (Normal.getLength() == 0)
-		Normal.set(0,1.f,0);
-	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);
-
-	Radius = in->getAttributeAsFloat("Radius"); 
-	Length = in->getAttributeAsFloat("Length"); 
-	MaxAngleDegrees = in->getAttributeAsInt("MaxAngleDegrees");
-	OutlineOnly = in->getAttributeAsBool("OutlineOnly");
-}
-
-
-} // 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 "CParticleCylinderEmitter.h"
+#include "os.h"
+#include "IAttributes.h"
+
+namespace irr
+{
+namespace scene
+{
+
+//! constructor
+CParticleCylinderEmitter::CParticleCylinderEmitter(
+	const core::vector3df& center, f32 radius,
+	const core::vector3df& normal, f32 length,
+	bool outlineOnly, 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), Normal(normal), Direction(direction),
+	MaxStartSize(maxStartSize), MinStartSize(minStartSize),
+	MinParticlesPerSecond(minParticlesPerSecond),
+	MaxParticlesPerSecond(maxParticlesPerSecond),
+	MinStartColor(minStartColor), MaxStartColor(maxStartColor),
+	MinLifeTime(lifeTimeMin), MaxLifeTime(lifeTimeMax),
+	Radius(radius), Length(length), Time(0), Emitted(0),
+	MaxAngleDegrees(maxAngleDegrees), OutlineOnly(outlineOnly)
+{
+	#ifdef _DEBUG
+	setDebugName("CParticleCylinderEmitter");
+	#endif
+}
+
+
+//! Prepares an array with new particles to emitt into the system
+//! and returns how much new particles there are.
+s32 CParticleCylinderEmitter::emitt(u32 now, u32 timeSinceLastCall, SParticle*& outArray)
+{
+	Time += timeSinceLastCall;
+
+	const u32 pps = (MaxParticlesPerSecond - MinParticlesPerSecond);
+	const f32 perSecond = pps ? ((f32)MinParticlesPerSecond + os::Randomizer::frand() * pps) : MinParticlesPerSecond;
+	const 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)
+		{
+			// Random distance from center if outline only is not true
+			const f32 distance = (!OutlineOnly) ? (os::Randomizer::frand() * Radius) : Radius;
+
+			// Random direction from center
+			p.pos.set(Center.X + distance, Center.Y, Center.Z + distance);
+			p.pos.rotateXZBy(os::Randomizer::frand() * 360, Center);
+
+			// Random length
+			const f32 length = os::Randomizer::frand() * Length;
+
+			// Random point along the cylinders length
+			p.pos += Normal * length;
+
+			p.startTime = now;
+			p.vector = Direction;
+
+			if( MaxAngleDegrees )
+			{
+				core::vector3df tgt = Direction;
+				tgt.rotateXYBy(os::Randomizer::frand() * MaxAngleDegrees);
+				tgt.rotateYZBy(os::Randomizer::frand() * MaxAngleDegrees);
+				tgt.rotateXZBy(os::Randomizer::frand() * MaxAngleDegrees);
+				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 CParticleCylinderEmitter::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const
+{
+	out->addVector3d("Center", Center);
+	out->addVector3d("Normal", Normal);
+	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->addFloat("Radius", Radius); 
+	out->addFloat("Length", Length); 
+	out->addInt("MaxAngleDegrees", MaxAngleDegrees);
+	out->addBool("OutlineOnly", OutlineOnly);
+}
+
+//! Reads attributes of the object.
+void CParticleCylinderEmitter::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options)
+{
+	Center = in->getAttributeAsVector3d("Center");
+	Normal = in->getAttributeAsVector3d("Normal");
+	if (Normal.getLength() == 0)
+		Normal.set(0,1.f,0);
+	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);
+
+	Radius = in->getAttributeAsFloat("Radius"); 
+	Length = in->getAttributeAsFloat("Length"); 
+	MaxAngleDegrees = in->getAttributeAsInt("MaxAngleDegrees");
+	OutlineOnly = in->getAttributeAsBool("OutlineOnly");
+}
+
+
+} // end namespace scene
+} // end namespace irr
+
-- 
cgit v1.1