melonjs 14.4.0 → 15.0.0

package/src/geometries/path2d.js

@@ -10,20 +10,14 @@ import earcut from "earcut";
     constructor() {
         /**
          * the points defining the current path
-         * @public
-         * @type {Vector2d[]}
-         * @name points
-         * @memberof Path2D#
+         * @type {Point[]}
          */
         this.points = [];
 
         /**
          * space between interpolated points for quadratic and bezier curve approx. in pixels.
-         * @public
          * @type {number}
-         * @name arcResolution
          * @default 5
-         * @memberof Path2D#
          */
         this.arcResolution = 5;
 
@@ -33,8 +27,6 @@ import earcut from "earcut";
 
     /**
      * begin a new path
-     * @name beginPath
-     * @memberof Path2D
      */
     beginPath() {
         // empty the cache and recycle all vectors
@@ -48,21 +40,17 @@ import earcut from "earcut";
      * causes the point of the pen to move back to the start of the current path.
      * It tries to draw a straight line from the current point to the start.
      * If the shape has already been closed or has only one point, this function does nothing.
-     * @name closePath
-     * @memberof Path2D
      */
     closePath() {
         var points = this.points;
         if (points.length > 1 && !points[points.length-1].equals(points[0])) {
-            points.push(pool.pull("Vector2d", points[0].x, points[0].y));
+            points.push(pool.pull("Point", points[0].x, points[0].y));
         }
     }
 
     /**
      * triangulate the shape defined by this path into an array of triangles
-     * @name triangulatePath
-     * @memberof Path2D
-     * @returns {Vector2d[]}
+     * @returns {Point[]}
      */
     triangulatePath() {
         var i = 0;
@@ -70,13 +58,15 @@ import earcut from "earcut";
         var vertices = this.vertices;
         var indices = earcut(points.flatMap(p => [p.x, p.y]));
 
+        // pre-allocate vertices if necessary
+        while (vertices.length < indices.length) {
+            vertices.push(pool.pull("Point"));
+        }
+
         // calculate all vertices
         for (i = 0; i < indices.length; i++ ) {
-            if (typeof vertices[i] === "undefined") {
-                // increase cache buffer if necessary
-                vertices[i] = pool.pull("Vector2d");
-            }
-            vertices[i].set(points[indices[i]].x, points[indices[i]].y);
+            var point = points[indices[i]];
+            vertices[i].set(point.x, point.y);
         }
 
         // recycle overhead from a previous triangulation
@@ -90,31 +80,25 @@ import earcut from "earcut";
 
     /**
      * moves the starting point of the current path to the (x, y) coordinates.
-     * @name moveTo
-     * @memberof Path2D
      * @param {number} x - the x-axis (horizontal) coordinate of the point.
      * @param {number} y - the y-axis (vertical) coordinate of the point.
      */
     moveTo(x, y) {
-      this.points.push(pool.pull("Vector2d", x, y));
+      this.points.push(pool.pull("Point", x, y));
     }
 
     /**
      * connects the last point in the current patch to the (x, y) coordinates with a straight line.
-     * @name lineTo
-     * @memberof Path2D
      * @param {number} x - the x-axis coordinate of the line's end point.
      * @param {number} y - the y-axis coordinate of the line's end point.
      */
     lineTo(x, y) {
-        this.points.push(pool.pull("Vector2d", x, y));
+        this.points.push(pool.pull("Point", x, y));
     }
 
     /**
      * adds an arc to the current path which is centered at (x, y) position with the given radius,
      * starting at startAngle and ending at endAngle going in the given direction by counterclockwise (defaulting to clockwise).
-     * @name arc
-     * @memberof Path2D
      * @param {number} x - the horizontal coordinate of the arc's center.
      * @param {number} y - the vertical coordinate of the arc's center.
      * @param {number} radius - the arc's radius. Must be positive.
@@ -154,16 +138,14 @@ import earcut from "earcut";
 
         var angle = startAngle;
         for (var j = 0; j < nr_of_interpolation_points; j++) {
-            points.push(pool.pull("Vector2d", x + radius * Math.cos(angle), y + radius * Math.sin(angle)));
+            points.push(pool.pull("Point", x + radius * Math.cos(angle), y + radius * Math.sin(angle)));
             angle += direction * dangle;
         }
-        points.push(pool.pull("Vector2d", x + radius * Math.cos(endAngle), y + radius * Math.sin(endAngle)));
+        points.push(pool.pull("Point", x + radius * Math.cos(endAngle), y + radius * Math.sin(endAngle)));
     }
 
     /**
      * adds a circular arc to the path with the given control points and radius, connected to the previous point by a straight line.
-     * @name arcTo
-     * @memberof Path2D
      * @param {number} x1 - the x-axis coordinate of the first control point.
      * @param {number} y1 - the y-axis coordinate of the first control point.
      * @param {number} x2 - the x-axis coordinate of the second control point.
@@ -192,7 +174,7 @@ import earcut from "earcut";
         var tangent_point1 =  [x1 + a[0] * adj_l, y1 + a[1] * adj_l];
         var tangent_point2 =  [x1 + b[0] * adj_l, y1 + b[1] * adj_l];
 
-        points.push(pool.pull("Vector2d", tangent_point1[0], tangent_point1[1]));
+        points.push(pool.pull("Point", tangent_point1[0], tangent_point1[1]));
 
         var bisec = [(a[0] + b[0]) / 2.0, (a[1] + b[1]) / 2.0];
         var bisec_l = Math.sqrt(Math.pow(bisec[0], 2) + Math.pow(bisec[1], 2));
@@ -210,8 +192,6 @@ import earcut from "earcut";
     /**
      * adds an elliptical arc to the path which is centered at (x, y) position with the radii radiusX and radiusY
      * starting at startAngle and ending at endAngle going in the given direction by counterclockwise.
-     * @name ellipse
-     * @memberof Path2D
      * @param {number} x - the x-axis (horizontal) coordinate of the ellipse's center.
      * @param {number} y - the  y-axis (vertical) coordinate of the ellipse's center.
      * @param {number} radiusX - the ellipse's major-axis radius. Must be non-negative.
@@ -259,18 +239,13 @@ import earcut from "earcut";
             var _y1 = radiusY * Math.sin(angle);
             var _x2 = x + _x1 * cos_rotation - _y1 * sin_rotation;
             var _y2 = y + _x1 * sin_rotation + _y1 * cos_rotation;
-            points.push(pool.pull("Vector2d", _x2, _y2));
+            points.push(pool.pull("Point", _x2, _y2));
             angle += direction * dangle;
         }
-        //var x1 = radiusX * Math.cos(endAngle);
-        //var y1 = radiusY * Math.sin(endAngle);
-        //points.push(pool.pull("Vector2d", x + x1 * cos_rotation - y1 * sin_rotation, y + x1 * sin_rotation + y1 * cos_rotation));
     }
 
     /**
      * creates a path for a rectangle at position (x, y) with a size that is determined by width and height.
-     * @name rect
-     * @memberof Path2D
      * @param {number} x - the x-axis coordinate of the rectangle's starting point.
      * @param {number} y - the y-axis coordinate of the rectangle's starting point.
      * @param {number} width - the rectangle's width. Positive values are to the right, and negative to the left.
@@ -279,15 +254,16 @@ import earcut from "earcut";
     rect(x, y, width, height) {
         this.moveTo(x, y);
         this.lineTo(x + width, y);
+        this.moveTo(x + width, y);
         this.lineTo(x + width, y + height);
+        this.moveTo(x + width, y + height);
         this.lineTo(x, y + height);
+        this.moveTo(x, y + height);
         this.lineTo(x, y);
     }
 
     /**
      * adds an rounded rectangle to the current path.
-     * @name roundRect
-     * @memberof Path2D
      * @param {number} x - the x-axis coordinate of the rectangle's starting point.
      * @param {number} y - the y-axis coordinate of the rectangle's starting point.
      * @param {number} width - the rectangle's width. Positive values are to the right, and negative to the left.

package/src/geometries/point.js

@@ -6,7 +6,6 @@
     constructor(x = 0, y = 0) {
         /**
          * the position of the point on the horizontal axis
-         * @public
          * @type {Number}
          * @default 0
          */
@@ -14,7 +13,6 @@
 
         /**
          * the position of the point on the vertical axis
-         * @public
          * @type {Number}
          * @default 0
          */
@@ -48,8 +46,6 @@
      */
     /**
      * return true if this point is equal to the given values
-     * @name equals
-     * @memberof Point
      * @param {number} x
      * @param {number} y
      * @returns {boolean}
@@ -70,7 +66,6 @@
 
     /**
      * clone this Point
-     * @name clone
      * @returns {Point} new Point
      */
     clone() {

package/src/geometries/poly.js

@@ -200,9 +200,7 @@ import pool from "./../system/pooling.js";
      * @param {number} [y=x]
      * @returns {Polygon} Reference to this object for method chaining
      */
-    scale(x, y) {
-        y = typeof (y) !== "undefined" ? y : x;
-
+    scale(x, y = x) {
         var points = this.points;
         var len = points.length;
         for (var i = 0; i < len; i++) {
@@ -458,7 +456,6 @@ import pool from "./../system/pooling.js";
 
     /**
      * update the bounding box for this shape.
-     * @ignore
      * @name updateBounds
      * @memberof Polygon
      * @returns {Bounds} this shape bounding box Rectangle object

package/src/geometries/rectangle.js

@@ -77,7 +77,7 @@ import Polygon from "./poly.js";
      */
     get right() {
         var w = this.width;
-        return (this.pos.x + w) || w;
+        return (this.left + w) || w;
     }
 
     /**
@@ -100,7 +100,7 @@ import Polygon from "./poly.js";
      */
     get bottom() {
         var h = this.height;
-        return (this.pos.y + h) || h;
+        return (this.top + h) || h;
     }
 
     /**
@@ -144,13 +144,15 @@ import Polygon from "./poly.js";
      */
     get centerX() {
         if (isFinite(this.width)) {
-            return this.pos.x + (this.width / 2);
+            return this.left + (this.width / 2);
         } else {
             return this.width;
         }
     }
     set centerX (value) {
         this.pos.x = value - (this.width / 2);
+        this.recalc();
+        this.updateBounds();
     }
 
     /**
@@ -162,13 +164,15 @@ import Polygon from "./poly.js";
      */
     get centerY() {
         if (isFinite(this.height)) {
-            return this.pos.y + (this.height / 2);
+            return this.top + (this.height / 2);
         } else {
             return this.height;
         }
     }
     set centerY(value) {
         this.pos.y = value - (this.height / 2);
+        this.recalc();
+        this.updateBounds();
     }
 
     /**
@@ -220,7 +224,7 @@ import Polygon from "./poly.js";
      * @returns {Rect} new rectangle
      */
     clone() {
-        return new Rect(this.pos.x, this.pos.y, this.width, this.height);
+        return new Rect(this.left, this.top, this.width, this.height);
     }
 
     /**
@@ -231,7 +235,7 @@ import Polygon from "./poly.js";
      * @returns {Rect} new rectangle
      */
     copy(rect) {
-        return this.setShape(rect.pos.x, rect.pos.y, rect.width, rect.height);
+        return this.setShape(rect.left, rect.top, rect.width, rect.height);
     }
 
     /**
@@ -348,7 +352,7 @@ import Polygon from "./poly.js";
      * @returns {boolean} false if all coordinates are positive or negative Infinity or NaN; otherwise, true.
      */
     isFinite() {
-        return (isFinite(this.pos.x) && isFinite(this.pos.y) && isFinite(this.width) && isFinite(this.height));
+        return (isFinite(this.left) && isFinite(this.top) && isFinite(this.width) && isFinite(this.height));
     }
 
     /**
@@ -359,7 +363,7 @@ import Polygon from "./poly.js";
      */
     toPolygon() {
         return pool.pull("Polygon",
-            this.pos.x, this.pos.y, this.points
+            this.left, this.top, this.points
         );
     }
 }

package/src/index.js

@@ -20,7 +20,9 @@ import Body from "./physics/body.js";
 import Bounds from "./physics/bounds.js";
 import Tween from "./tweens/tween.js";
 import GLShader from "./video/webgl/glshader.js";
-import WebGLCompositor from "./video/webgl/webgl_compositor.js";
+import Compositor from "./video/webgl/compositors/compositor.js";
+import PrimitiveCompositor from "./video/webgl/compositors/primitive_compositor.js";
+import QuadCompositor from "./video/webgl/compositors/quad_compositor.js";
 import Renderer from "./video/renderer.js";
 import WebGLRenderer from "./video/webgl/webgl_renderer.js";
 import CanvasRenderer from "./video/canvas/canvas_renderer.js";
@@ -67,7 +69,7 @@ import * as audio from "./audio/audio.js";
 import collision from "./physics/collision.js";
 import * as event from "./system/event.js";
 import * as device from "./system/device.js";
-import loader from "./loader/loader.js";
+import * as loader from "./loader/loader.js";
 import * as Math from "./math/math.js";
 import utils from "./utils/utils.js";
 import * as input from "./input/input.js";
@@ -127,7 +129,9 @@ export {
     Tween,
     QuadTree,
     GLShader,
-    WebGLCompositor,
+    Compositor,
+    PrimitiveCompositor,
+    QuadCompositor,
     Renderer,
     WebGLRenderer,
     CanvasRenderer,

package/src/input/gamepad.js

@@ -55,23 +55,17 @@ var leadingZeroRE = /^0+/;
  * @ignore
  */
 function addMapping(id, mapping) {
-    var expanded_id = id.replace(vendorProductRE, (_, a, b) => {
-        return (
-            "000".slice(a.length - 1) + a + "-" +
-            "000".slice(b.length - 1) + b + "-"
-        );
-    });
-    var sparse_id = id.replace(vendorProductRE, (_, a, b) => {
-        return (
-            a.replace(leadingZeroRE, "") + "-" +
-            b.replace(leadingZeroRE, "") + "-"
-        );
-    });
+    var expanded_id = id.replace(vendorProductRE, (_, a, b) =>
+        "000".slice(a.length - 1) + a + "-" +
+        "000".slice(b.length - 1) + b + "-"
+    );
+    var sparse_id = id.replace(vendorProductRE, (_, a, b) =>
+        a.replace(leadingZeroRE, "") + "-" +
+        b.replace(leadingZeroRE, "") + "-"
+    );
 
     // Normalize optional parameters
-    mapping.analog = mapping.analog || mapping.buttons.map(() => {
-        return -1;
-    });
+    mapping.analog = mapping.analog || mapping.buttons.map(() => -1);
     mapping.normalize_fn = mapping.normalize_fn || function (value) { return value; };
 
     remap.set(expanded_id, mapping);

package/src/input/pointerevent.js

@@ -315,21 +315,7 @@ function dispatchEvent(normalizedEvents) {
                     pointer.gameLocalY = pointer.gameY - parentBounds.y;
                 }
 
-                var gameX = pointer.gameX;
-                var gameY = pointer.gameY;
-
-                // apply inverse transformation for renderable
-                if (typeof region.currentTransform !== "undefined") {
-                    if (!region.currentTransform.isIdentity()) {
-                        var invV = region.currentTransform.applyInverse(
-                            pool.pull("Vector2d", gameX, gameY)
-                        );
-                        gameX = invV.x;
-                        gameY = invV.y;
-                        pool.push(invV);
-                    }
-                }
-                eventInBounds = bounds.contains(gameX, gameY);
+                eventInBounds = bounds.contains(pointer.gameX, pointer.gameY);
 
                 switch (pointer.type) {
                     case POINTER_MOVE[0]:

package/src/level/level.js

@@ -1,7 +1,7 @@
 import utils from "./../utils/utils.js";
 import * as event from "./../system/event.js";
 import state from "./../state/state.js";
-import loader from "./../loader/loader.js";
+import { getTMX } from "./../loader/loader.js";
 import { game } from "../index.js";
 import TMXTileMap from "./tiled/TMXTileMap.js";
 
@@ -95,7 +95,7 @@ var level = {
                 // just load the level with the XML stuff
                 if (levels[levelId] == null) {
                     //console.log("loading "+ levelId);
-                    levels[levelId] = new TMXTileMap(levelId, loader.getTMX(levelId));
+                    levels[levelId] = new TMXTileMap(levelId, getTMX(levelId));
                     // level index
                     levelIdx.push(levelId);
                 }

package/src/level/tiled/TMXLayer.js

@@ -233,7 +233,6 @@ function preRenderLayer(layer, renderer) {
 
     }
 
-
     // called when the layer is added to the game world or a container
     onActivateEvent() {
 
@@ -257,10 +256,6 @@ function preRenderLayer(layer, renderer) {
             this.preRender = false;
         }
 
-        // Resize the bounding rect
-        this.getBounds().addBounds(this.getRenderer().getBounds(), true);
-        this.getBounds().shift(this.pos);
-
         // if pre-rendering method is use, create an offline canvas/renderer
         if ((this.preRender === true) && (!this.canvasRenderer)) {
             this.canvasRenderer = new CanvasRenderer({
@@ -300,7 +295,6 @@ function preRenderLayer(layer, renderer) {
         return this.renderer;
     }
 
-
     /**
      * Return the TileId of the Tile at the specified position
      * @param {number} x - X coordinate (in world/pixels coordinates)
@@ -415,7 +409,6 @@ function preRenderLayer(layer, renderer) {
             }
             return result;
         }
-
         return false;
     }
 

package/src/level/tiled/TMXTileMap.js

@@ -195,11 +195,15 @@ function readObjectGroup(map, data, z) {
         // background color
         this.backgroundcolor = data.backgroundcolor;
 
-        // deprecation warning if map tiled version is older than 1.5
-        if (utils.checkVersion(this.version, "1.5") < 0) {
-            warning("("+this.name+") Tiled Map format version 1.4 and below", "Tiled 1.5 or higher", "10.4.4");
+        // if version is undefined or empty it usually means the map was not created with Tiled
+        if (this.version !== "undefined" && this.version !== "") {
+            // deprecation warning if map tiled version is older than 1.5
+            if (utils.checkVersion(this.version, "1.5") < 0) {
+                warning("("+this.name+") Tiled Map format version 1.4 and below", "format 1.5 or higher", "10.4.4");
+            }
         }
 
+
         // set additional map properties (if any)
         applyTMXProperties(this, data);
 

package/src/level/tiled/TMXTileset.js

@@ -2,7 +2,7 @@ import Vector2d from "./../../math/vector2.js";
 import { renderer } from "./../../video/video.js";
 import * as fileUtil from "./../../utils/file.js";
 import timer from "./../../system/timer.js";
-import loader from "./../../loader/loader.js";
+import { getTMX, getImage } from "./../../loader/loader.js";
 
 /**
  * @classdesc
@@ -30,7 +30,7 @@ import loader from "./../../loader/loader.js";
             var ext = fileUtil.getExtension(src);
             if (ext === "tsx" || ext === "json") {
                 // load the external tileset (TSX/JSON)
-                tileset = loader.getTMX(fileUtil.getBasename(src));
+                tileset = getTMX(fileUtil.getBasename(src));
                 if (!tileset) {
                     throw new Error(src + " external TSX/JSON tileset not found");
                 }
@@ -101,7 +101,7 @@ import loader from "./../../loader/loader.js";
                     }
                 }
                 if ("image" in tiles[i]) {
-                    var image = loader.getImage(tiles[i].image);
+                    var image = getImage(tiles[i].image);
                     if (!image) {
                         throw new Error("melonJS: '" + tiles[i].image + "' file for tile '" + (+i + this.firstgid) + "' not found!");
                     }
@@ -132,7 +132,7 @@ import loader from "./../../loader/loader.js";
         if (this.isCollection === false) {
 
             // get the global tileset texture
-            this.image = loader.getImage(tileset.image);
+            this.image = getImage(tileset.image);
 
             if (!this.image) {
                 throw new Error("melonJS: '" + tileset.image + "' file for tileset '" + this.name + "' not found!");

package/src/loader/cache.js

@@ -0,0 +1,16 @@
+
+/**
+ * where all preloaded content is cached
+ */
+
+// contains all the images loaded
+export let imgList = {};
+
+// contains all the TMX loaded
+export let tmxList = {};
+
+// contains all the binary files loaded
+export let binList = {};
+
+// contains all the JSON files
+export let jsonList = {};