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. --- .../Irrlicht/CParticleAttractionAffector.cpp | 168 ++++++++++----------- 1 file changed, 84 insertions(+), 84 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CParticleAttractionAffector.cpp') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CParticleAttractionAffector.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CParticleAttractionAffector.cpp index 83887c9..f47ce28 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CParticleAttractionAffector.cpp +++ b/libraries/irrlicht-1.8/source/Irrlicht/CParticleAttractionAffector.cpp @@ -1,84 +1,84 @@ -// 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 "CParticleAttractionAffector.h" -#include "IAttributes.h" - -namespace irr -{ -namespace scene -{ - -//! constructor -CParticleAttractionAffector::CParticleAttractionAffector( - const core::vector3df& point, f32 speed, bool attract, - bool affectX, bool affectY, bool affectZ ) - : Point(point), Speed(speed), AffectX(affectX), AffectY(affectY), - AffectZ(affectZ), Attract(attract), LastTime(0) -{ - #ifdef _DEBUG - setDebugName("CParticleAttractionAffector"); - #endif -} - - -//! Affects an array of particles. -void CParticleAttractionAffector::affect(u32 now, SParticle* particlearray, u32 count) -{ - if( LastTime == 0 ) - { - LastTime = now; - return; - } - - f32 timeDelta = ( now - LastTime ) / 1000.0f; - LastTime = now; - - if( !Enabled ) - return; - - for(u32 i=0; iaddVector3d("Point", Point); - out->addFloat("Speed", Speed); - out->addBool("AffectX", AffectX); - out->addBool("AffectY", AffectY); - out->addBool("AffectZ", AffectZ); - out->addBool("Attract", Attract); -} - -//! Reads attributes of the object. -void CParticleAttractionAffector::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) -{ - Point = in->getAttributeAsVector3d("Point"); - Speed = in->getAttributeAsFloat("Speed"); - AffectX = in->getAttributeAsBool("AffectX"); - AffectY = in->getAttributeAsBool("AffectY"); - AffectZ = in->getAttributeAsBool("AffectZ"); - Attract = in->getAttributeAsBool("Attract"); -} - -} // 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 "CParticleAttractionAffector.h" +#include "IAttributes.h" + +namespace irr +{ +namespace scene +{ + +//! constructor +CParticleAttractionAffector::CParticleAttractionAffector( + const core::vector3df& point, f32 speed, bool attract, + bool affectX, bool affectY, bool affectZ ) + : Point(point), Speed(speed), AffectX(affectX), AffectY(affectY), + AffectZ(affectZ), Attract(attract), LastTime(0) +{ + #ifdef _DEBUG + setDebugName("CParticleAttractionAffector"); + #endif +} + + +//! Affects an array of particles. +void CParticleAttractionAffector::affect(u32 now, SParticle* particlearray, u32 count) +{ + if( LastTime == 0 ) + { + LastTime = now; + return; + } + + f32 timeDelta = ( now - LastTime ) / 1000.0f; + LastTime = now; + + if( !Enabled ) + return; + + for(u32 i=0; iaddVector3d("Point", Point); + out->addFloat("Speed", Speed); + out->addBool("AffectX", AffectX); + out->addBool("AffectY", AffectY); + out->addBool("AffectZ", AffectZ); + out->addBool("Attract", Attract); +} + +//! Reads attributes of the object. +void CParticleAttractionAffector::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) +{ + Point = in->getAttributeAsVector3d("Point"); + Speed = in->getAttributeAsFloat("Speed"); + AffectX = in->getAttributeAsBool("AffectX"); + AffectY = in->getAttributeAsBool("AffectY"); + AffectZ = in->getAttributeAsBool("AffectZ"); + Attract = in->getAttributeAsBool("Attract"); +} + +} // end namespace scene +} // end namespace irr + -- cgit v1.1