Changeset 9497 in orxonox.OLD

Timestamp:

Jul 27, 2006, 11:20:28 AM (18 years ago)

Author:

bensch

Message:

coloring for the hovers

Location:

branches/proxy/src

Files:

• lib/particles/particle_system.cc (modified) (3 diffs)
• lib/particles/particle_system.h (modified) (2 diffs)
• lib/util/color.h (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (1 diff)
• world_entities/space_ships/turbine_hover.h (modified) (2 diffs)

branches/proxy/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.

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

branches/proxy/src/lib/util/color.h

@@ -48 +48 @@
   inline const Color& operator-=(const Color& c) { r()-=c.r(); g()-=c.g(); b()-=c.b(); a()-=c.a(); return *this; };
   inline Color operator-(const Color& c) const { return Color(r()-c.r(), g()-c.g(), b()-c.b(), a()-c.a()); };
+  inline const Color& operator*=(float v) { r()*=v, g()*=v, b()*=v, a()*=v; return *this; };
   inline Color operator*(float v) const { return Color(r()*v, g()*v, b()*v, a()*v); };
 

branches/proxy/src/world_entities/space_ships/turbine_hover.cc

@@ -233 +233 @@
 }
 
+
+void TurbineHover::setBoostColor(const Color& color)
+{
+  this->burstSystem->setColor(0.0, color);
+  this->burstSystem->setColor(0.2, color * 0.6);
+  this->burstSystem->setColor(0.5, color * .3 + Color(0.5, 0.5, 0.8, 0.3));
+  this->burstSystem->setColor(1.0, 0.8, 0.8, 0.8, 0.0);
+}
+
 void TurbineHover::setPlayDirection(const Quaternion& rot, float speed)
 {

branches/proxy/src/world_entities/space_ships/turbine_hover.h

@@ -10 +10 @@
 #include "playable.h"
 
+#include "color.h"
+
 // Forward Declaration
 class ParticleEmitter;
@@ -20 +22 @@
     TurbineHover(const TiXmlElement* root = NULL);
     virtual ~TurbineHover();
+
+    void setBoostColor(const Color& color);
 
     virtual void loadParams(const TiXmlElement* root);