Merge branch 'dev-2.0' into compute-shaders

Author: davepagurek

docs/parameterData.json

@@ -727,7 +727,7 @@ class Color {
       if(!Array.isArray(v)){
         return [0, v];
       }else{
-        return v
+        return v;
       }
     });
 

src/color/p5.Color.js

@@ -580,8 +580,7 @@ function setting(p5, fn){
    * @chainable
    */
   fn.background = function(...args) {
-    this._renderer.background(...args);
-    return this;
+    return this._renderer.background(...args);
   };
 
   /**
@@ -1096,6 +1095,8 @@ function setting(p5, fn){
    * or `HSLA` colors, depending on the current <a href="#/p5/colorMode">colorMode()</a>. The last parameter
    * sets the alpha (transparency) value.
    *
+   * Calling `fill()` without an argument returns the current fill as a <a href="#/p5.Color">p5.Color</a> object.
+   *
    * @method fill
    * @param  {Number}        v1      red value if color mode is RGB or hue value if color mode is HSB.
    * @param  {Number}        v2      green value if color mode is RGB or saturation value if color mode is HSB.
@@ -1284,9 +1285,12 @@ function setting(p5, fn){
    * @param  {p5.Color}      color   the fill color.
    * @chainable
    */
+  /**
+   * @method fill
+   * @return {p5.Color}      the current fill color.
+   */
   fn.fill = function(...args) {
-    this._renderer.fill(...args);
-    return this;
+    return this._renderer.fill(...args);
   };
 
   /**
@@ -1415,6 +1419,8 @@ function setting(p5, fn){
    * or HSLA colors, depending on the current `colorMode()`. The last parameter
    * sets the alpha (transparency) value.
    *
+   * Calling `stroke()` without an argument returns the current stroke as a <a href="#/p5.Color">p5.Color</a> object.
+   *
    * @method stroke
    * @param  {Number}        v1      red value if color mode is RGB or hue value if color mode is HSB.
    * @param  {Number}        v2      green value if color mode is RGB or saturation value if color mode is HSB.
@@ -1601,9 +1607,12 @@ function setting(p5, fn){
    * @param  {p5.Color}      color   the stroke color.
    * @chainable
    */
+  /**
+   * @method stroke
+   * @return {p5.Color}      the current stroke color.
+   */
   fn.stroke = function(...args) {
-    this._renderer.stroke(...args);
-    return this;
+    return this._renderer.stroke(...args);
   };
 
   /**
@@ -1768,6 +1777,8 @@ function setting(p5, fn){
    *                EXCLUSION, SCREEN, REPLACE, OVERLAY, HARD_LIGHT,
    *                SOFT_LIGHT, DODGE, BURN, ADD, REMOVE or SUBTRACT
    *
+   * Calling `blendMode()` without an argument returns the current blendMode.
+   *
    * @example
    * function setup() {
    *   createCanvas(100, 100);
@@ -2136,6 +2147,10 @@ function setting(p5, fn){
    *   describe('A yellow line and a turquoise line form an X on a gray background. The area where they overlap is green.');
    * }
    */
+  /**
+   * @method blendMode
+   * @return {(BLEND|DARKEST|LIGHTEST|DIFFERENCE|MULTIPLY|EXCLUSION|SCREEN|REPLACE|OVERLAY|HARD_LIGHT|SOFT_LIGHT|DODGE|BURN|ADD|REMOVE|SUBTRACT)}      the current blend mode.
+   */
   fn.blendMode = function (mode) {
     // p5._validateParameters('blendMode', arguments);
     if (mode === constants.NORMAL) {
@@ -2145,7 +2160,7 @@ function setting(p5, fn){
       );
       mode = constants.BLEND;
     }
-    this._renderer.blendMode(mode);
+    return this._renderer.blendMode(mode);
   };
 }
 

src/color/setting.js

@@ -215,6 +215,8 @@ function environment(p5, fn, lifecycles){
    * cursor, `x` and `y` set the location pointed to within the image. They are
    * both 0 by default, so the cursor points to the image's top-left corner. `x`
    * and `y` must be less than the image's width and height, respectively.
+   * 
+   * Calling `cursor()` without an argument returns the current cursor type as a string.
    *
    * @method cursor
    * @param {(ARROW|CROSS|HAND|MOVE|TEXT|WAIT|String)} type Built-in: either ARROW, CROSS, HAND, MOVE, TEXT, or WAIT.
@@ -281,9 +283,17 @@ function environment(p5, fn, lifecycles){
    *   }
    * }
    */
+  /**
+   * @method cursor
+   * @return {(ARROW|CROSS|HAND|MOVE|TEXT|WAIT|String)} the current cursor type
+   */
   fn.cursor = function(type, x, y) {
     let cursor = 'auto';
     const canvas = this._curElement.elt;
+    if (typeof type === 'undefined') {
+      let curstr = canvas.style.cursor;
+      return curstr.length ? curstr : 'default';
+    }
     if (standardCursors.includes(type)) {
       // Standard css cursor
       cursor = type;

src/core/environment.js

@@ -45,22 +45,20 @@ class Renderer {
     rectMode: constants.CORNER,
     ellipseMode: constants.CENTER,
     strokeWeight: 1,
+    bezierOrder: 3,
+    splineProperties: new ClonableObject({
+      ends: constants.INCLUDE,
+      tightness: 0
+    }),
 
     textFont: { family: 'sans-serif' },
     textLeading: 15,
     leadingSet: false,
     textSize: 12,
     textAlign: constants.LEFT,
     textBaseline: constants.BASELINE,
-    bezierOrder: 3,
-    splineProperties: new ClonableObject({
-      ends: constants.INCLUDE,
-      tightness: 0
-    }),
     textWrap: constants.WORD,
-
-    // added v2.0
-    fontStyle: constants.NORMAL, // v1: textStyle
+    fontStyle: constants.NORMAL, // v1: was textStyle
     fontStretch: constants.NORMAL,
     fontWeight: constants.NORMAL,
     lineHeight: constants.NORMAL,
@@ -330,24 +328,29 @@ class Renderer {
   }
 
   fill(...args) {
-    this.states.setValue('fillSet', true);
-    this.states.setValue('fillColor', this._pInst.color(...args));
-    this.updateShapeVertexProperties();
+    if (args.length > 0) {
+      this.states.setValue('fillSet', true);
+      this.states.setValue('fillColor', this._pInst.color(...args));
+      this.updateShapeVertexProperties();
+    }
+    return this.states.fillColor;
   }
 
   noFill() {
     this.states.setValue('fillColor', null);
   }
 
   strokeWeight(w) {
-    if (w === undefined) {
+    if (typeof w === 'undefined') {
       return this.states.strokeWeight;
-    } else {
-      this.states.setValue('strokeWeight', w);
     }
+    this.states.setValue('strokeWeight', w);
   }
 
   stroke(...args) {
+    if (args.length === 0) {
+      return this.states.strokeColor;
+    }
     this.states.setValue('strokeSet', true);
     this.states.setValue('strokeColor', this._pInst.color(...args));
     this.updateShapeVertexProperties();

src/core/p5.Renderer.js

@@ -166,18 +166,18 @@ class Renderer2D extends Renderer {
   //////////////////////////////////////////////
 
   background(...args) {
+    if (args.length === 0) {
+      return this;// setter with no args does nothing
+    }
     this.push();
     this.resetMatrix();
-
     if (args[0] instanceof Image) {
+      const img = args[0];
       if (args[1] >= 0) {
         // set transparency of background
-        const img = args[0];
         this.drawingContext.globalAlpha = args[1] / 255;
-        this._pInst.image(img, 0, 0, this.width, this.height);
-      } else {
-        this._pInst.image(args[0], 0, 0, this.width, this.height);
       }
+      this._pInst.image(img, 0, 0, this.width, this.height);
     } else {
       // create background rect
       const color = this._pInst.color(...args);
@@ -202,6 +202,8 @@ class Renderer2D extends Renderer {
       }
     }
     this.pop();
+
+    return this;
   }
 
   clear() {
@@ -214,6 +216,9 @@ class Renderer2D extends Renderer {
   fill(...args) {
     super.fill(...args);
     const color = this.states.fillColor;
+    if (args.length === 0) {
+      return color; // getter
+    }
     this._setFill(color.toString());
 
     // Add accessible outputs if the method exists; on success,
@@ -226,6 +231,9 @@ class Renderer2D extends Renderer {
   stroke(...args) {
     super.stroke(...args);
     const color = this.states.strokeColor;
+    if (args.length === 0) {
+      return color; // getter
+    }
     this._setStroke(color.toString());
 
     // Add accessible outputs if the method exists; on success,
@@ -484,6 +492,9 @@ class Renderer2D extends Renderer {
   //////////////////////////////////////////////
 
   blendMode(mode) {
+    if (typeof mode === 'undefined') { // getter
+      return this._cachedBlendMode;
+    }
     if (mode === constants.SUBTRACT) {
       console.warn('blendMode(SUBTRACT) only works in WEBGL mode.');
     } else if (
@@ -1004,6 +1015,9 @@ class Renderer2D extends Renderer {
   //////////////////////////////////////////////
 
   strokeCap(cap) {
+    if (typeof cap === 'undefined') { // getter
+      return this.drawingContext.lineCap;
+    }
     if (
       cap === constants.ROUND ||
       cap === constants.SQUARE ||
@@ -1015,6 +1029,9 @@ class Renderer2D extends Renderer {
   }
 
   strokeJoin(join) {
+    if (typeof join === 'undefined') { // getter
+      return this.drawingContext.lineJoin;
+    }
     if (
       join === constants.ROUND ||
       join === constants.BEVEL ||
@@ -1027,7 +1044,10 @@ class Renderer2D extends Renderer {
 
   strokeWeight(w) {
     super.strokeWeight(w);
-    if (typeof w === 'undefined' || w === 0) {
+    if (typeof w === 'undefined') {
+      return this.states.strokeWeight;
+    }
+    if (w === 0) {
       // hack because lineWidth 0 doesn't work
       this.drawingContext.lineWidth = 0.0001;
     } else {
@@ -1090,16 +1110,22 @@ class Renderer2D extends Renderer {
 
   rotate(rad) {
     this.drawingContext.rotate(rad);
+    return this;
   }
 
   scale(x, y) {
+    // support passing objects with x,y properties (including p5.Vector)
+    if (typeof x === 'object' && 'x' in x && 'y' in x) {
+      y = x.y;
+      x = x.x;
+    }
     this.drawingContext.scale(x, y);
     return this;
   }
 
   translate(x, y) {
-    // support passing a vector as the 1st parameter
-    if (x instanceof p5.Vector) {
+    // support passing objects with x,y properties (including p5.Vector)
+    if (typeof x === 'object' && 'x' in x && 'y' in x) {
       y = x.y;
       x = x.x;
     }

src/core/p5.Renderer2D.js

@@ -137,7 +137,7 @@ export class Renderer3D extends Renderer {
     this.states._useShininess = 1;
     this.states._useMetalness = 0;
 
-    this.states.tint = [255, 255, 255, 255];
+    this.states.tint = new Color([1, 1, 1, 1]);
 
     this.states.constantAttenuation = 1;
     this.states.linearAttenuation = 0;
@@ -726,10 +726,10 @@ export class Renderer3D extends Renderer {
     this.states.setValue("enableLighting", false);
 
     //reset tint value for new frame
-    this.states.setValue("tint", [255, 255, 255, 255]);
+    this.states.setValue("tint", new Color([1,1,1,1]));
 
     //Clear depth every frame
-    this._resetBuffersBeforeDraw()
+    this._resetBuffersBeforeDraw();
   }
 
   background(...args) {
@@ -1491,7 +1491,7 @@ export class Renderer3D extends Renderer {
     // works differently and is global p5 state. If the p5 state has
     // been cleared, we also need to clear the value in uSampler to match.
     fillShader.setUniform("uSampler", this.states._tex || empty);
-    fillShader.setUniform("uTint", this.states.tint);
+    fillShader.setUniform("uTint", this.states.tint._getRGBA([255, 255, 255, 255]));
 
     fillShader.setUniform("uHasSetAmbient", this.states._hasSetAmbient);
     fillShader.setUniform("uAmbientMatColor", this.states.curAmbientColor);