Changeset 8448 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Jun 15, 2006, 12:48:26 PM (18 years ago)

Author:

bensch

Message:

merged gui back to the trunk
merged with command
merge -r8377:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .

Location:

trunk/src/lib/util

Files:

• color.cc (modified) (1 diff)
• color.h (modified) (1 diff)

trunk/src/lib/util/color.cc

@@ -18 +18 @@
 #include "color.h"
 #include <stdio.h>
+
+
+void Color::debug() const
+{
+  printf("r:%0.2f g:%0.2f, b:%0.2f, a:%0.2f\n", r(), g(), b(), a());
+}
 
 /**

trunk/src/lib/util/color.h

@@ -16 +16 @@
 {
 public:
-  Color(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 0.0f) { _rgba[0] = r; _rgba[1] = g; _rgba[2] = b; _rgba[3] = a; };
+  Color(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 1.0f) { _rgba[0] = r; _rgba[1] = g; _rgba[2] = b; _rgba[3] = a; };
   Color(const Color& c) { _rgba[0] = c.r(); _rgba[1] = c.g(); _rgba[2] = c.b(); _rgba[3] = c.a(); }
 
-  float& operator[](unsigned int i) { return _rgba[i]; }
-  const float& operator[](unsigned int i) const { return _rgba[i]; }
+  inline const Color& operator=(const Color& c) { _rgba[0] = c.r(); _rgba[1] = c.g(); _rgba[2] = c.b(); _rgba[3] = c.a(); return *this; };
+  inline bool operator==(const Color& c) const { return (r() == c.r() && g() == c.g() && b() == c.b() && a() == c.a()); };
 
-  float r() const { return _rgba[0]; }
-  float& r() { return _rgba[0]; }
-  float g() const { return _rgba[1]; }
-  float& g() { return _rgba[1]; }
-  float b() const { return _rgba[2]; }
-  float& b() { return _rgba[2]; }
-  float a() const { return _rgba[3]; }
-  float& a() { return _rgba[3]; }
+  inline float& operator[](unsigned int i) { return _rgba[i]; }
+  inline const float& operator[](unsigned int i) const { return _rgba[i]; }
 
+  inline float r() const { return _rgba[0]; }
+  inline float& r() { return _rgba[0]; }
+  inline float g() const { return _rgba[1]; }
+  inline float& g() { return _rgba[1]; }
+  inline float b() const { return _rgba[2]; }
+  inline float& b() { return _rgba[2]; }
+  inline float a() const { return _rgba[3]; }
+  inline float& a() { return _rgba[3]; }
+
+
+
+
+  void setColor(float r = 0.0f, float g = 0.0f, float b = 0.0f, float a = 1.0f) { _rgba[0] = r; _rgba[1] = g; _rgba[2] = b; _rgba[3] = a; };
+  void setColor(const Color& c) { r() = c.r();  g()= c.g(); b() = c.b(); a() = c.a(); };
+
+  inline float dist(const Color& c) const { return (sqrt((r()-c.r())*(r()-c.r()) + (g()-c.g())*(g()-c.g()) + (b()-c.b())*(b()-c.b()) + (a()-c.a())*(a()-c.a()))); }
+  /// Maths
+  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-=(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 Color operator*(float v) const { return Color(r()*v, g()*v, b()*v, a()*v); };
+
+  void slerp(const Color& c, float v) { *this += (c - *this) * v; };
+
+  void debug() const;
 
   /// STATIC TRANSFORMATIONS