melonjs 15.0.0 → 15.1.0

package/src/video/texture/atlas.js

@@ -86,8 +86,8 @@ export class TextureAtlas {
         if (typeof (atlases) !== "undefined") {
             // normalize to array to keep the following code generic
             atlases = Array.isArray(atlases) ? atlases : [atlases];
-            for (var i in atlases) {
-                var atlas = atlases[i];
+            for (let i in atlases) {
+                let atlas = atlases[i];
 
                 if (typeof(atlas.meta) !== "undefined") {
                     // Texture Packer or Free Texture Packer
@@ -96,7 +96,7 @@ export class TextureAtlas {
                         // set the texture
                         if (typeof(src) === "undefined") {
                             // get the texture name from the atlas meta data
-                            var image = getImage(atlas.meta.image);
+                            let image = getImage(atlas.meta.image);
                             if (!image) {
                                 throw new Error(
                                     "Atlas texture '" + image + "' not found"
@@ -167,17 +167,17 @@ export class TextureAtlas {
      * @ignore
      */
     parse(data) {
-        var atlas = {};
+        let atlas = {};
 
         data.frames.forEach((frame) => {
             // fix wrongly formatted JSON (e.g. last dummy object in ShoeBox)
             if (frame.hasOwnProperty("filename")) {
                 // Source coordinates
-                var s = frame.frame;
+                let s = frame.frame;
 
-                var originX, originY;
+                let originX, originY;
                 // Pixel-based offset origin from the top-left of the source frame
-                var hasTextureAnchorPoint = (frame.spriteSourceSize && frame.sourceSize && frame.pivot);
+                let hasTextureAnchorPoint = (frame.spriteSourceSize && frame.sourceSize && frame.pivot);
                 if (hasTextureAnchorPoint) {
                     originX = (frame.sourceSize.w * frame.pivot.x) - ((frame.trimmed) ? frame.spriteSourceSize.x : 0);
                     originY = (frame.sourceSize.h * frame.pivot.y) - ((frame.trimmed) ? frame.spriteSourceSize.y : 0);
@@ -204,16 +204,16 @@ export class TextureAtlas {
      * @ignore
      */
     parseFromSpriteSheet(data) {
-        var atlas = {};
-        var image = data.image;
-        var spacing = data.spacing || 0;
-        var margin = data.margin || 0;
+        let atlas = {};
+        let image = data.image;
+        let spacing = data.spacing || 0;
+        let margin = data.margin || 0;
 
-        var width = image.width;
-        var height = image.height;
+        let width = image.width;
+        let height = image.height;
 
         // calculate the sprite count (line, col)
-        var spritecount = pool.pull("Vector2d",
+        let spritecount = pool.pull("Vector2d",
             ~~((width - margin + spacing) / (data.framewidth + spacing)),
             ~~((height - margin + spacing) / (data.frameheight + spacing))
         );
@@ -221,8 +221,8 @@ export class TextureAtlas {
         // verifying the texture size
         if ((width % (data.framewidth + spacing)) !== 0 ||
             (height % (data.frameheight + spacing)) !== 0) {
-            var computed_width = spritecount.x * (data.framewidth + spacing);
-            var computed_height = spritecount.y * (data.frameheight + spacing);
+            let computed_width = spritecount.x * (data.framewidth + spacing);
+            let computed_height = spritecount.y * (data.frameheight + spacing);
             if (computed_width - width !== spacing && computed_height - height !== spacing) {
                 // "truncate size" if delta is different from the spacing size
                 width = computed_width;
@@ -238,8 +238,8 @@ export class TextureAtlas {
         }
 
         // build the local atlas
-        for (var frame = 0, count = spritecount.x * spritecount.y; frame < count; frame++) {
-            var name = "" + frame;
+        for (let frame = 0, count = spritecount.x * spritecount.y; frame < count; frame++) {
+            let name = "" + frame;
             atlas[name] = {
                 name        : name,
                 texture     : "default", // the source texture
@@ -310,10 +310,10 @@ export class TextureAtlas {
             console.warn("Adding texture region", name, "for texture", this);
         }
 
-        var source = this.getTexture();
-        var atlas = this.getAtlas();
-        var dw = source.width;
-        var dh = source.height;
+        let source = this.getTexture();
+        let atlas = this.getAtlas();
+        let dw = source.width;
+        let dh = source.height;
 
         atlas[name] = {
             name    : name,
@@ -335,7 +335,7 @@ export class TextureAtlas {
      * @returns {object}
      */
     getRegion(name, atlas) {
-        var region;
+        let region;
         if (typeof atlas === "string") {
             region = this.getAtlas(atlas)[name];
         } else {
@@ -358,11 +358,11 @@ export class TextureAtlas {
      */
     getUVs(name) {
         // Get the source texture region
-        var region = this.getRegion(name);
+        let region = this.getRegion(name);
 
         if (typeof(region) === "undefined") {
             // TODO: Require proper atlas regions instead of caching arbitrary region keys
-            var keys = name.split(","),
+            let keys = name.split(","),
                 sx = +keys[0],
                 sy = +keys[1],
                 sw = +keys[2],
@@ -384,9 +384,9 @@ export class TextureAtlas {
         // ignore if using the Canvas Renderer
         if (typeof renderer.gl !== "undefined") {
             // Source coordinates
-            var s = atlas[name].offset;
-            var sw = atlas[name].width;
-            var sh = atlas[name].height;
+            let s = atlas[name].offset;
+            let sw = atlas[name].width;
+            let sh = atlas[name].height;
 
             atlas[name].uvs = new Float32Array([
                 s.x / w,        // u0 (left)
@@ -396,7 +396,7 @@ export class TextureAtlas {
             ]);
             // Cache source coordinates
             // TODO: Remove this when the Batcher only accepts a region name
-            var key = s.x + "," + s.y + "," + w + "," + h;
+            let key = s.x + "," + s.y + "," + w + "," + h;
             atlas[key] = atlas[name];
         }
         return atlas[name].uvs;
@@ -417,13 +417,13 @@ export class TextureAtlas {
      * ...
      * ...
      * // create a new "coin" sprite
-     * var sprite = game.texture.createSpriteFromName("coin.png");
+     * let sprite = game.texture.createSpriteFromName("coin.png");
      * // set the renderable position to bottom center
      * sprite.anchorPoint.set(0.5, 1.0);
      * ...
      * ...
      * // create a 9-slice sprite
-     * var dialogPanel = game.texture.createSpriteFromName(
+     * let dialogPanel = game.texture.createSpriteFromName(
      *    "rpg_dialo.png",
      *    // width & height are mandatory for 9-slice sprites
      *    { width: this.width, height: this.height },
@@ -456,7 +456,7 @@ export class TextureAtlas {
      * );
      *
      * // create a new Animated Sprite
-     * var sprite = game.texture.createAnimationFromName([
+     * let sprite = game.texture.createAnimationFromName([
      *     "walk0001.png", "walk0002.png", "walk0003.png",
      *     "walk0004.png", "walk0005.png", "walk0006.png",
      *     "walk0007.png", "walk0008.png", "walk0009.png",
@@ -473,12 +473,12 @@ export class TextureAtlas {
      * sprite.anchorPoint.set(0.5, 1.0);
      */
     createAnimationFromName(names, settings) {
-        var tpAtlas = [], indices = {};
-        var width = 0, height = 0;
-        var region;
+        let tpAtlas = [], indices = {};
+        let width = 0, height = 0;
+        let region;
         // iterate through the given names
         // and create a "normalized" atlas
-        for (var i = 0; i < names.length; ++i) {
+        for (let i = 0; i < names.length; ++i) {
             region = this.getRegion(names[i]);
             if (region == null) {
                 // throw an error

package/src/video/texture/cache.js

@@ -49,14 +49,14 @@ class TextureCache {
      * @ignore
      */
     get(image, atlas) {
-        var entry;
+        let entry;
 
         if (typeof atlas === "undefined") {
             entry = this.cache.get(image)[0];
         } else {
             // manage cases where a specific atlas is specified
             this.cache.forEach((value, key) => {
-                var _atlas = value.getAtlas()[0];
+                let _atlas = value.getAtlas()[0];
                 if (key === image && _atlas.width === atlas.framewidth && _atlas.height === atlas.frameheight) {
                     entry = value;
                 }
@@ -88,7 +88,7 @@ class TextureCache {
      */
     tint(src, color) {
         // make sure the src is in the cache
-        var image_cache = this.tinted.get(src);
+        let image_cache = this.tinted.get(src);
 
         if (image_cache === undefined) {
             image_cache = this.tinted.set(src, new Map());
@@ -105,12 +105,12 @@ class TextureCache {
      * @ignore
      */
     set(image, texture) {
-        var width = image.width;
-        var height = image.height;
+        let width = image.width;
+        let height = image.height;
 
         // warn if a non POT texture is added to the cache when using WebGL1
         if (renderer.WebGLVersion === 1 && (!isPowerOfTwo(width) || !isPowerOfTwo(height))) {
-            var src = typeof image.src !== "undefined" ? image.src : image;
+            let src = typeof image.src !== "undefined" ? image.src : image;
             console.warn(
                 "[Texture] " + src + " is not a POT texture " +
                 "(" + width + "x" + height + ")"

package/src/video/texture/canvas_texture.js

@@ -3,7 +3,7 @@ import { setPrefixed } from "./../../utils/agent.js";
 import { clamp } from "../../math/math.js";
 
 // default canvas settings
-var defaultAttributes = {
+let defaultAttributes = {
     offscreenCanvas : false,
     willReadFrequently : false,
     antiAlias : false,
@@ -65,7 +65,7 @@ class CanvasTexture {
      * @param {boolean} [enable=false]
      */
     setAntiAlias(enable = false) {
-        var canvas = this.canvas;
+        let canvas = this.canvas;
 
         // enable/disable antialias on the given Context2d object
         setPrefixed("imageSmoothingEnabled", enable, this.context);
@@ -117,6 +117,66 @@ class CanvasTexture {
         return this.context.getImageData(x, y, width, height);
     }
 
+    /**
+     * creates a Blob object representing the image contained in this canvas texture
+     * @param {Object} [options] - An object with the following properties:
+     * @param {String} [options.type="image/png"] - A string indicating the image format
+     * @param {Number} [options.quality] - A Number between 0 and 1 indicating the image quality to be used when creating images using file formats that support lossy compression (such as image/jpeg or image/webp). A user agent will use its default quality value if this option is not specified, or if the number is outside the allowed range.
+     * @return {Promise} A Promise returning a Blob object representing the image contained in this canvas texture
+     * @example
+     * canvasTexture.convertToBlob().then((blob) => console.log(blob));
+     */
+    toBlob(options) {
+        if (typeof this.canvas.convertToBlob === "function") {
+            return this.canvas.convertToBlob(options);
+        } else {
+            return new Promise(function(resolve) {
+                this.canvas.toBlob((blob) => {
+                    resolve(blob);
+                }, options ? options.type : undefined, options ? options.quality : undefined);
+            });
+        }
+    }
+
+    /**
+     * creates an ImageBitmap object from the most recently rendered image of this canvas texture
+     * @param {Object} [options] - An object with the following properties:
+     * @param {String} [options.type="image/png"] - A string indicating the image format
+     * @param {Number} [options.quality] - A Number between 0 and 1 indicating the image quality to be used when creating images using file formats that support lossy compression (such as image/jpeg or image/webp). A user agent will use its default quality value if this option is not specified, or if the number is outside the allowed range.
+     * @return {Promise} A Promise returning an ImageBitmap.
+     * @example
+     * canvasTexture.transferToImageBitmap().then((bitmap) => console.log(bitmap));
+     */
+    toImageBitmap(options) {
+        return new Promise((resolve) => {
+            if (typeof this.canvas.transferToImageBitmap === "function") {
+                resolve(this.canvas.transferToImageBitmap());
+            } else {
+                let image = new Image();
+                image.src = this.canvas.toDataURL(options);
+                image.onload = () => {
+                    createImageBitmap(image).then((bitmap) => resolve(bitmap));
+                };
+            }
+        });
+    }
+
+    /**
+     * returns a data URL containing a representation of the most recently rendered image of this canvas texture
+     * (not supported by OffscreenCanvas)
+     * @param {Object} [options] - An object with the following properties:
+     * @param {String} [options.type="image/png"] - A string indicating the image format
+     * @param {Number} [options.quality] - A Number between 0 and 1 indicating the image quality to be used when creating images using file formats that support lossy compression (such as image/jpeg or image/webp). A user agent will use its default quality value if this option is not specified, or if the number is outside the allowed range.
+     * @return {Promise} A Promise returning a string containing the requested data URL.
+     * @example
+     * renderer.toDataURL().then((dataURL) => console.log(dataURL));
+     */
+    toDataURL(options) {
+        return new Promise((resolve) => {
+            resolve(this.canvas.toDataURL(options));
+        });
+    }
+
     /**
      * @ignore
      */

package/src/video/video.js

@@ -149,7 +149,7 @@ export function init(width, height, options) {
  * @returns {HTMLCanvasElement|OffscreenCanvas}
  */
 export function createCanvas(width, height, returnOffscreenCanvas = false) {
-    var _canvas;
+    let _canvas;
 
     if (width === 0 || height === 0) {
         throw new Error("width or height was zero, Canvas could not be initialized !");

package/src/video/webgl/buffer/vertex.js

@@ -53,7 +53,7 @@
         }
 
         // save a reference to the previous data
-        var data = this.bufferF32;
+        let data = this.bufferF32;
 
         // recreate ArrayBuffer and views
         this.buffer = new ArrayBuffer(this.maxVertex * this.vertexSize * this.objSize);
@@ -71,7 +71,7 @@
      * @ignore
      */
     push(x, y, u, v, tint) {
-        var offset = this.vertexCount * this.vertexSize;
+        let offset = this.vertexCount * this.vertexSize;
 
         if (this.vertexCount >= this.maxVertex) {
             this.resize(this.vertexCount);

package/src/video/webgl/compositors/compositor.js

@@ -203,12 +203,12 @@ import GLShader from "../glshader.js";
      * @param {number} [mode=gl.TRIANGLES] - the GL drawing mode
      */
     flush(mode = this.mode) {
-        var vertex = this.vertexData;
-        var vertexCount = vertex.vertexCount;
+        let vertex = this.vertexData;
+        let vertexCount = vertex.vertexCount;
 
         if (vertexCount > 0) {
-            var gl = this.gl;
-            var vertexSize = vertex.vertexSize;
+            let gl = this.gl;
+            let vertexSize = vertex.vertexSize;
 
             // Copy data into stream buffer
             if (this.renderer.WebGLVersion > 1) {

package/src/video/webgl/compositors/primitive_compositor.js

@@ -33,10 +33,10 @@ import Compositor from "./compositor.js";
      * @param {number} [vertexCount=verts.length] - amount of points defined in the points array
      */
     drawVertices(mode, verts, vertexCount = verts.length) {
-        var viewMatrix = this.viewMatrix;
-        var vertexData = this.vertexData;
-        var color = this.renderer.currentColor;
-        var alpha = this.renderer.getGlobalAlpha();
+        let viewMatrix = this.viewMatrix;
+        let vertexData = this.vertexData;
+        let color = this.renderer.currentColor;
+        let alpha = this.renderer.getGlobalAlpha();
 
         if (vertexData.isFull(vertexCount)) {
             // is the vertex buffer full if we add more vertices

package/src/video/webgl/compositors/quad_compositor.js

@@ -5,7 +5,7 @@ import quadFragment from "./../shaders/quad.frag";
 import Compositor from "./compositor.js";
 
 // a pool of resuable vectors
-var V_ARRAY = [
+let V_ARRAY = [
     new Vector2d(),
     new Vector2d(),
     new Vector2d(),
@@ -49,8 +49,8 @@ var V_ARRAY = [
         super.reset();
 
         // delete all related bound texture
-        for (var i = 0; i < this.renderer.maxTextures; i++) {
-            var texture2D = this.getTexture2D(i);
+        for (let i = 0; i < this.renderer.maxTextures; i++) {
+            let texture2D = this.getTexture2D(i);
             if (typeof texture2D !== "undefined") {
                 this.deleteTexture2D(texture2D);
             }
@@ -71,12 +71,12 @@ var V_ARRAY = [
      * @returns {WebGLTexture} a WebGL texture
      */
     createTexture2D(unit, pixels = null, filter, repeat = "no-repeat", w = pixels.width, h = pixels.height, premultipliedAlpha = true, mipmap = true) {
-        var gl = this.gl;
-        var isPOT = isPowerOfTwo(w) && isPowerOfTwo(h);
-        var rs = (repeat.search(/^repeat(-x)?$/) === 0) && (isPOT || this.renderer.WebGLVersion > 1) ? gl.REPEAT : gl.CLAMP_TO_EDGE;
-        var rt = (repeat.search(/^repeat(-y)?$/) === 0) && (isPOT || this.renderer.WebGLVersion > 1) ? gl.REPEAT : gl.CLAMP_TO_EDGE;
+        let gl = this.gl;
+        let isPOT = isPowerOfTwo(w) && isPowerOfTwo(h);
+        let rs = (repeat.search(/^repeat(-x)?$/) === 0) && (isPOT || this.renderer.WebGLVersion > 1) ? gl.REPEAT : gl.CLAMP_TO_EDGE;
+        let rt = (repeat.search(/^repeat(-y)?$/) === 0) && (isPOT || this.renderer.WebGLVersion > 1) ? gl.REPEAT : gl.CLAMP_TO_EDGE;
 
-        var texture = gl.createTexture();
+        let texture = gl.createTexture();
 
         this.bindTexture2D(texture, unit);
 
@@ -90,6 +90,9 @@ var V_ARRAY = [
         if (pixels === null || typeof pixels.byteLength !== "undefined") {
             // if pixels is undefined, or if it's Uint8Array/Float32Array TypedArray
             gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, w, h, 0, gl.RGBA, gl.UNSIGNED_BYTE, pixels, 0);
+        } else if (pixels instanceof OffscreenCanvas) {
+            // convert to ImageBitmap first (else Safari 16.4 and higher will throw an TypeError exception)
+            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, pixels.transferToImageBitmap());
         } else {
             gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, pixels);
         }
@@ -127,7 +130,7 @@ var V_ARRAY = [
      * @param {number} unit - Texture unit to which the given texture is bound
      */
     bindTexture2D(texture, unit) {
-        var gl = this.gl;
+        let gl = this.gl;
 
         if (texture !== this.boundTextures[unit]) {
             this.flush();
@@ -169,8 +172,8 @@ var V_ARRAY = [
      * @ignore
      */
     uploadTexture(texture, w, h, force = false) {
-        var unit = this.renderer.cache.getUnit(texture);
-        var texture2D = this.boundTextures[unit];
+        let unit = this.renderer.cache.getUnit(texture);
+        let texture2D = this.boundTextures[unit];
 
         if (typeof texture2D === "undefined" || force) {
             this.createTexture2D(
@@ -203,7 +206,7 @@ var V_ARRAY = [
      * @param {number} tint - tint color to be applied to the texture in UINT32 (argb) format
      */
     addQuad(texture, x, y, w, h, u0, v0, u1, v1, tint) {
-        var vertexData = this.vertexData;
+        let vertexData = this.vertexData;
 
         if (vertexData.isFull(6)) {
             // is the vertex buffer full if we add 6 more vertices
@@ -211,13 +214,13 @@ var V_ARRAY = [
         }
 
         // upload and activate the texture if necessary
-        var unit = this.uploadTexture(texture);
+        let unit = this.uploadTexture(texture);
 
         // set fragment sampler accordingly
         this.currentShader.setUniform("uSampler", unit);
 
         // Transform vertices
-        var m = this.viewMatrix,
+        let m = this.viewMatrix,
             vec0 = V_ARRAY[0].set(x, y),
             vec1 = V_ARRAY[1].set(x + w, y),
             vec2 = V_ARRAY[2].set(x, y + h),

package/src/video/webgl/glshader.js

@@ -18,7 +18,7 @@ import { minify } from "./utils/string.js";
      * @see https://developer.mozilla.org/en-US/docs/Games/Techniques/3D_on_the_web/GLSL_Shaders
      * @example
      * // create a basic shader
-     * var myShader = new me.GLShader(
+     * let myShader = new me.GLShader(
      *    // WebGL rendering context
      *    gl,
      *    // vertex shader
@@ -93,7 +93,7 @@ import { minify } from "./utils/string.js";
      * @returns {GLint} number indicating the location of the variable name if found. Returns -1 otherwise
      */
     getAttribLocation(name) {
-        var attr = this.attributes[name];
+        let attr = this.attributes[name];
         if (typeof attr !== "undefined") {
             return attr;
         } else {
@@ -109,7 +109,7 @@ import { minify } from "./utils/string.js";
      * myShader.setUniform("uProjectionMatrix", this.projectionMatrix);
      */
     setUniform(name, value) {
-        var uniforms = this.uniforms;
+        let uniforms = this.uniforms;
         if (typeof uniforms[name] !== "undefined") {
             if (typeof value === "object" && typeof value.toArray === "function") {
                 uniforms[name] = value.toArray();
@@ -129,9 +129,9 @@ import { minify } from "./utils/string.js";
      */
     setVertexAttributes(gl, attributes, vertexByteSize) {
         // set the vertex attributes
-        for (var index = 0; index < attributes.length; ++index) {
-            var element = attributes[index];
-            var location = this.getAttribLocation(element.name);
+        for (let index = 0; index < attributes.length; ++index) {
+            let element = attributes[index];
+            let location = this.getAttribLocation(element.name);
 
             if (location !== -1) {
                 gl.enableVertexAttribArray(location);

package/src/video/webgl/utils/attributes.js

@@ -2,7 +2,7 @@
  * @ignore
  */
 export function extractAttributes(gl, shader) {
-    var attributes = {},
+    let attributes = {},
         attrRx = /attribute\s+\w+\s+(\w+)/g,
         match,
         i = 0;

package/src/video/webgl/utils/program.js

@@ -2,7 +2,7 @@
  * @ignore
  */
 function compileShader(gl, type, source) {
-    var shader = gl.createShader(type);
+    let shader = gl.createShader(type);
     gl.shaderSource(shader, source);
     gl.compileShader(shader);
 
@@ -18,10 +18,10 @@ function compileShader(gl, type, source) {
  * @ignore
  */
 export function compileProgram(gl, vertex, fragment, attributes) {
-    var vertShader = compileShader(gl, gl.VERTEX_SHADER, vertex);
-    var fragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragment);
+    let vertShader = compileShader(gl, gl.VERTEX_SHADER, vertex);
+    let fragShader = compileShader(gl, gl.FRAGMENT_SHADER, fragment);
 
-    var program = gl.createProgram();
+    let program = gl.createProgram();
 
     gl.attachShader(program, vertShader);
     gl.attachShader(program, fragShader);
@@ -29,14 +29,14 @@ export function compileProgram(gl, vertex, fragment, attributes) {
 
     // force vertex attributes to use location 0 as starting location to prevent
     // browser to do complicated emulation when running on desktop OpenGL (e.g. on macOS)
-    for (var location in attributes) {
+    for (let location in attributes) {
         gl.bindAttribLocation(program, attributes[location], location);
     }
 
     gl.linkProgram(program);
 
     if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
-        var error_msg =
+        let error_msg =
             "Error initializing Shader " + this + "\n" +
             "gl.VALIDATE_STATUS: " + gl.getProgramParameter(program, gl.VALIDATE_STATUS) + "\n" +
             "gl.getError()" + gl.getError() + "\n" +

package/src/video/webgl/utils/uniforms.js

@@ -26,7 +26,7 @@ const fnHash = {
  * @ignore
  */
 export function extractUniforms(gl, shader) {
-    var uniforms = {},
+    let uniforms = {},
         uniRx = /uniform\s+(\w+)\s+(\w+)/g,
         uniformsData = {},
         descriptor = {},
@@ -42,7 +42,7 @@ export function extractUniforms(gl, shader) {
 
     // Get uniform references
     Object.keys(uniformsData).forEach((name) => {
-        var type = uniformsData[name];
+        let type = uniformsData[name];
         locations[name] = gl.getUniformLocation(shader.program, name);
 
         descriptor[name] = {
@@ -68,7 +68,7 @@ export function extractUniforms(gl, shader) {
                      * A generic setter for uniform vectors
                      */
                     return function (val) {
-                        var fnv = fn;
+                        let fnv = fn;
                         if (val.length && fn.slice(-1) !== "v") {
                             fnv += "v";
                         }