Changeset 5011 in orxonox.OLD

Timestamp:

Aug 14, 2005, 3:58:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: colors work, as they are expected too

Location:

orxonox/trunk/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• util/color.cc (modified) (5 diffs)
• util/color.h (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -708 +708 @@
     tIterator<PNode>* iterator = this->children->getIterator();
       //PNode* pn = this->children->enumerate ();
-    Vector childColor =  Color::RGBtoHSV(color)+Vector(-.3,.3,.2);
+    Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
     PNode* pn = iterator->nextElement();
     while( pn != NULL)

orxonox/trunk/src/lib/util/color.cc

@@ -12 +12 @@
    main-programmer: Benjamin Grauer
    co-programmer: ...
-
-   this code has been borrowed from:
-   http://www.easyrgb.com/math.php
 */
 
@@ -29 +26 @@
 #include <stdio.h>
 
-// Needed by rgb2hsv()
-float Color::maxrgb(float r, float g, float b)
-{
-  float max;
-
-  if( r > g)
-    max = r;
-  else
-    max = g;
-  if( b > max )
-    max = b;
-  return( max );
-}
-
-
-// Needed by rgb2hsv()
-float Color::minrgb(float r,float g,float b)
-{
-  float min;
-
-  if( r < g)
-    min = r;
-  else
-    min = g;
-  if( b < min )
-    min = b;
-  return( min );
-}
-
-
-/* Taken from "Fund'l of 3D Computer Graphics", Alan Watt (1989)
-   Assumes (r,g,b) range from 0.0 to 1.0
-   Sets h in degrees: 0.0 to 360.;
-      s,v in [0.,1.]
-*/
+/**
+ * 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)
 {
@@ -99 +66 @@
     else
       printf("rgb2hsv::How did I get here?\n");
-    h *= 60;
+    h *= 60.;
     if( h < 0)
       h += 360.0;
@@ -106 +73 @@
 }
 
-/* Taken from "Fund'l of 3D Computer Graphics", Alan Watt (1989)
-   Assumes H in degrees, s,v in [0.,1.0];
-   (r,g,b) range from 0.0 to 1.0
-*/
+/**
+ * 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)
 {
@@ -175 +143 @@
   return Vector(r,g,b);
 }
+
+
+// Needed by rgb2hsv()
+float Color::maxrgb(float r, float g, float b)
+{
+  float max;
+  if( r > g)
+    max = r;
+  else
+    max = g;
+  if( b > max )
+    max = b;
+  return( max );
+}
+
+
+// Needed by rgb2hsv()
+float Color::minrgb(float r,float g,float b)
+{
+  float min;
+
+  if( r < g)
+    min = r;
+  else
+    min = g;
+  if( b < min )
+    min = b;
+  return( min );
+}
+

orxonox/trunk/src/lib/util/color.h

@@ -13 +13 @@
 class Vector;
 
+//! a very abstract Class that helps transforming Colors into different Systems
 class Color
 {