Merge pull request #1460 from joecridge/hsb-with-max-hue

Rearrange if statement in _hsbaToRGBA, fixes #1459

Author: Lauren McCarthy

src/color/color_conversion.js

@@ -61,11 +61,7 @@ p5.ColorConversion._hsbaToRGBA = function(hsba) {
     var tint2 = val * (1 - sat * (hue - sector));
     var tint3 = val * (1 - sat * (1 + sector - hue));
     var red, green, blue;
-    if (sector === 0) {  // Red to yellow.
-      red = val;
-      green = tint3;
-      blue = tint1;
-    } else if (sector === 1) {  // Yellow to green.
+    if (sector === 1) {  // Yellow to green.
       red = tint2;
       green = val;
       blue = tint1;
@@ -81,10 +77,14 @@ p5.ColorConversion._hsbaToRGBA = function(hsba) {
       red = tint3;
       green = tint1;
       blue = val;
-    } else {  // Magenta to red.
+    } else if (sector === 5) {  // Magenta to red.
       red = val;
       green = tint1;
       blue = tint2;
+    } else {  // Red to yellow (sector could be 0 or 6).
+      red = val;
+      green = tint3;
+      blue = tint1;
     }
     RGBA = [red, green, blue, hsba[3]];
   }

test/unit/color/color_conversion.js

@@ -1,77 +1,99 @@
 suite('p5.ColorConversion', function() {
   var rgba = [1, 0, 0.4, 0.8];
   var hsla = [336/360, 1, 0.5, 0.8];
+  var hslaWithMaxHue = [1, 1, 0.5, 0.6];
   var hsba = [336/360, 1, 1, 0.8];
-  var one;
+  var hsbaWithMaxHue = [1, 1, 1, 0.6];
+  var result;
 
   suite('rgbaToHSBA', function() {
     test('rgba converts to hsba', function() {
-      one = p5.ColorConversion._rgbaToHSBA(rgba);
+      result = p5.ColorConversion._rgbaToHSBA(rgba);
       assert.deepEqual([
-        Math.round(one[0] * 360),
-        Math.round(one[1] * 100),
-        Math.round(one[2] * 100),
-        one[3]
+        Math.round(result[0] * 360),
+        Math.round(result[1] * 100),
+        Math.round(result[2] * 100),
+        result[3]
       ], [336, 100, 100, 0.8]);
     });
   });
 
   suite('hsbaToRGBA', function() {
     test('hsba converts to rgba', function() {
-      one = p5.ColorConversion._hsbaToRGBA(hsba);
+      result = p5.ColorConversion._hsbaToRGBA(hsba);
       assert.deepEqual([
-        Math.round(one[0] * 255),
-        Math.round(one[1] * 255),
-        Math.round(one[2] * 255),
-        Math.round(one[3] * 255)
+        Math.round(result[0] * 255),
+        Math.round(result[1] * 255),
+        Math.round(result[2] * 255),
+        Math.round(result[3] * 255)
       ], [255, 0, 102, 204]);
     });
+
+    test('handles maximum hue value', function() {
+      result = p5.ColorConversion._hsbaToRGBA(hsbaWithMaxHue);
+      assert.deepEqual([
+        Math.round(result[0] * 255),
+        Math.round(result[1] * 255),
+        Math.round(result[2] * 255),
+        Math.round(result[3] * 255)
+      ], [255, 0, 0, 153]);
+    });
   });
 
   suite('hslaToRGBA', function() {
     test('hsla converts to rgba', function() {
-      one = p5.ColorConversion._hslaToRGBA(hsla);
+      result = p5.ColorConversion._hslaToRGBA(hsla);
       assert.deepEqual([
-        Math.round(one[0] * 255),
-        Math.round(one[1] * 255),
-        Math.round(one[2] * 255),
-        Math.round(one[3] * 255)
+        Math.round(result[0] * 255),
+        Math.round(result[1] * 255),
+        Math.round(result[2] * 255),
+        Math.round(result[3] * 255)
       ], [255, 0, 102, 204]);
     });
+
+    test('handles maximum hue value', function() {
+      result = p5.ColorConversion._hslaToRGBA(hslaWithMaxHue);
+      assert.deepEqual([
+        Math.round(result[0] * 255),
+        Math.round(result[1] * 255),
+        Math.round(result[2] * 255),
+        Math.round(result[3] * 255)
+      ], [255, 0, 0, 153]);
+    });
   });
 
   suite('rgbaToHSLA', function() {
     test('rgba converts to hsla', function() {
-      one = p5.ColorConversion._rgbaToHSLA(rgba);
+      result = p5.ColorConversion._rgbaToHSLA(rgba);
       assert.deepEqual([
-        Math.round(one[0] * 360),
-        Math.round(one[1] * 100),
-        Math.round(one[2] * 100),
-        one[3]
+        Math.round(result[0] * 360),
+        Math.round(result[1] * 100),
+        Math.round(result[2] * 100),
+        result[3]
       ], [336, 100, 50, 0.8]);
     });
   });
 
   suite('hslaToHSBA', function() {
     test('hsla converts to hsba', function() {
-      one = p5.ColorConversion._hslaToHSBA(hsla);
+      result = p5.ColorConversion._hslaToHSBA(hsla);
       assert.deepEqual([
-        Math.round(one[0] * 360),
-        Math.round(one[1] * 100),
-        Math.round(one[2] * 100),
-        one[3]
+        Math.round(result[0] * 360),
+        Math.round(result[1] * 100),
+        Math.round(result[2] * 100),
+        result[3]
       ], [336, 100, 100, 0.8]);
     });
   });
 
   suite('hsbaToHSLA', function() {
     test('hsba converts to hsla', function() {
-      one = p5.ColorConversion._hsbaToHSLA(hsba);
+      result = p5.ColorConversion._hsbaToHSLA(hsba);
       assert.deepEqual([
-        Math.round(one[0] * 360),
-        Math.round(one[1] * 100),
-        Math.round(one[2] * 100),
-        one[3]
+        Math.round(result[0] * 360),
+        Math.round(result[1] * 100),
+        Math.round(result[2] * 100),
+        result[3]
       ], [336, 100, 50, 0.8]);
     });
   });