Changeset 9656 in orxonox.OLD for trunk/src/lib/particles

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/lib/particles

Files:

• particle_system.cc (modified) (4 diffs)
• particle_system.h (modified) (2 diffs)
• quick_animation.cc (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -55 +55 @@
 
 /**
- *  standard deconstructor
-*/
+ * @brief standard deconstructor
+ */
 ParticleSystem::~ParticleSystem()
 {
@@ -84 +84 @@
 
 /**
- * loads Parameters from a TiXmlElement
+ * @brief loads Parameters from a TiXmlElement
  * @param root the XML-element to load from.
  */
@@ -241 +241 @@
 
 /**
+ * @brief sets a key in the color-animation on a per-particle basis
+ * @param lifeCycleTime: the time (partilceLifeTime/particleAge) [0-1]
+ * @param color the Color.
+ */
+void ParticleSystem::setColor(float lifeCycleTime, const Color& color)
+{
+  this->setColor(lifeCycleTime, color.r(), color.g(), color.b(), color.a());
+}
+
+
+/**
  * @brief adds an Emitter to this System.
  * @param emitter the Emitter to add.
@@ -455 +466 @@
            this->maxCount,
            ((this->maxCount!=0)?100*this->count/this->maxCount:0));
-  if (this->deadList)
+
+
+  PRINT(0)("  Coloring sceme: r:"), this->colorAnim[0].debug();
+  PRINT(0)("  Coloring sceme: g:"), this->colorAnim[1].debug();
+  PRINT(0)("  Coloring sceme: b:"), this->colorAnim[2].debug();
+  PRINT(0)("  Coloring sceme: a:"), this->colorAnim[3].debug();
+
+  if (likely(this->deadList != NULL))
   {
     PRINT(0)("  - ParticleDeadList is used: ");

trunk/src/lib/particles/particle_system.h

@@ -13 +13 @@
 #include "vector.h"
 #include <list>
+#include "color.h"
 
 #include "quick_animation.h"
@@ -71 +72 @@
   void setMass(float lifeCycleTime, float mass, float randMass = 0.0);
   void setColor(float lifeCycleTime, float red, float green, float blue, float alpha);
+  void setColor(float lifeCycleTime, const Color& color);
 
   /** @returns the lifespan of the particles */

trunk/src/lib/particles/quick_animation.cc

@@ -287 +287 @@
 
   for (unsigned int i = 0; i < this->keyFrames.size(); i++)
-    printf("(%f, %f)->", this->keyFrames[i].position, this->keyFrames[i].value);
+    printf("(%0.2f, %0.2f)->", this->keyFrames[i].position, this->keyFrames[i].value);
   printf("\n");
 }