Changeset 2307 for trunk/testTweet

Timestamp:

Feb 1, 2013, 12:30:44 AM (10 years ago)

Author:

sam

Message:

color: slightly tweak the RGB to HSV and HSL conversions for
improved numerical stability on i386.

File:

• trunk/test/unit/color.cpp (modified) (3 diffs)

trunk/test/unit/color.cpp

@@ -85 +85 @@
             LOLUNIT_ASSERT_DOUBLES_EQUAL(d1, d2, 0.0001);
             LOLUNIT_ASSERT_DOUBLES_EQUAL(d2, d3, 0.0001);
+            LOLUNIT_UNSET_CONTEXT();
         }
     }
@@ -95 +96 @@
         {
             vec3 v1 = vec3(r / 20.f, g / 20.f, b / 20.f);
-            vec3 v2 = Color::HSVToRGB(Color::RGBToHSV(v1));
+            vec3 v2 = Color::RGBToHSV(v1);
+            vec3 v3 = Color::HSVToRGB(v2);
 
-            LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.r, v2.r, 0.0001);
-            LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.g, v2.g, 0.0001);
-            LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.b, v2.b, 0.0001);
+            String rgb = String::Printf("[%f %f %f]", v1.r, v1.g, v1.b);
+            LOLUNIT_SET_CONTEXT(&rgb[0]);
+
+            if (r != g || g != b)
+                LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.r, v3.r, 0.0001);
+            LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.g, v3.g, 0.0001);
+            LOLUNIT_ASSERT_DOUBLES_EQUAL(v1.b, v3.b, 0.0001);
+
+            LOLUNIT_UNSET_CONTEXT();
         }
     }
@@ -113 +121 @@
             vec3 v3 = Color::HSVToHSL(Color::RGBToHSV(v1));
 
-            LOLUNIT_ASSERT_DOUBLES_EQUAL(v2.x, v3.x, 0.0001);
+            String rgb = String::Printf("[%f %f %f]", v1.r, v1.g, v1.b);
+            LOLUNIT_SET_CONTEXT(&rgb[0]);
+
+            if (r != g || g != b)
+                LOLUNIT_ASSERT_DOUBLES_EQUAL(v2.x, v3.x, 0.0001);
             LOLUNIT_ASSERT_DOUBLES_EQUAL(v2.y, v3.y, 0.0001);
             LOLUNIT_ASSERT_DOUBLES_EQUAL(v2.z, v3.z, 0.0001);
+
+            LOLUNIT_UNSET_CONTEXT();
         }
     }