melonjs 10.9.0 → 10.10.0

package/src/geometries/rectangle.js

@@ -32,7 +32,7 @@ class Rect extends Polygon {
     /**
      * set new value to the rectangle shape
      * @name setShape
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} x position of the Rectangle
      * @param {number} y position of the Rectangle
@@ -63,7 +63,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name left
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get left() {
         return this.pos.x;
@@ -74,7 +74,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name right
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get right() {
         var w = this.width;
@@ -86,7 +86,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name top
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get top() {
         return this.pos.y;
@@ -97,7 +97,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name bottom
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get bottom() {
         var h = this.height;
@@ -109,7 +109,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name width
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get width() {
         return this.points[2].x;
@@ -125,7 +125,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name height
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get height() {
         return this.points[2].y;
@@ -141,7 +141,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name centerX
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get centerX() {
         if (isFinite(this.width)) {
@@ -159,7 +159,7 @@ class Rect extends Polygon {
      * @public
      * @type {number}
      * @name centerY
-     * @memberof Rect.prototype
+     * @memberof Rect
      */
     get centerY() {
         if (isFinite(this.height)) {
@@ -175,7 +175,7 @@ class Rect extends Polygon {
     /**
      * center the rectangle position around the given coordinates
      * @name centerOn
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} x the x coordinate around which to center this rectangle
      * @param {number} x the y coordinate around which to center this rectangle
@@ -190,7 +190,7 @@ class Rect extends Polygon {
     /**
      * resize the rectangle
      * @name resize
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {number} w new width of the rectangle
      * @param {number} h new height of the rectangle
@@ -205,7 +205,7 @@ class Rect extends Polygon {
     /**
      * scale the rectangle
      * @name scale
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @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.
@@ -220,7 +220,7 @@ class Rect extends Polygon {
     /**
      * clone this rectangle
      * @name clone
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {Rect} new rectangle
      */
@@ -231,7 +231,7 @@ class Rect extends Polygon {
     /**
      * copy the position and size of the given rectangle into this one
      * @name copy
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect Source rectangle
      * @returns {Rect} new rectangle
@@ -243,7 +243,7 @@ class Rect extends Polygon {
     /**
      * merge this rectangle with another one
      * @name union
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect other rectangle to union with
      * @returns {Rect} the union(ed) rectangle
@@ -265,7 +265,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is intersecting with the specified one
      * @name overlaps
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if overlaps
@@ -282,7 +282,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given rectangle
      * @name contains
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if contains
@@ -291,7 +291,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given point
      * @name contains
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
@@ -301,7 +301,7 @@ class Rect extends Polygon {
     /**
      * Returns true if the rectangle contains the given point
      * @name contains
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Vector2d} point
      * @returns {boolean} true if contains
@@ -337,7 +337,7 @@ class Rect extends Polygon {
     /**
      * check if this rectangle is identical to the specified one
      * @name equals
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @param {Rect} rect
      * @returns {boolean} true if equals
@@ -354,7 +354,7 @@ class Rect extends Polygon {
     /**
      * determines whether all coordinates of this rectangle are finite numbers.
      * @name isFinite
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {boolean} false if all coordinates are positive or negative Infinity or NaN; otherwise, true.
      */
@@ -365,7 +365,7 @@ class Rect extends Polygon {
     /**
      * Returns a polygon whose edges are the same as this box.
      * @name toPolygon
-     * @memberof Rect.prototype
+     * @memberof Rect
      * @function
      * @returns {Polygon} a new Polygon that represents this rectangle.
      */

package/src/geometries/roundrect.js

@@ -36,7 +36,7 @@ class RoundRect extends Rect {
      * @type {number}
      * @default 20
      * @name radius
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      */
     get radius() {
         return this._radius;
@@ -55,7 +55,7 @@ class RoundRect extends Rect {
     /**
      * copy the position, size and radius of the given rounded rectangle into this one
      * @name copy
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      * @function
      * @param {RoundRect} rrect source rounded rectangle
      * @returns {RoundRect} new rectangle
@@ -69,7 +69,7 @@ class RoundRect extends Rect {
     /**
      * Returns true if the rounded rectangle contains the given point
      * @name contains
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      * @function
      * @param  {number} x x coordinate
      * @param  {number} y y coordinate
@@ -79,7 +79,7 @@ class RoundRect extends Rect {
     /**
      * Returns true if the rounded rectangle contains the given point
      * @name contains
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      * @function
      * @param {Vector2d} point
      * @returns {boolean} true if contains
@@ -140,7 +140,7 @@ class RoundRect extends Rect {
     /**
      * check if this RoundRect is identical to the specified one
      * @name equals
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      * @function
      * @param {RoundRect} rrect
      * @returns {boolean} true if equals
@@ -152,7 +152,7 @@ class RoundRect extends Rect {
     /**
      * clone this RoundRect
      * @name clone
-     * @memberof RoundRect.prototype
+     * @memberof RoundRect
      * @function
      * @returns {RoundRect} new RoundRect
      */

package/src/index.js

@@ -41,7 +41,8 @@ import WebGLCompositor from "./video/webgl/webgl_compositor.js";
 import Renderer from "./video/renderer.js";
 import WebGLRenderer from "./video/webgl/webgl_renderer.js";
 import CanvasRenderer from "./video/canvas/canvas_renderer.js";
-import { TextureAtlas } from "./video/texture.js";
+import CanvasTexture from "./video/texture/canvas_texture.js";
+import { TextureAtlas } from "./video/texture/atlas.js";
 import Renderable from "./renderable/renderable.js";
 import Text from "./text/text.js";
 import BitmapText from "./text/bitmaptext.js";
@@ -53,6 +54,7 @@ import NineSliceSprite from "./renderable/nineslicesprite.js";
 import GUI_Object from "./renderable/GUI.js";
 import Collectable from "./renderable/collectable.js";
 import Trigger from "./renderable/trigger.js";
+import Light2d from "./renderable/light2d.js";
 import { Draggable, DropTarget } from "./renderable/dragndrop.js";
 import TMXRenderer from "./level/tiled/renderer/TMXRenderer.js";
 import TMXOrthogonalRenderer from "./level/tiled/renderer/TMXOrthogonalRenderer.js";
@@ -140,6 +142,7 @@ export {
     GUI_Object,
     Collectable,
     Trigger,
+    Light2d,
     Draggable,
     DropTarget,
     TMXRenderer,
@@ -202,6 +205,7 @@ export function boot() {
     pool.register("me.Entity", Entity);
     pool.register("me.Collectable", Collectable);
     pool.register("me.Trigger", Trigger);
+    pool.register("me.Light2d", Light2d);
     pool.register("me.Tween", Tween, true);
     pool.register("me.Color", Color, true);
     pool.register("me.Particle", Particle, true);
@@ -230,6 +234,7 @@ export function boot() {
     pool.register("Entity", Entity);
     pool.register("Collectable", Collectable);
     pool.register("Trigger", Trigger);
+    pool.register("Light2d", Light2d);
     pool.register("Tween", Tween, true);
     pool.register("Color", Color, true);
     pool.register("Particle", Particle, true);
@@ -253,6 +258,7 @@ export function boot() {
     pool.register("Line", Line, true);
     pool.register("Ellipse", Ellipse, true);
     pool.register("Bounds", Bounds, true);
+    pool.register("CanvasTexture", CanvasTexture, true);
 
     // publish Boot notification
     event.emit(event.BOOT);

package/src/lang/deprecated.js

@@ -1,6 +1,6 @@
 import device from "./../system/device.js";
 import { requestPointerLock, exitPointerLock } from "./../input/input.js";
-import { TextureAtlas } from "./../video/texture.js";
+import { TextureAtlas } from "./../video/texture/atlas.js";
 import Renderer from "./../video/renderer.js";
 import { Draggable, DropTarget } from "./../renderable/dragndrop.js";
 
@@ -47,9 +47,10 @@ export function warning(deprecated, replacement, version) {
 
 /**
  * @public
- * @type {Function}
  * @name turnOnPointerLock
- * @memberof device
+ * @function
+ * @returns {boolean} return true if the request was successfully submitted
+ * @memberof device#
  * @deprecated since 10.3.0
  * @see input.requestPointerLock
  */
@@ -60,9 +61,10 @@ device.turnOnPointerLock = function () {
 
 /**
  * @public
- * @type {Function}
  * @name turnOffPointerLock
- * @memberof device
+ * @function
+ * @returns {boolean} return true if the request was successfully submitted
+ * @memberof device#
  * @deprecated since 10.3.0
  * @see input.exitPointerLock
  */

package/src/level/tiled/TMXUtils.js

@@ -48,7 +48,7 @@ function setTMXValue(name, type, value) {
                 match = value.split(/^eval:/i)[1];
                 try {
                     // eslint-disable-next-line
-                    value = eval(match);
+                    value = Function("'use strict';return (" + match + ")")();
                 }
                 catch (e) {
                     throw new Error("Unable to evaluate: " + match);

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
+            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

@@ -561,11 +561,11 @@ class 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);
     }
 
     /**
@@ -591,9 +591,10 @@ class Color {
      * @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 +602,7 @@ class Color {
             this.r + "," +
             this.g + "," +
             this.b + "," +
-            this.alpha +
+            alpha +
         ")";
     }
 };

package/src/particles/emitter.js

@@ -1,23 +1,18 @@
-import { createCanvas } from "./../video/video.js";
 import pool from "./../system/pooling.js";
 import ParticleEmitterSettings from "./settings.js";
 import { randomFloat } from "./../math/math.js";
 import Container from "./../renderable/container.js";
 
 
-// default texture used when no sprite is defined
-let defaultParticleTexture;
-
 /**
  * @ignore
  */
 function createDefaultParticleTexture(w = 8, h = 8) {
-    if (typeof defaultParticleTexture === "undefined") {
-        defaultParticleTexture = createCanvas(w, h, true);
-        var context = defaultParticleTexture.getContext("2d");
-        context.fillStyle = "#fff";
-        context.fillRect(0, 0, w, h);
-    }
+    var defaultParticleTexture = pool.pull("CanvasTexture", w, h, true);
+
+    defaultParticleTexture.context.fillStyle = "#fff";
+    defaultParticleTexture.context.fillRect(0, 0, w, h);
+
     return defaultParticleTexture;
 };
 
@@ -120,9 +115,9 @@ class ParticleEmitter extends Container {
     reset(settings = {}) {
         Object.assign(this.settings, ParticleEmitterSettings, settings);
 
-        // Cache the image reference
         if (typeof this.settings.image === "undefined") {
-            this.settings.image = createDefaultParticleTexture(settings.textureSize, settings.textureSize);
+            this._defaultParticle = createDefaultParticleTexture(settings.textureSize, settings.textureSize);
+            this.settings.image = this._defaultParticle.canvas;
         }
 
         this.floating = this.settings.floating;
@@ -252,6 +247,10 @@ class ParticleEmitter extends Container {
         // call the parent destroy method
         super.destroy(arguments);
         // clean emitter specific Properties
+        if (typeof this._defaultParticle !== "undefined") {
+            pool.push(this._defaultParticle);
+            this._defaultParticle = undefined;
+        }
         this.settings.image = undefined;
         this.settings = undefined;
     }

package/src/renderable/GUI.js

@@ -116,7 +116,7 @@ class GUI_Object extends Sprite {
     /**
      * function called when the object is pressed (to be extended)
      * @name onClick
-     * @memberof GUI_Object.prototype
+     * @memberof GUI_Object
      * @public
      * @function
      * @param {Pointer} event the event object
@@ -139,7 +139,7 @@ class GUI_Object extends Sprite {
     /**
      * function called when the pointer is over the object
      * @name onOver
-     * @memberof GUI_Object.prototype
+     * @memberof GUI_Object
      * @public
      * @function
      * @param {Pointer} event the event object
@@ -160,7 +160,7 @@ class GUI_Object extends Sprite {
     /**
      * function called when the pointer is leaving the object area
      * @name onOut
-     * @memberof GUI_Object.prototype
+     * @memberof GUI_Object
      * @public
      * @function
      * @param {Pointer} event the event object
@@ -185,7 +185,7 @@ class GUI_Object extends Sprite {
     /**
      * function called when the object is pressed and released (to be extended)
      * @name onRelease
-     * @memberof GUI_Object.prototype
+     * @memberof GUI_Object
      * @public
      * @function
      * @returns {boolean} return false if we need to stop propagating the event
@@ -210,7 +210,7 @@ class GUI_Object extends Sprite {
      * function called when the object is pressed and held<br>
      * to be extended <br>
      * @name onHold
-     * @memberof GUI_Object.prototype
+     * @memberof GUI_Object
      * @public
      * @function
      */