Merge branch 'dev-2.0' into colorBranch

Author: ksen0

src/data/local_storage.js

@@ -147,7 +147,7 @@ function storage(p5, fn){
           value = value.toString();
         } else if (value instanceof p5.Vector) {
           type = 'p5.Vector';
-          const coord = [value.x, value.y, value.z];
+          const coord = value.values;
           value = coord;
         }
         value = JSON.stringify(value);

src/math/p5.Vector.js

@@ -265,14 +265,14 @@ class Vector {
    * function setup() {
    *   let v = createVector(20, 30);
    *
-   *   // Prints 'p5.Vector Object : [20, 30, 0]'.
+   *   // Prints 'vector[20, 30, 0]'.
    *   print(v.toString());
    * }
    * </code>
    * </div>
    */
   toString() {
-    return `[${this._values.join(', ')}]`;
+    return `vector[${this._values.join(', ')}]`;
   }
 
   /**

src/webgl/p5.RendererGL.js

@@ -1352,8 +1352,8 @@ class RendererGL extends Renderer {
       fbo,
       0,
       0,
-      this.width,
-      this.height,
+      fbo.width,
+      fbo.height,
       -target.width / 2,
       -target.height / 2,
       target.width,

test/unit/math/p5.Vector.js

@@ -2035,7 +2035,7 @@ suite('p5.Vector', function () {
   describe('vector to string', () => {
     it('should return the string version of a vector', () => {
       v = new mockP5.Vector(1, 2, 3, 4);
-      expect(v.toString()).toBe('[1, 2, 3, 4]');
+      expect(v.toString()).toBe('vector[1, 2, 3, 4]');
     });
   });
 

test/unit/visual/cases/webgl.js

@@ -51,6 +51,20 @@ visualSuite('WebGL', function() {
       screenshot();
     });
 
+    visualTest('On a framebuffer of a different size from the canvas', function(p5, screenshot) {
+      p5.createCanvas(50, 50, p5.WEBGL);
+      const fbo = p5.createFramebuffer({ antialias: true, width: 25, height: 100 });
+      fbo.begin();
+      p5.background('blue');
+      p5.fill('red');
+      p5.circle(0, 0, 20);
+      p5.filter(p5.BLUR, 3);
+      fbo.end();
+      p5.imageMode(p5.CENTER);
+      p5.image(fbo, 0, 0);
+      screenshot();
+    });
+
     visualTest(
       'On a framebuffer sized differently from the main canvas',
       function(p5, screenshot) {

test/unit/visual/screenshots/WebGL/filter/On a framebuffer of a different size from the canvas/000.png

@@ -0,0 +1,3 @@
+{
+  "numScreenshots": 1
+}