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

Timestamp:

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

Author:

bensch

Message:

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

File:

• trunk/src/lib/particles/particle_system.h (modified) (2 diffs)

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 */