q5 2.9.22 → 2.9.24

package/p5-tests/unit/io/loadBytes.js

@@ -0,0 +1,149 @@
+suite('loadBytes', function() {
+  var invalidFile = '404file';
+  var validFile = 'unit/assets/nyan_cat.gif';
+
+  test('_friendlyFileLoadError is called', async function() {
+    const _friendlyFileLoadErrorStub = sinon.stub(p5, '_friendlyFileLoadError');
+    try {
+      await promisedSketch(function(sketch, resolve, reject) {
+        sketch.preload = function() {
+          sketch.loadBytes(invalidFile, reject, resolve);
+        };
+      });
+      expect(
+        _friendlyFileLoadErrorStub.calledOnce,
+        'p5._friendlyFileLoadError was not called'
+      ).to.be.true;
+    } finally {
+      _friendlyFileLoadErrorStub.restore();
+    }
+  });
+
+  testSketchWithPromise('error prevents sketch continuing', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadBytes(invalidFile);
+      setTimeout(resolve, 50);
+    };
+
+    sketch.setup = function() {
+      reject(new Error('Setup called'));
+    };
+
+    sketch.draw = function() {
+      reject(new Error('Draw called'));
+    };
+  });
+
+  testSketchWithPromise('error callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadBytes(
+        invalidFile,
+        function() {
+          reject(new Error('Success callback executed.'));
+        },
+        function() {
+          // Wait a bit so that if both callbacks are executed we will get an error.
+          setTimeout(resolve, 50);
+        }
+      );
+    };
+  });
+
+  testSketchWithPromise('loading correctly triggers setup', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadBytes(validFile);
+    };
+
+    sketch.setup = function() {
+      resolve();
+    };
+  });
+
+  testSketchWithPromise('success callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    var hasBeenCalled = false;
+    sketch.preload = function() {
+      sketch.loadBytes(
+        validFile,
+        function() {
+          hasBeenCalled = true;
+        },
+        function(err) {
+          reject(new Error('Error callback was entered: ' + err));
+        }
+      );
+    };
+
+    sketch.setup = function() {
+      if (!hasBeenCalled) {
+        reject(new Error('Setup called prior to success callback'));
+      } else {
+        setTimeout(resolve, 50);
+      }
+    };
+  });
+
+  test('returns the correct object', async function() {
+    const object = await promisedSketch(function(sketch, resolve, reject) {
+      var _object;
+      sketch.preload = function() {
+        _object = sketch.loadBytes(validFile, function() {}, reject);
+      };
+
+      sketch.setup = function() {
+        resolve(_object);
+      };
+    });
+    assert.isObject(object);
+    // Check data format
+    expect(object.bytes).to.satisfy(function(v) {
+      return Array.isArray(v) || v instanceof Uint8Array;
+    });
+    // Validate data
+    var str = 'GIF89a';
+    // convert the string to a byte array
+    var rgb = str.split('').map(function(e) {
+      return e.charCodeAt(0);
+    });
+    // this will convert a Uint8Aray to [], if necessary:
+    var loaded = Array.prototype.slice.call(object.bytes, 0, str.length);
+    assert.deepEqual(loaded, rgb);
+  });
+
+  test('passes an object to success callback for object JSON', async function() {
+    const object = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadBytes(validFile, resolve, reject);
+      };
+    });
+    assert.isObject(object);
+    // Check data format
+    expect(object.bytes).to.satisfy(function(v) {
+      return Array.isArray(v) || v instanceof Uint8Array;
+    });
+    // Validate data
+    var str = 'GIF89a';
+    // convert the string to a byte array
+    var rgb = str.split('').map(function(e) {
+      return e.charCodeAt(0);
+    });
+    // this will convert a Uint8Aray to [], if necessary:
+    var loaded = Array.prototype.slice.call(object.bytes, 0, str.length);
+    assert.deepEqual(loaded, rgb);
+  });
+});

package/p5-tests/unit/io/loadImage.js

@@ -0,0 +1,123 @@
+suite('loadImage', function() {
+  var invalidFile = '404file';
+  var validFile = 'unit/assets/nyan_cat.gif';
+
+  test('_friendlyFileLoadError is called', async function() {
+    const _friendlyFileLoadErrorStub = sinon.stub(p5, '_friendlyFileLoadError');
+    try {
+      await promisedSketch(function(sketch, resolve, reject) {
+        sketch.preload = function() {
+          sketch.loadImage(invalidFile, reject, resolve);
+        };
+      });
+      expect(
+        _friendlyFileLoadErrorStub.calledOnce,
+        'p5._friendlyFileLoadError was not called'
+      ).to.be.true;
+    } finally {
+      _friendlyFileLoadErrorStub.restore();
+    }
+  });
+
+  testSketchWithPromise('error prevents sketch continuing', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadImage(invalidFile);
+      setTimeout(resolve(), 50);
+    };
+
+    sketch.setup = function() {
+      reject(new Error('Setup called'));
+    };
+
+    sketch.draw = function() {
+      reject(new Error('Draw called'));
+    };
+  });
+
+  testSketchWithPromise('error callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadImage(
+        invalidFile,
+        function() {
+          reject(new Error('Success callback executed.'));
+        },
+        function() {
+          // Wait a bit so that if both callbacks are executed we will get an error.
+          setTimeout(resolve, 50);
+        }
+      );
+    };
+  });
+
+  testSketchWithPromise('loading correctly triggers setup', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadImage(validFile);
+    };
+
+    sketch.setup = function() {
+      resolve();
+    };
+  });
+
+  testSketchWithPromise('success callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    var hasBeenCalled = false;
+    sketch.preload = function() {
+      sketch.loadImage(
+        validFile,
+        function() {
+          hasBeenCalled = true;
+        },
+        function(err) {
+          reject(new Error('Error callback was entered: ' + err));
+        }
+      );
+    };
+
+    sketch.setup = function() {
+      if (!hasBeenCalled) {
+        reject(new Error('Setup called prior to success callback'));
+      } else {
+        setTimeout(resolve, 50);
+      }
+    };
+  });
+
+  test('returns an object with correct data', async function() {
+    const image = await promisedSketch(function(sketch, resolve, reject) {
+      var _image;
+      sketch.preload = function() {
+        _image = sketch.loadImage(validFile, function() {}, reject);
+      };
+
+      sketch.setup = function() {
+        resolve(_image);
+      };
+    });
+    assert.instanceOf(image, p5.Image);
+  });
+
+  test('passes an object with correct data to callback', async function() {
+    const image = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadImage(validFile, resolve, reject);
+      };
+    });
+    assert.instanceOf(image, p5.Image);
+  });
+});

package/p5-tests/unit/io/loadJSON.js

@@ -0,0 +1,185 @@
+suite('loadJSON', function() {
+  var invalidFile = '404file';
+  var jsonArrayFile = 'unit/assets/array.json';
+  var jsonObjectFile = 'unit/assets/object.json';
+  var jsonpObjectFile = 'unit/assets/object.js';
+  var jsonpArrayFile = 'unit/assets/array.js';
+
+  test('_friendlyFileLoadError is called', async function() {
+    const _friendlyFileLoadErrorStub = sinon.stub(p5, '_friendlyFileLoadError');
+    try {
+      await promisedSketch(function(sketch, resolve, reject) {
+        sketch.preload = function() {
+          sketch.loadJSON(invalidFile, reject, resolve);
+        };
+      });
+      expect(
+        _friendlyFileLoadErrorStub.calledOnce,
+        'p5._friendlyFileLoadError was not called'
+      ).to.be.true;
+    } finally {
+      _friendlyFileLoadErrorStub.restore();
+    }
+  });
+
+  testSketchWithPromise('error prevents sketch continuing', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadJSON(invalidFile, reject, function() {
+        setTimeout(resolve, 50);
+      });
+    };
+
+    sketch.setup = function() {
+      reject(new Error('Entered setup'));
+    };
+
+    sketch.draw = function() {
+      reject(new Error('Entered draw'));
+    };
+  });
+
+  testSketchWithPromise('error callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadJSON(
+        invalidFile,
+        function() {
+          reject(new Error('Success callback executed.'));
+        },
+        function() {
+          // Wait a bit so that if both callbacks are executed we will get an error.
+          setTimeout(resolve, 50);
+        }
+      );
+    };
+  });
+
+  testSketchWithPromise('loading correctly triggers setup', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadJSON(jsonObjectFile);
+    };
+
+    sketch.setup = function() {
+      resolve();
+    };
+  });
+
+  testSketchWithPromise('success callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    var hasBeenCalled = false;
+    sketch.preload = function() {
+      sketch.loadJSON(
+        jsonObjectFile,
+        function() {
+          hasBeenCalled = true;
+        },
+        function(err) {
+          reject(new Error('Error callback was entered: ' + err));
+        }
+      );
+    };
+
+    sketch.setup = function() {
+      if (!hasBeenCalled) {
+        reject(new Error('Setup called prior to success callback'));
+      } else {
+        setTimeout(resolve, 50);
+      }
+    };
+  });
+
+  test('returns an object for object JSON.', async function() {
+    const json = await promisedSketch(function(sketch, resolve, reject) {
+      var json;
+      sketch.preload = function() {
+        json = sketch.loadJSON(jsonObjectFile, function() {}, reject);
+      };
+
+      sketch.setup = function() {
+        resolve(json);
+      };
+    });
+    assert.isObject(json);
+  });
+
+  test('passes an object to success callback for object JSON.', async function() {
+    const json = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadJSON(jsonObjectFile, resolve, reject);
+      };
+    });
+    assert.isObject(json);
+  });
+
+  // Does not work with the current loadJSON.
+  test('returns an array for array JSON.');
+  // test('returns an array for array JSON.', async function() {
+  //   const json = await promisedSketch(function(sketch, resolve, reject) {
+  //     var json;
+  //     sketch.preload = function() {
+  //       json = sketch.loadJSON(jsonArrayFile, function() {}, reject);
+  //     };
+  //
+  //     sketch.setup = function() {
+  //       resolve(json);
+  //     };
+  //   });
+  //   assert.isArray(json);
+  //   assert.lengthOf(json, 3);
+  // });
+
+  test('passes an array to success callback for array JSON.', async function() {
+    const json = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadJSON(jsonArrayFile, resolve, reject);
+      };
+    });
+    assert.isArray(json);
+    assert.lengthOf(json, 3);
+  });
+
+  test('passes an object to success callback for object JSONP.', async function() {
+    const json = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadJSON(
+          jsonpObjectFile,
+          { jsonpCallbackFunction: 'jsonpCallbackFunction' },
+          'jsonp',
+          resolve,
+          reject
+        );
+      };
+    });
+    assert.isObject(json);
+  });
+
+  test('passes an array to success callback for array JSONP.', async function() {
+    const json = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadJSON(
+          jsonpArrayFile,
+          { jsonpCallbackFunction: 'jsonpCallbackFunction' },
+          'jsonp',
+          resolve,
+          reject
+        );
+      };
+    });
+    assert.isArray(json);
+    assert.lengthOf(json, 3);
+  });
+});

package/p5-tests/unit/io/loadModel.js

@@ -0,0 +1,215 @@
+suite('loadModel', function() {
+  var invalidFile = '404file';
+  var validFile = 'unit/assets/teapot.obj';
+  var validObjFileforMtl='unit/assets/octa-color.obj';
+  var validSTLfile = 'unit/assets/ascii.stl';
+  var inconsistentColorObjFile = 'unit/assets/eg1.obj';
+  var objMtlMissing = 'unit/assets/objMtlMissing.obj';
+  var validSTLfileWithoutExtension = 'unit/assets/ascii';
+
+  test('_friendlyFileLoadError is called', async function() {
+    const _friendlyFileLoadErrorStub = sinon.stub(p5, '_friendlyFileLoadError');
+    try {
+      await promisedSketch(function(sketch, resolve, reject) {
+        sketch.preload = function() {
+          sketch.loadModel(invalidFile, reject, resolve);
+        };
+      });
+      expect(
+        _friendlyFileLoadErrorStub.calledOnce,
+        'p5._friendlyFileLoadError was not called'
+      ).to.be.true;
+    } finally {
+      _friendlyFileLoadErrorStub.restore();
+    }
+  });
+
+  testSketchWithPromise('error prevents sketch continuing', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadModel(invalidFile);
+      setTimeout(resolve, 50);
+    };
+
+    sketch.setup = function() {
+      reject(new Error('Setup called'));
+    };
+
+    sketch.draw = function() {
+      reject(new Error('Draw called'));
+    };
+  });
+
+  testSketchWithPromise('error callback is called', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadModel(
+        invalidFile,
+        function() {
+          reject(new Error('Success callback executed.'));
+        },
+        function() {
+          // Wait a bit so that if both callbacks are executed we will get an error.
+          setTimeout(resolve, 50);
+        }
+      );
+    };
+  });
+
+  testSketchWithPromise('loading correctly triggers setup', function(
+    sketch,
+    resolve,
+    reject
+  ) {
+    sketch.preload = function() {
+      sketch.loadModel(validFile);
+    };
+
+    sketch.setup = function() {
+      resolve();
+    };
+  });
+
+  testSketchWithPromise('success callback is called', function(
+    sketch,
+    done
+  ) {
+    var hasBeenCalled = false;
+    sketch.preload = function() {
+      sketch.loadModel(
+        validFile,
+        function() {
+          hasBeenCalled = true;
+          done();
+        },
+        function(err) {
+          done(new Error('Error callback was entered: ' + err));
+        }
+      );
+    };
+
+    sketch.setup = function() {
+      if (!hasBeenCalled) {
+        done(new Error('Setup called prior to success callback'));
+      }
+    };
+  });
+
+  test('loads OBJ file with associated MTL file correctly', async function(){
+    const model = await promisedSketch(function (sketch,resolve,reject){
+      sketch.preload=function(){
+        sketch.loadModel(validObjFileforMtl,resolve,reject);
+      };
+    });
+    const expectedColors=[
+      0, 0, 0.5,
+      0, 0, 0.5,
+      0, 0, 0.5,
+      0, 0, 0.942654,
+      0, 0, 0.942654,
+      0, 0, 0.942654,
+      0, 0.815632, 1,
+      0, 0.815632, 1,
+      0, 0.815632, 1,
+      0, 0.965177, 1,
+      0, 0.965177, 1,
+      0, 0.965177, 1,
+      0.848654, 1, 0.151346,
+      0.848654, 1, 0.151346,
+      0.848654, 1, 0.151346,
+      1, 0.888635, 0,
+      1, 0.888635, 0,
+      1, 0.888635, 0,
+      1, 0.77791, 0,
+      1, 0.77791, 0,
+      1, 0.77791, 0,
+      0.5, 0, 0,
+      0.5, 0, 0,
+      0.5, 0, 0
+    ];
+    assert.deepEqual(model.vertexColors,expectedColors);
+  });
+  test('inconsistent vertex coloring throws error', async function() {
+    // Attempt to load the model and catch the error
+    let errorCaught = null;
+    try {
+      await promisedSketch(function(sketch, resolve, reject) {
+        sketch.preload = function() {
+          sketch.loadModel(inconsistentColorObjFile, resolve, reject);
+        };
+      });
+    } catch (error) {
+      errorCaught = error;
+    }
+
+    // Assert that an error was caught and that it has the expected message
+    assert.instanceOf(errorCaught, Error, 'No error thrown for inconsistent vertex coloring');
+    assert.equal(errorCaught.message, 'Model coloring is inconsistent. Either all vertices should have colors or none should.', 'Unexpected error message for inconsistent vertex coloring');
+  });
+
+  test('missing MTL file shows OBJ model without vertexColors', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadModel(objMtlMissing, resolve, reject);
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+    assert.equal(model.vertexColors.length, 0, 'Model should not have vertex colors');
+  });
+
+  test('returns an object with correct data', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      var _model;
+      sketch.preload = function() {
+        _model = sketch.loadModel(validFile, function() {}, reject);
+      };
+
+      sketch.setup = function() {
+        resolve(_model);
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+  });
+
+  test('passes an object with correct data to callback', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadModel(validFile, resolve, reject);
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+  });
+
+  test('resolves STL file correctly', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadModel(validSTLfile, resolve, reject);
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+  });
+
+  test('resolves STL file correctly with explicit extension', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadModel(validSTLfileWithoutExtension, resolve, reject, '.stl');
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+  });
+
+  test('resolves STL file correctly with case insensitive extension', async function() {
+    const model = await promisedSketch(function(sketch, resolve, reject) {
+      sketch.preload = function() {
+        sketch.loadModel(validSTLfileWithoutExtension, resolve, reject, '.STL');
+      };
+    });
+    assert.instanceOf(model, p5.Geometry);
+  });
+});