melonjs 15.1.4 → 15.1.6

package/src/renderable/dragndrop.js

@@ -1,115 +1,6 @@
-import Vector2d from "./../math/vector2.js";
-import * as input from "./../input/input.js";
 import * as event from "./../system/event.js";
 import Renderable from "./../renderable/renderable.js";
 
-/**
- * @classdesc
- * A Draggable base object
- * @see DropTarget
- * @augments Renderable
- */
-export class Draggable extends Renderable {
-    /**
-     * @param {number} x - the x coordinates of the draggable object
-     * @param {number} y - the y coordinates of the draggable object
-     * @param {number} width - draggable object width
-     * @param {number} height - draggable object height
-     */
-    constructor(x, y, width, height) {
-        super(x, y, width, height);
-        this.isKinematic = false;
-        this.dragging = false;
-        this.dragId = null;
-        this.grabOffset = new Vector2d(0, 0);
-        this.initEvents();
-    }
-
-    /**
-     * Initializes the events the modules needs to listen to
-     * It translates the pointer events to me.events
-     * in order to make them pass through the system and to make
-     * this module testable. Then we subscribe this module to the
-     * transformed events.
-     * @name initEvents
-     * @memberof Draggable
-     * @private
-     */
-    initEvents() {
-        input.registerPointerEvent("pointerdown", this, (e) => event.emit(event.DRAGSTART, e, this));
-        input.registerPointerEvent("pointerup", this,  (e) => event.emit(event.DRAGEND, e, this));
-        input.registerPointerEvent("pointercancel", this, (e) => event.emit(event.DRAGEND, e, this));
-        event.on(event.POINTERMOVE, (e) => this.dragMove(e));
-        event.on(event.DRAGSTART, (e, draggable) => {
-            if (draggable === this) {
-                this.dragStart(e);
-            }
-        });
-        event.on(event.DRAGEND, (e, draggable) => {
-            if (draggable === this) {
-                this.dragEnd(e);
-            }
-        });
-    }
-
-    /**
-     * Gets called when the user starts dragging the entity
-     * @name dragStart
-     * @memberof Draggable
-     * @param {object} e - the pointer event
-     * @returns {boolean} false if the object is being dragged
-     */
-    dragStart(e) {
-        if (this.dragging === false) {
-            this.dragging = true;
-            this.grabOffset.set(e.gameX, e.gameY);
-            this.grabOffset.sub(this.pos);
-            return false;
-        }
-    }
-
-    /**
-     * Gets called when the user drags this entity around
-     * @name dragMove
-     * @memberof Draggable
-     * @param {object} e - the pointer event
-     */
-    dragMove(e) {
-        if (this.dragging === true) {
-            this.pos.set(e.gameX, e.gameY, this.pos.z); //TODO : z ?
-            this.pos.sub(this.grabOffset);
-        }
-    }
-
-    /**
-     * Gets called when the user stops dragging the entity
-     * @name dragEnd
-     * @memberof Draggable
-     * @returns {boolean} false if the object stopped being dragged
-     */
-    dragEnd() {
-        if (this.dragging === true) {
-            this.dragging = false;
-            return false;
-        }
-    }
-
-    /**
-     * Destructor
-     * @name destroy
-     * @memberof Draggable
-     * @ignore
-     */
-    destroy() {
-        event.off(event.POINTERMOVE, this.dragMove);
-        event.off(event.DRAGSTART, this.dragStart);
-        event.off(event.DRAGEND, this.dragEnd);
-        input.releasePointerEvent("pointerdown", this);
-        input.releasePointerEvent("pointerup", this);
-        input.releasePointerEvent("pointercancel", this);
-        super.destroy();
-    }
-}
 
 /**
  * @classdesc

package/src/renderable/renderable.js

@@ -263,12 +263,12 @@ import Color from "./../math/color.js";
     }
 
     /**
-     * Whether the renderable object is floating, or contained in a floating container
+     * Whether the renderable object is floating (i.e. used screen coordinates), or contained in a floating parent container
      * @see Renderable#floating
      * @type {boolean}
      */
     get isFloating() {
-        return this.floating === true || (typeof this.ancestor !== "undefined" && this.ancestor.floating === true);
+        return this.floating === true || (typeof this.ancestor !== "undefined" && this.ancestor.isFloating === true);
     }
 
     /**
@@ -577,11 +577,8 @@ import Color from "./../math/color.js";
             }
 
             if (absolute === true) {
-                bounds.centerOn(this.pos.x + bounds.x + bounds.width / 2,  this.pos.y + bounds.y + bounds.height / 2);
-                if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
-                     bounds.translate(this.ancestor.getAbsolutePosition());
-                }
-
+                var absPos = this.getAbsolutePosition();
+                bounds.centerOn(absPos.x + bounds.x + bounds.width / 2,  absPos.y + bounds.y + bounds.height / 2);
             }
             return bounds;
 
@@ -610,7 +607,7 @@ import Color from "./../math/color.js";
           }
           // XXX Cache me or something
           this._absPos.set(this.pos.x, this.pos.y);
-          if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
+          if (typeof this.ancestor !== "undefined" && typeof this.ancestor.getAbsolutePosition === "function" && this.floating !== true) {
               this._absPos.add(this.ancestor.getAbsolutePosition());
           }
           return this._absPos;
@@ -728,7 +725,7 @@ import Color from "./../math/color.js";
      * onCollision callback, triggered in case of collision,
      * when this renderable body is colliding with another one
      * @param {ResponseObject} response - the collision response object
-     * @param {Renderable} other - the other renderable touching this one (a reference to response.a or response.b)
+     * @param {Renderable|Container|Entity|Sprite|NineSliceSprite} other - the other renderable touching this one (a reference to response.a or response.b)
      * @returns {boolean} true if the object should respond to the collision (its position and velocity will be corrected)
      * @example
      * // colision handler

package/src/renderable/trigger.js

@@ -136,7 +136,7 @@ import pool from "./../system/pooling.js";
      * @name onCollision
      * @memberof Trigger
      * @param {ResponseObject} response - the collision response object
-     * @param {Renderable} other - the other renderable touching this one (a reference to response.a or response.b)
+     * @param {Renderable|Container|Entity|Sprite|NineSliceSprite} other - the other renderable touching this one (a reference to response.a or response.b)
      * @returns {boolean} true if the object should respond to the collision (its position and velocity will be corrected)
      */
     onCollision(response, other) { // eslint-disable-line no-unused-vars

package/src/renderable/ui/uibaseelement.js

@@ -64,7 +64,7 @@ import pool from "../../system/pooling.js";
 
         /**
          * UI base elements use screen coordinates by default
-         * (Note: any child elements added to a UIBaseElement should set their floating property to false)
+         * (Note: any child elements added to a UIBaseElement should have their floating property to false)
          * @see Renderable.floating
          * @type {boolean}
          * @default true
@@ -76,6 +76,9 @@ import pool from "../../system/pooling.js";
 
         // enable event detection
         this.isKinematic = false;
+
+        // update container and children bounds automatically
+        this.enableChildBoundsUpdate = true;
     }
 
     /**
@@ -110,7 +113,7 @@ import pool from "../../system/pooling.js";
      * @returns {boolean} return false if we need to stop propagating the event
      */
     onClick(event) { // eslint-disable-line no-unused-vars
-        return false;
+        return true;
     }
 
     /**
@@ -203,7 +206,7 @@ import pool from "../../system/pooling.js";
      * @returns {boolean} return false if we need to stop propagating the event
      */
     onRelease() {
-        return false;
+        return true;
     }
 
     /**

package/src/renderable/ui/uispriteelement.js

@@ -73,7 +73,13 @@ import { registerPointerEvent, releasePointerEvent} from "./../../input/input.js
         this.holdTimeout = -1;
         this.released = true;
 
-        // GUI items use screen coordinates
+        /**
+         * if this UISpriteElement should use screen coordinates or local coordinates
+         * (Note: any UISpriteElement elements added to a floating parent container should have their floating property to false)
+         * @see Renderable.floating
+         * @type {boolean}
+         * @default true
+         */
         this.floating = true;
 
         // enable event detection

package/src/text/bitmaptext.js

@@ -232,7 +232,7 @@ import TextMetrics from "./textmetrics.js";
         }
 
         if (absolute === true) {
-            if (typeof this.ancestor !== "undefined" && typeof this.ancestor.addChild === "function" && this.floating !== true) {
+            if (typeof this.ancestor !== "undefined" && typeof this.ancestor.getAbsolutePosition === "function" && this.floating !== true) {
                  bounds.translate(this.ancestor.getAbsolutePosition());
             }
         }
@@ -311,7 +311,7 @@ import TextMetrics from "./textmetrics.js";
 
         for (let i = 0; i < this._text.length; i++) {
             x = lX;
-            let string = this._text[i].trimEnd();
+            const string = this._text[i].trimEnd();
             // adjust x pos based on alignment value
             let stringWidth = this.metrics.lineWidth(string);
             switch (this.textAlign) {

package/src/text/text.js

@@ -375,7 +375,7 @@ const toPX = [12, 24, 0.75, 1];
         setContextStyle(context, this);
 
         for (let i = 0; i < text.length; i++) {
-            let string = text[i].trimEnd();
+            const string = text[i].trimEnd();
             // draw the string
             if (this.fillStyle.alpha > 0) {
                 context.fillText(string, x, y);

package/src/video/canvas/canvas_renderer.js

@@ -392,9 +392,8 @@ import * as event from "./../../system/event.js";
         this.translate(poly.pos.x, poly.pos.y);
         context.beginPath();
         context.moveTo(poly.points[0].x, poly.points[0].y);
-        let point;
         for (let i = 1; i < poly.points.length; i++) {
-            point = poly.points[i];
+            const point = poly.points[i];
             context.lineTo(point.x, point.y);
         }
         context.lineTo(poly.points[0].x, poly.points[0].y);
@@ -689,11 +688,9 @@ import * as event from "./../../system/event.js";
         } else {
             // polygon
             const _x = mask.pos.x, _y = mask.pos.y;
-            let point;
-
             context.moveTo(_x + mask.points[0].x, _y + mask.points[0].y);
             for (let i = 1; i < mask.points.length; i++) {
-                point = mask.points[i];
+                const point = mask.points[i];
                 context.lineTo(_x + point.x, _y + point.y);
             }
         }

package/src/video/texture/canvas_texture.js

@@ -38,7 +38,7 @@ class CanvasTexture {
          * the rendering context of this CanvasTexture
          * @type {CanvasRenderingContext2D}
          */
-        this.context = this.canvas.getContext("2d", { willReadFrequently: attributes.willReadFrequently });
+        this.context = this.canvas.getContext(attributes.context, { willReadFrequently: attributes.willReadFrequently });
 
         // enable or disable antiAlias if specified
         this.setAntiAlias(attributes.antiAlias);