Changeset 7195 in orxonox.OLD for trunk/src/lib/util/color.cc

Timestamp:

Mar 7, 2006, 11:12:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: performance issues

File:

• trunk/src/lib/util/color.cc (modified) (3 diffs)

trunk/src/lib/util/color.cc

@@ -17 +17 @@
 
 #include "color.h"
-#include "vector.h"
+#include <stdio.h>
 
 using namespace std;
 
 
-
-
-#include <stdio.h>
-
 /**
- * transforms from RGB to HSVtoRGB
- * @param RGB the RGB-color [0-1]
+ * @brief transforms from RGB to HSVtoRGB
+ * @param RGB: the RGB-color [0-1]
  * @returns HSV: with values (h[0-360(degree)],s[0,1],v[0,1])
  */
 Vector Color::RGBtoHSV(const Vector& RGB)
+{
+  Vector HSV;
+  RGBtoHSV(RGB, HSV);
+  return HSV;
+}
+
+/**
+ * @brief transforms from RGB to HSVtoRGB
+ * @param RGB: the RGB-color [0-1]
+ * @param HSV: with values (h[0-360(degree)],s[0,1],v[0,1])
+ */
+void Color::RGBtoHSV(const Vector& RGB, Vector& HSV)
 {
   float r = RGB.x;
@@ -70 +78 @@
       h += 360.0;
   }
-  return Vector(h, s, v);
+  HSV = Vector(h, s, v);
 }
 
 /**
- * converts a Color from HSV to RGBtoHSV
+ * @brief converts a Color from HSV to RGBtoHSV
  * @param HSV: Vector with values (h[0-360(degree)],s[0,1],v[0,1])
  * @returns RGB: Vector [0-1]
  */
 Vector Color::HSVtoRGB(const Vector& HSV)
+{
+  Vector RGB;
+  HSVtoRGB(HSV, RGB);
+  return RGB;
+}
+
+/**
+ * @brief converts a Color from HSV to RGBtoHSV
+ * @param HSV: Vector with values (h[0-360(degree)],s[0,1],v[0,1])
+ * @param RGB: Vector [0-1]
+ */
+void Color::HSVtoRGB(const Vector& HSV, Vector& RGB)
 {
   float h = HSV.x;
@@ -141 +161 @@
     }
   }
-  return Vector(r,g,b);
+  RGB = Vector(r,g,b);
 }