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

Timestamp:

Jun 14, 2006, 12:13:16 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: no more seg-fault when copying a Texture

Location:

trunk/src/lib/util

Files:

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

trunk/src/lib/util/color.cc

@@ -18 +18 @@
 #include "color.h"
 #include <stdio.h>
-
-using namespace std;
-
 
 /**

trunk/src/lib/util/color.h

@@ -16 +16 @@
 {
 public:
-  Color(float r, float g, float b, float a) :_r(r), _g(g), _b(b), _a(a) {};
-  Color(const Color& c) { _r = c._r; _g = c._g; _b = c._b; _a = c._a; };
+  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(const Color& c) { _rgba[0] = c.r(); _rgba[1] = c.g(); _rgba[2] = c.b(); _rgba[3] = c.a(); }
 
-  float r() const { return _r; }
-  float& r() { return _r; }
-  float g() const { return _g; }
-  float& g() { return _g; }
-  float b() const { return _b; }
-  float& b() { return _b; }
-  float a() const { return _a; }
-  float& a() { return _a; }
+  float& operator[](unsigned int i) { return _rgba[i]; }
+  const float& operator[](unsigned int i) const { return _rgba[i]; }
 
+  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]; }
+
+
+  /// STATIC TRANSFORMATIONS
 public:
   static Vector RGBtoHSV (const Vector& RGB);
@@ -38 +43 @@
   static float maxrgb(float r, float g, float b);
 
-  float       _r;     //!< Red Value.
+private:
+  float       _rgba[4]; //!< Color Values
+
+  /*  float       _r;     //!< Red Value.
   float       _g;     //!< Green Value.
   float       _b;     //!< Blue Value.
-  float       _a;     //!< Alpha Value.
-
+  float       _a;     //!< Alpha Value.*/
 };