From 1a9320fafb23940d0463e6f384713d0f99fc0c61 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Wed, 19 Sep 2007 17:28:33 +0000
Subject: Merged 0.0 changes from revision 3362 to 3580 to trunk.

---
 src/particleemitter.cpp | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'src/particleemitter.cpp')

diff --git a/src/particleemitter.cpp b/src/particleemitter.cpp
index 60a98cc5..035882b6 100644
--- a/src/particleemitter.cpp
+++ b/src/particleemitter.cpp
@@ -248,10 +248,9 @@ ParticleEmitter::readMinMax(xmlNodePtr propertyNode, T def)
 {
     MinMax<T> retval;
 
-    def = (T)XML::getFloatProperty(propertyNode, "value", (double)def);
-    retval.set  (   (T)XML::getFloatProperty(propertyNode, "min", (double)def),
-                    (T)XML::getFloatProperty(propertyNode, "max", (double)def)
-                );
+    def = (T) XML::getFloatProperty(propertyNode, "value", (double) def);
+    retval.set((T) XML::getFloatProperty(propertyNode, "min", (double) def),
+               (T) XML::getFloatProperty(propertyNode, "max", (double) def));
 
     return retval;
 }
@@ -284,19 +283,17 @@ ParticleEmitter::createParticles()
 
 
         newParticle->setPosition(
-            mParticlePosX.value(),
-            mParticlePosY.value(),
-            mParticlePosZ.value()
-        );
+                mParticlePosX.value(),
+                mParticlePosY.value(),
+                mParticlePosZ.value());
 
         float angleH = mParticleAngleHorizontal.value();
         float angleV = mParticleAngleVertical.value();
         float power = mParticlePower.value();
-        newParticle->setVector(
-            cos(angleH) * cos(angleV) * power,
-            sin(angleH) * cos(angleV) * power,
-            sin(angleV) * power
-        );
+        newParticle->setVelocity(
+                cos(angleH) * cos(angleV) * power,
+                sin(angleH) * cos(angleV) * power,
+                sin(angleV) * power);
 
         newParticle->setRandomnes(mParticleRandomnes.value());
         newParticle->setGravity(mParticleGravity.value());
@@ -312,10 +309,9 @@ ParticleEmitter::createParticles()
         newParticle->setFadeOut(mParticleFadeOut.value());
         newParticle->setFadeIn(mParticleFadeIn.value());
 
-        for (   std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
-                i != mParticleChildEmitters.end();
-                i++
-            )
+        for (std::list<ParticleEmitter>::iterator i = mParticleChildEmitters.begin();
+             i != mParticleChildEmitters.end();
+             i++)
         {
             newParticle->addEmitter(new ParticleEmitter(*i));
         }
-- 
cgit v1.2.3-70-g09d2