Merge pull request #8328 from dhowe/ticket8278

Resolves #8278

Author: davepagurek

docs/parameterData.json

@@ -305,6 +305,7 @@
     },
     "ellipseMode": {
       "overloads": [
+        [],
         [
           "CENTER|RADIUS|CORNER|CORNERS"
         ]
@@ -808,6 +809,7 @@
     },
     "rectMode": {
       "overloads": [
+        [],
         [
           "CENTER|RADIUS|CORNER|CORNERS"
         ]
@@ -878,7 +880,8 @@
           "ARROW|CROSS|HAND|MOVE|TEXT|WAIT|String",
           "Number?",
           "Number?"
-        ]
+        ],
+        []
       ]
     },
     "createElement": {
@@ -1086,7 +1089,8 @@
       "overloads": [
         [
           "ROUND|SQUARE|PROJECT"
-        ]
+        ],
+        []
       ]
     },
     "lerp": {
@@ -1292,7 +1296,8 @@
       "overloads": [
         [
           "MITER|BEVEL|ROUND"
-        ]
+        ],
+        []
       ]
     },
     "noCursor": {
@@ -1391,7 +1396,8 @@
       "overloads": [
         [
           "Number"
-        ]
+        ],
+        []
       ]
     },
     "degrees": {
@@ -2268,6 +2274,7 @@
     },
     "colorMode": {
       "overloads": [
+        [],
         [
           "RGB|HSB|HSL|RGBHDR|HWB|LAB|LCH|OKLAB|OKLCH",
           "Number?"
@@ -2492,6 +2499,7 @@
     },
     "tint": {
       "overloads": [
+        [],
         [
           "Number",
           "Number",
@@ -2631,6 +2639,7 @@
     },
     "fill": {
       "overloads": [
+        [],
         [
           "Number",
           "Number",
@@ -2680,7 +2689,8 @@
         [
           "LEFT|CENTER|RIGHT?",
           "TOP|BOTTOM|CENTER|BASELINE?"
-        ]
+        ],
+        []
       ]
     },
     "textAscent": {
@@ -2701,15 +2711,17 @@
       "overloads": [
         [
           "Number?"
-        ]
+        ],
+        []
       ]
     },
     "textFont": {
       "overloads": [
         [
           "p5.Font|String|Object?",
           "Number?"
-        ]
+        ],
+        []
       ]
     },
     "textSize": {
@@ -2854,6 +2866,7 @@
     },
     "imageMode": {
       "overloads": [
+        [],
         [
           "CORNER|CORNERS|CENTER"
         ]
@@ -2983,6 +2996,7 @@
     },
     "stroke": {
       "overloads": [
+        [],
         [
           "Number",
           "Number",
@@ -3227,6 +3241,7 @@
     },
     "blendMode": {
       "overloads": [
+        [],
         [
           "BLEND|DARKEST|LIGHTEST|DIFFERENCE|MULTIPLY|EXCLUSION|SCREEN|REPLACE|OVERLAY|HARD_LIGHT|SOFT_LIGHT|DODGE|BURN|ADD|REMOVE|SUBTRACT"
         ]
@@ -3298,7 +3313,8 @@
       "overloads": [
         [
           "Object"
-        ]
+        ],
+        []
       ]
     },
     "linePerspective": {
@@ -3387,7 +3403,8 @@
       "overloads": [
         [
           "IMAGE|NORMAL"
-        ]
+        ],
+        []
       ]
     },
     "setCamera": {
@@ -3409,7 +3426,8 @@
         [
           "CLAMP|REPEAT|MIRROR",
           "CLAMP|REPEAT|MIRROR?"
-        ]
+        ],
+        []
       ]
     },
     "normalMaterial": {

src/color/p5.Color.js

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

src/color/setting.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/core/environment.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/p5.Renderer.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();