Get hue, saturation, brightness funcs now return expect vals; hold for rebase

sarahghp · sarahghp · commit 1249ea7c4984 · 2015-05-29T10:28:40.000-04:00
diff --git a/lib/p5.js b/lib/p5.js
@@ -1,4 +1,4 @@
-/*! p5.js v0.4.5 May 28, 2015 */
+/*! p5.js v0.4.5 May 29, 2015 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd)
     define('p5', [], function () { return (root.returnExportsGlobal = factory());});
@@ -493,24 +493,25 @@ amdclean['p5Color'] = function (require, core, utilscolor_utils, constants) {
   var constants = constants;
   p5.Color = function (pInst, vals) {
     this.color_array = p5.Color._getFormattedColor.apply(pInst, vals);
-    this._normalizeColorArray(pInst);
-    if (pInst._colorMode === constants.HSB) {
+    this._converted_color = this._normalizeColorArray(pInst);
+    var isHSB = pInst._colorMode === constants.HSB;
+    if (isHSB) {
       this.hsba = this.color_array;
-      this.rgba = color_utils.hsbaToRGBA(this.hsba);
+      this.rgba = color_utils.hsbaToRGBA(this._converted_color);
     } else {
-      this.rgba = this.color_array;
+      this.rgba = this._converted_color;
       this.hsba = color_utils.rgbaToHSBA(this.rgba);
     }
     return this;
   };
   p5.Color.prototype._normalizeColorArray = function (pInst) {
     var isRGB = pInst._colorMode === constants.RGB;
     var maxArr = isRGB ? pInst._maxRGB : pInst._maxHSB;
-    var arr = this.color_array;
-    arr[0] *= 255 / maxArr[0];
-    arr[1] *= 255 / maxArr[1];
-    arr[2] *= 255 / maxArr[2];
-    arr[3] *= 255 / maxArr[3];
+    var arr = [];
+    arr[0] = this.color_array[0] * 255 / maxArr[0];
+    arr[1] = this.color_array[1] * 255 / maxArr[1];
+    arr[2] = this.color_array[2] * 255 / maxArr[2];
+    arr[3] = this.color_array[3] * 255 / maxArr[3];
     return arr;
   };
   p5.Color.prototype.getHue = function () {
diff --git a/lib/p5.min.js b/lib/p5.min.js
diff --git a/src/color/setting.js b/src/color/setting.js
@@ -31,13 +31,13 @@ define(function (require) {
    *                                               (depending on the current
    *                                               color mode), color string,
    *                                               p5.Color, or p5.Image
-   * @param {Number|Array}                    [v2] green or saturation value
+   * @param {Number}                          [v2] green or saturation value
    *                                               (depending on the current
    *                                               color mode)
-   * @param {Number|Array}                    [v3] blue or brightness value
+   * @param {Number}                          [v3] blue or brightness value
    *                                               (depending on the current
    *                                               color mode)
-   * @param {Number|Array}                    [a]  opacity of the background
+   * @param {Number}                          [a]  opacity of the background
    *
    * @example
    * <div>
@@ -149,7 +149,9 @@ define(function (require) {
    * Changes the way p5.js interprets color data. By default, the parameters
    * for fill(), stroke(), background(), and color() are defined by values
    * between 0 and 255 using the RGB color model. The colorMode() function is
-   * used to switch color systems.
+   * used to switch color systems. Regardless of color system, all value ranges
+   * are presumed to be 0–255 unless explicitly set otherwise. That is, 
+   * for a standard HSB range, one would pass colorMode(HSB, 360, 100, 100, 1).
    *
    * @method colorMode
    * @param {Number|Constant} mode either RGB or HSB, corresponding to
@@ -226,13 +228,13 @@ define(function (require) {
    *                                            (depending on the current color
    *                                            mode), or color Array, or CSS
    *                                            color string
-   * @param {Number|Array}                 [v2] green or saturation value
+   * @param {Number}                       [v2] green or saturation value
    *                                            (depending on the current
    *                                            color mode)
-   * @param {Number|Array}                 [v3] blue or brightness value
+   * @param {Number}                       [v3] blue or brightness value
    *                                            (depending on the current
    *                                            color mode)
-   * @param {Number|Array}                 [a]  opacity of the background
+   * @param {Number}                       [a]  opacity of the background
    *
    * @example
    * <div>
@@ -377,13 +379,13 @@ define(function (require) {
    *                                            (depending on the current color
    *                                            mode), or color Array, or CSS
    *                                            color string
-   * @param {Number|Array}                 [v2] green or saturation value
+   * @param {Number}                       [v2] green or saturation value
    *                                            (depending on the current
    *                                            color mode)
-   * @param {Number|Array}                 [v3] blue or brightness value
+   * @param {Number}                       [v3] blue or brightness value
    *                                            (depending on the current
    *                                            color mode)
-   * @param {Number|Array}                 [a]  opacity of the background
+   * @param {Number}                       [a]  opacity of the background
    *
    * @example
    * <div>
diff --git a/src/objects/p5.Color.js b/src/objects/p5.Color.js
@@ -16,13 +16,15 @@ define(function(require) {
    */
   p5.Color = function (pInst, vals) {
     this.color_array = p5.Color._getFormattedColor.apply(pInst, vals);
-    this._normalizeColorArray(pInst);
+    this._converted_color = this._normalizeColorArray(pInst);
+    
+    var isHSB = pInst._colorMode === constants.HSB;
 
-    if (pInst._colorMode === constants.HSB) {
+    if (isHSB) {
       this.hsba = this.color_array;
-      this.rgba = color_utils.hsbaToRGBA(this.hsba);
+      this.rgba = color_utils.hsbaToRGBA(this._converted_color);
     } else {
-      this.rgba = this.color_array;
+      this.rgba = this._converted_color;
       this.hsba = color_utils.rgbaToHSBA(this.rgba);
     }
 
@@ -32,11 +34,13 @@ define(function(require) {
   p5.Color.prototype._normalizeColorArray = function (pInst) {
     var isRGB = pInst._colorMode === constants.RGB;
     var maxArr = isRGB ? pInst._maxRGB : pInst._maxHSB;
-    var arr = this.color_array;
-    arr[0] *= 255 / maxArr[0];
-    arr[1] *= 255 / maxArr[1];
-    arr[2] *= 255 / maxArr[2];
-    arr[3] *= 255 / maxArr[3];
+    // var arr = this.color_array;
+    var arr = [];
+    arr[0] = this.color_array[0] * 255 / maxArr[0];
+    arr[1] = this.color_array[1] * 255 / maxArr[1];
+    arr[2] = this.color_array[2] * 255 / maxArr[2];
+    arr[3] = this.color_array[3] * 255 / maxArr[3];
+    // why does this return the arr when it is actually mutating the reference?
     return arr;
   };
 
diff --git a/src/objects/p5.Table.js b/src/objects/p5.Table.js
@@ -23,7 +23,8 @@ define(function (require) {
    *  <p>A rough "spec" for CSV can be found
    *  <a href="http://tools.ietf.org/html/rfc4180">here</a>.</p>
    *  <p>To load files, use the loadTable method.</p>
-   *  <p>To save tables to your computer, use the save method or the saveTable method.</p>
+   *  <p>To save tables to your computer, use the save method
+   *   or the saveTable method.</p>
    *
    *  Possible options include:
    *  <ul>
diff --git a/test/unit/objects/p5.Color.js b/test/unit/objects/p5.Color.js
@@ -534,13 +534,15 @@ suite('p5.Color', function() {
     });
   });
 
-  suite('new p5.Color in HSB mode', function() {
+  suite('new p5.Color in HSB-255 mode', function() {
     setup(function() {
       myp5.colorMode(myp5.HSB);
       c = myp5.color(149, 170, 30, 255);
     });
 
     test('should correctly set HSBA property', function() {
+      assert.equal(c.hsba.length, 4);
+      assert.equal(Math.round(c.getHue()), 149);
       assert.deepEqual(c.hsba, [149, 170, 30, 255]);
     });
 
@@ -553,6 +555,34 @@ suite('p5.Color', function() {
     });
   });
 
+  suite('new p5.Color in HSB-360 mode', function() {
+    setup(function() {
+      myp5.colorMode(myp5.HSB, 360, 100, 100, 1);
+      c = myp5.color(48, 100, 100, 1);
+    });
+
+    test('should correctly set HSBA value', function(){
+      assert.deepEqual(c.hsba, [48, 100, 100, 1]);
+    });
+
+    test('should correctly set converted value', function(){
+      assert.deepEqual(c._converted_color, [34, 255, 255, 255]);
+    });
+
+    test('should return passed, unconverted, hue value', function(){
+      assert.equal(c.getHue(), 48);
+    });
+
+    test('should return passed, unconverted, saturation value', function(){
+      assert.equal(c.getSaturation(), 100);
+    });
+
+    test('should return passed, unconverted, brightness value', function(){
+      assert.equal(c.getBrightness(), 100);
+    });
+
+  });
+
   suite('new p5.Color with Base 1 colors', function() {
     var base_1_rgba = [0.2, 0.4, 0.6, 0.5];
     var base_255_rgba = [51, 102, 153, 127.5];
