melonjs 10.9.0 → 10.12.0

package/src/loader/loader.js

@@ -310,7 +310,6 @@ var loader = {
     /**
      * onload callback
      * @public
-     * @function
      * @name onload
      * @memberof loader
      * @example
@@ -324,7 +323,6 @@ var loader = {
      * each time a resource is loaded, the loader will fire the specified function,
      * giving the actual progress [0 ... 1], as argument, and an object describing the resource loaded
      * @public
-     * @function
      * @name onProgress
      * @memberof loader
      * @example
@@ -412,7 +410,6 @@ var loader = {
      * @name setBaseURL
      * @memberof loader
      * @public
-     * @function
      * @param {string} type  "*", "audio", binary", "image", "json", "js", "tmx", "tsx"
      * @param {string} [url="./"] default base URL
      * @example
@@ -443,7 +440,6 @@ var loader = {
      * @name preload
      * @memberof loader
      * @public
-     * @function
      * @param {object[]} res
      * @param {string} res.name internal name of the resource
      * @param {string} res.type  "audio", binary", "image", "json","js", "tmx", "tsx", "fontface"
@@ -508,7 +504,6 @@ var loader = {
      * @name load
      * @memberof loader
      * @public
-     * @function
      * @param {object} res
      * @param {string} res.name internal name of the resource
      * @param {string} res.type  "audio", binary", "image", "json", "tmx", "tsx"
@@ -578,7 +573,6 @@ var loader = {
      * @name unload
      * @memberof loader
      * @public
-     * @function
      * @param {object} res
      * @param {string} res.name internal name of the resource
      * @param {string} res.type  "audio", binary", "image", "json", "tmx", "tsx"
@@ -640,7 +634,6 @@ var loader = {
      * @name unloadAll
      * @memberof loader
      * @public
-     * @function
      * @example me.loader.unloadAll();
      */
     unloadAll() {
@@ -695,7 +688,6 @@ var loader = {
      * @name getTMX
      * @memberof loader
      * @public
-     * @function
      * @param {string} elt name of the tmx/tsx element ("map1");
      * @returns {object} requested element or null if not found
      */
@@ -713,7 +705,6 @@ var loader = {
      * @name getBinary
      * @memberof loader
      * @public
-     * @function
      * @param {string} elt name of the binary object ("ymTrack");
      * @returns {object} requested element or null if not found
      */
@@ -731,7 +722,6 @@ var loader = {
      * @name getImage
      * @memberof loader
      * @public
-     * @function
      * @param {string} image name of the Image element ("tileset-platformer");
      * @returns {HTMLImageElement} requested element or null if not found
      */
@@ -750,7 +740,6 @@ var loader = {
      * @name getJSON
      * @memberof loader
      * @public
-     * @function
      * @param {string} elt name of the json file to load
      * @returns {object}
      */

package/src/loader/loadingscreen.js

@@ -1,5 +1,5 @@
 import { world, viewport } from "./../game.js";
-import { createCanvas, renderer } from "./../video/video.js";
+import { renderer } from "./../video/video.js";
 import * as event from "./../system/event.js";
 import {nextPowerOfTwo} from "./../math/math.js";
 import pool from "./../system/pooling.js";
@@ -69,13 +69,13 @@ class IconLogo extends Renderable {
     constructor(x, y) {
         super(x, y, 100, 85);
 
-        this.iconCanvas = createCanvas(
+        this.iconTexture = pool.pull("CanvasTexture",
             renderer.WebGLVersion > 1 ? this.width : nextPowerOfTwo(this.width),
             renderer.WebGLVersion > 1 ? this.height : nextPowerOfTwo(this.height),
-            false
+            { offscreenCanvas: true }
         );
 
-        var context = renderer.getContext2d(this.iconCanvas);
+        var context = this.iconTexture.context;
 
         context.beginPath();
         context.moveTo(0.7, 48.9);
@@ -110,7 +110,18 @@ class IconLogo extends Renderable {
      * @ignore
      */
     draw(renderer) {
-        renderer.drawImage(this.iconCanvas, renderer.getWidth() / 2, this.pos.y);
+        renderer.drawImage(this.iconTexture.canvas, renderer.getWidth() / 2, this.pos.y);
+    }
+
+    /**
+     * Destroy function
+     * @ignore
+     */
+    destroy() {
+        // call the parent destroy method
+        super.destroy(arguments);
+        pool.push(this.iconTexture);
+        this.iconTexture = undefined;
     }
 };
 

package/src/math/color.js

@@ -6,11 +6,11 @@ var toHex = function (component) {
     return "0123456789ABCDEF".charAt((component - (component % 16)) >> 4) + "0123456789ABCDEF".charAt(component % 16);
 };
 
-var rgbaRx = /^rgba?\((\d+), ?(\d+), ?(\d+)(, ?([\d\.]+))?\)$/;
-var hex3Rx = /^#([\da-fA-F])([\da-fA-F])([\da-fA-F])$/;
-var hex4Rx = /^#([\da-fA-F])([\da-fA-F])([\da-fA-F])([\da-fA-F])$/;
-var hex6Rx = /^#([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})$/;
-var hex8Rx = /^#([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})$/;
+const rgbaRx = /^rgba?\((\d+), ?(\d+), ?(\d+)(, ?([\d\.]+))?\)$/;
+const hex3Rx = /^#([\da-fA-F])([\da-fA-F])([\da-fA-F])$/;
+const hex4Rx = /^#([\da-fA-F])([\da-fA-F])([\da-fA-F])([\da-fA-F])$/;
+const hex6Rx = /^#([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})$/;
+const hex8Rx = /^#([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})([\da-fA-F]{2})$/;
 
 var cssToRGB = new Map();
 
@@ -188,9 +188,6 @@ class Color {
      * @ignore
      */
     onResetEvent(r = 0, g = 0, b = 0, alpha = 1.0) {
-        /**
-         * @ignore
-         */
         if (typeof (this.glArray) === "undefined") {
             // Color components in a Float32Array suitable for WebGL
             this.glArray = new Float32Array([ 0.0, 0.0, 0.0, 1.0 ]);
@@ -257,7 +254,6 @@ class Color {
      * Set this color to the specified value.
      * @name setColor
      * @memberof Color
-     * @function
      * @param {number} r red component [0 .. 255]
      * @param {number} g green component [0 .. 255]
      * @param {number} b blue component [0 .. 255]
@@ -276,7 +272,6 @@ class Color {
      * Create a new copy of this color object.
      * @name clone
      * @memberof Color
-     * @function
      * @returns {Color} Reference to the newly cloned object
      */
     clone() {
@@ -287,7 +282,6 @@ class Color {
      * Copy a color object or CSS color into this one.
      * @name copy
      * @memberof Color
-     * @function
      * @param {Color|string} color
      * @returns {Color} Reference to this object for method chaining
      */
@@ -304,7 +298,6 @@ class Color {
      * Blend this color with the given one using addition.
      * @name add
      * @memberof Color
-     * @function
      * @param {Color} color
      * @returns {Color} Reference to this object for method chaining
      */
@@ -321,7 +314,6 @@ class Color {
      * Darken this color value by 0..1
      * @name darken
      * @memberof Color
-     * @function
      * @param {number} scale
      * @returns {Color} Reference to this object for method chaining
      */
@@ -338,7 +330,6 @@ class Color {
      * Linearly interpolate between this color and the given one.
      * @name lerp
      * @memberof Color
-     * @function
      * @param {Color} color
      * @param {number} alpha with alpha = 0 being this color, and alpha = 1 being the given one.
      * @returns {Color} Reference to this object for method chaining
@@ -356,7 +347,6 @@ class Color {
      * Lighten this color value by 0..1
      * @name lighten
      * @memberof Color
-     * @function
      * @param {number} scale
      * @returns {Color} Reference to this object for method chaining
      */
@@ -373,7 +363,6 @@ class Color {
      * Generate random r,g,b values for this color object
      * @name random
      * @memberof Color
-     * @function
      * @param {number} [min=0] minimum value for the random range
      * @param {number} [max=255] maxmium value for the random range
      * @returns {Color} Reference to this object for method chaining
@@ -399,7 +388,6 @@ class Color {
      * given one.
      * @name equals
      * @memberof Color
-     * @function
      * @param {Color} color
      * @returns {boolean}
      */
@@ -417,7 +405,6 @@ class Color {
      * r,g,b values
      * @name parseCSS
      * @memberof Color
-     * @function
      * @param {string} cssColor
      * @returns {Color} Reference to this object for method chaining
      */
@@ -435,7 +422,6 @@ class Color {
      * Parse an RGB or RGBA CSS color string
      * @name parseRGB
      * @memberof Color
-     * @function
      * @param {string} rgbColor
      * @returns {Color} Reference to this object for method chaining
      */
@@ -455,7 +441,6 @@ class Color {
      * the corresponding r,g,b,a values
      * @name parseHex
      * @memberof Color
-     * @function
      * @param {string} hexColor
      * @param {boolean} [argb = false] true if format is #ARGB, or #AARRGGBB (as opposed to #RGBA or #RGGBBAA)
      * @returns {Color} Reference to this object for method chaining
@@ -515,7 +500,6 @@ class Color {
      * Pack this color into a Uint32 ARGB representation
      * @name toUint32
      * @memberof Color
-     * @function
      * @param {number} [alpha=1.0] alpha value [0.0 .. 1.0]
      * @returns {number}
      */
@@ -532,7 +516,6 @@ class Color {
      * return an array representation of this object
      * @name toArray
      * @memberof Color
-     * @function
      * @returns {Float32Array}
      */
     toArray() {
@@ -544,7 +527,6 @@ class Color {
      * Get the color in "#RRGGBB" format
      * @name toHex
      * @memberof Color
-     * @function
      * @returns {string}
      */
     toHex() {
@@ -558,21 +540,19 @@ class Color {
      * Get the color in "#RRGGBBAA" format
      * @name toHex8
      * @memberof Color
-     * @function
      * @returns {string}
      */
-    toHex8() {
+    toHex8(alpha = this.alpha) {
         // TODO : Memoize this function by caching its result until any of
         // the r,g,b,a values are changed
 
-        return "#" + toHex(this.r) + toHex(this.g) + toHex(this.b) + toHex(this.alpha * 255);
+        return "#" + toHex(this.r) + toHex(this.g) + toHex(this.b) + toHex(alpha * 255);
     }
 
     /**
      * Get the color in "rgb(R,G,B)" format
      * @name toRGB
      * @memberof Color
-     * @function
      * @returns {string}
      */
     toRGB() {
@@ -590,10 +570,10 @@ class Color {
      * Get the color in "rgba(R,G,B,A)" format
      * @name toRGBA
      * @memberof Color
-     * @function
+     * @param {number} [alpha=1.0] alpha value [0.0 .. 1.0]
      * @returns {string}
      */
-    toRGBA() {
+    toRGBA(alpha = this.alpha) {
         // TODO : Memoize this function by caching its result until any of
         // the r,g,b,a values are changed
 
@@ -601,7 +581,7 @@ class Color {
             this.r + "," +
             this.g + "," +
             this.b + "," +
-            this.alpha +
+            alpha +
         ")";
     }
 };

package/src/math/math.js

@@ -51,7 +51,6 @@ export const EPSILON = 0.000001;
 /**
  * returns true if the given value is a power of two
  * @public
- * @function
  * @memberof Math
  * @name isPowerOfTwo
  * @param {number} val
@@ -64,7 +63,6 @@ export function isPowerOfTwo(val) {
 /**
  * returns the next power of two for the given value
  * @public
- * @function
  * @memberof Math
  * @name nextPowerOfTwo
  * @param {number} val
@@ -84,7 +82,6 @@ export function nextPowerOfTwo(val) {
 /**
  * Converts an angle in degrees to an angle in radians
  * @public
- * @function
  * @memberof Math
  * @name degToRad
  * @param {number} angle angle in degrees
@@ -100,7 +97,6 @@ export function degToRad(angle) {
 /**
  * Converts an angle in radians to an angle in degrees.
  * @public
- * @function
  * @memberof Math
  * @name radToDeg
  * @param {number} radians angle in radians
@@ -116,7 +112,6 @@ export function radToDeg(radians) {
 /**
  * clamp the given value
  * @public
- * @function
  * @memberof Math
  * @name clamp
  * @param {number} val the value to clamp
@@ -131,7 +126,6 @@ export function clamp(val, low, high) {
 /**
  * return a random integer between min (included) and max (excluded)
  * @public
- * @function
  * @memberof Math
  * @name random
  * @param {number} min minimum value.
@@ -148,7 +142,6 @@ export function random(min, max) {
 /**
  * return a random float between min, max (exclusive)
  * @public
- * @function
  * @memberof Math
  * @name randomFloat
  * @param {number} min minimum value.
@@ -165,7 +158,6 @@ export function randomFloat(min, max) {
 /**
  * return a weighted random between min, max (exclusive)
  * @public
- * @function
  * @memberof Math
  * @name weightedRandom
  * @param {number} min minimum value.
@@ -182,7 +174,6 @@ export function weightedRandom(min, max) {
 /**
  * round a value to the specified number of digit
  * @public
- * @function
  * @memberof Math
  * @name round
  * @param {number} num value to be rounded.
@@ -201,7 +192,6 @@ export function round(num, dec = 0) {
 /**
  * check if the given value is close to the expected one
  * @public
- * @function
  * @memberof Math
  * @name toBeCloseTo
  * @param {number} expected value to be compared with.

package/src/math/matrix2.js

@@ -68,7 +68,6 @@ class Matrix2d {
      * <img src="images/identity-matrix_2x.png"/>
      * @name identity
      * @memberof Matrix2d
-     * @function
      * @returns {Matrix2d} Reference to this object for method chaining
      */
     identity() {
@@ -84,7 +83,6 @@ class Matrix2d {
      * set the matrix to the specified value
      * @name setTransform
      * @memberof Matrix2d
-     * @function
      * @param {number} a
      * @param {number} b
      * @param {number} c
@@ -128,7 +126,6 @@ class Matrix2d {
      * Copies over the values from another me.Matrix2d.
      * @name copy
      * @memberof Matrix2d
-     * @function
      * @param {Matrix2d} m the matrix object to copy from
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -141,7 +138,6 @@ class Matrix2d {
      * Copies over the upper-left 3x3 values from the given me.Matrix3d
      * @name fromMat3d
      * @memberof Matrix2d
-     * @function
      * @param {Matrix3d} m the matrix object to copy from
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -166,7 +162,6 @@ class Matrix2d {
      * multiply both matrix
      * @name multiply
      * @memberof Matrix2d
-     * @function
      * @param {Matrix2d} m the other matrix
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -198,7 +193,6 @@ class Matrix2d {
      * Transpose the value of this matrix.
      * @name transpose
      * @memberof Matrix2d
-     * @function
      * @returns {Matrix2d} Reference to this object for method chaining
      */
     transpose() {
@@ -221,7 +215,6 @@ class Matrix2d {
      * invert this matrix, causing it to apply the opposite transformation.
      * @name invert
      * @memberof Matrix2d
-     * @function
      * @returns {Matrix2d} Reference to this object for method chaining
      */
     invert() {
@@ -253,20 +246,24 @@ class Matrix2d {
     }
 
    /**
-    * apply the current transform to the given 2d vector
+    * apply the current transform to the given 2d or 3d vector
     * @name apply
     * @memberof Matrix2d
-    * @function
-    * @param {Vector2d} v the vector object to be transformed
-    * @returns {Vector2d} result vector object.
+    * @param {Vector2d|Vector3d} v the vector object to be transformed
+    * @returns {Vector2d|Vector3d} result vector object.
     */
     apply(v) {
         var a = this.val,
             x = v.x,
-            y = v.y;
+            y = v.y,
+            z = (typeof v.z !== "undefined") ? v.z : 1;
+
+        v.x = x * a[0] + y * a[3] + z * a[6];
+        v.y = x * a[1] + y * a[4] + z * a[7];
 
-        v.x = x * a[0] + y * a[3] + a[6];
-        v.y = x * a[1] + y * a[4] + a[7];
+        if (typeof v.z !== "undefined") {
+            v.z = x * a[2] + y * a[5] + z * a[8];
+        }
 
         return v;
     }
@@ -275,7 +272,6 @@ class Matrix2d {
      * apply the inverted current transform to the given 2d vector
      * @name applyInverse
      * @memberof Matrix2d
-     * @function
      * @param {Vector2d} v the vector object to be transformed
      * @returns {Vector2d} result vector object.
      */
@@ -296,7 +292,6 @@ class Matrix2d {
      * scale the matrix
      * @name scale
      * @memberof Matrix2d
-     * @function
      * @param {number} x a number representing the abscissa of the scaling vector.
      * @param {number} [y=x] a number representing the ordinate of the scaling vector.
      * @returns {Matrix2d} Reference to this object for method chaining
@@ -318,7 +313,6 @@ class Matrix2d {
      * adds a 2D scaling transformation.
      * @name scaleV
      * @memberof Matrix2d
-     * @function
      * @param {Vector2d} v scaling vector
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -330,7 +324,6 @@ class Matrix2d {
      * specifies a 2D scale operation using the [sx, 1] scaling vector
      * @name scaleX
      * @memberof Matrix2d
-     * @function
      * @param {number} x x scaling vector
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -342,7 +335,6 @@ class Matrix2d {
      * specifies a 2D scale operation using the [1,sy] scaling vector
      * @name scaleY
      * @memberof Matrix2d
-     * @function
      * @param {number} y y scaling vector
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -354,7 +346,6 @@ class Matrix2d {
      * rotate the matrix (counter-clockwise) by the specified angle (in radians).
      * @name rotate
      * @memberof Matrix2d
-     * @function
      * @param {number} angle Rotation angle in radians.
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -385,7 +376,7 @@ class Matrix2d {
      * translate the matrix position on the horizontal and vertical axis
      * @name translate
      * @memberof Matrix2d
-     * @function
+     * @method
      * @param {number} x the x coordindates to translate the matrix by
      * @param {number} y the y coordindates to translate the matrix by
      * @returns {Matrix2d} Reference to this object for method chaining
@@ -394,7 +385,6 @@ class Matrix2d {
      * translate the matrix by a vector on the horizontal and vertical axis
      * @name translateV
      * @memberof Matrix2d
-     * @function
      * @param {Vector2d} v the vector to translate the matrix by
      * @returns {Matrix2d} Reference to this object for method chaining
      */
@@ -422,7 +412,6 @@ class Matrix2d {
      * returns true if the matrix is an identity matrix.
      * @name isIdentity
      * @memberof Matrix2d
-     * @function
      * @returns {boolean}
      */
     isIdentity() {
@@ -445,7 +434,6 @@ class Matrix2d {
      * return true if the two matrices are identical
      * @name equals
      * @memberof Matrix2d
-     * @function
      * @param {Matrix2d} m the other matrix
      * @returns {boolean} true if both are equals
      */
@@ -470,7 +458,6 @@ class Matrix2d {
      * Clone the Matrix
      * @name clone
      * @memberof Matrix2d
-     * @function
      * @returns {Matrix2d}
      */
     clone() {
@@ -481,7 +468,6 @@ class Matrix2d {
      * return an array representation of this Matrix
      * @name toArray
      * @memberof Matrix2d
-     * @function
      * @returns {Float32Array}
      */
     toArray() {
@@ -492,7 +478,6 @@ class Matrix2d {
      * convert the object to a string representation
      * @name toString
      * @memberof Matrix2d
-     * @function
      * @returns {string}
      */
     toString() {