melonjs 9.1.0 → 10.0.1

package/src/level/level.js

@@ -1,8 +1,8 @@
 import utils from "./../utils/utils.js";
-import event from "./../system/event.js";
+import * as event from "./../system/event.js";
 import state from "./../state/state.js";
 import loader from "./../loader/loader.js";
-import game from "./../game.js";
+import * as game from "./../game.js";
 import TMXTileMap from "./tiled/TMXTileMap.js";
 
 
@@ -32,7 +32,7 @@ function safeLoadLevel(levelId, options, restart) {
     loadTMXLevel(levelId, options.container, options.flatten, options.setViewportBounds);
 
     // publish the corresponding message
-    event.publish(event.LEVEL_LOADED, [ levelId ]);
+    event.emit(event.LEVEL_LOADED, levelId);
 
     // fire the callback
     options.onLoaded(levelId);

package/src/level/tiled/TMXGroup.js

@@ -77,26 +77,22 @@ export default class TMXGroup {
         applyTMXProperties(this, data);
 
         // parse all child objects/layers
-        var self = this;
-
         if (data.objects) {
-            var _objects = data.objects;
-            _objects.forEach(function (object) {
-                object.tintcolor = self.tintcolor;
-                self.objects.push(new TMXObject(map, object, z));
+            data.objects.forEach((object) => {
+                object.tintcolor = this.tintcolor;
+                this.objects.push(new TMXObject(map, object, z));
             });
         }
 
         if (data.layers) {
-            var _layers = data.layers;
-            _layers.forEach(function (data) {
+            data.layers.forEach((data) => {
                 var layer = new TMXLayer(map, data, map.tilewidth, map.tileheight, map.orientation, map.tilesets, z++);
                 // set a renderer
                 layer.setRenderer(map.getRenderer());
                 // resize container accordingly
-                self.width = Math.max(self.width, layer.width);
-                self.height = Math.max(self.height, layer.height);
-                self.objects.push(layer);
+                this.width = Math.max(this.width, layer.width);
+                this.height = Math.max(this.height, layer.height);
+                this.objects.push(layer);
             });
         }
     }

package/src/level/tiled/TMXLayer.js

@@ -1,10 +1,10 @@
-import video from "./../../video/video.js";
+import { createCanvas } from "./../../video/video.js";
 import pool from "./../../system/pooling.js";
 import * as TMXUtils from "./TMXUtils.js";
 import Tile from "./TMXTile.js";
 import Renderable from "./../../renderable/renderable.js";
 import CanvasRenderer from "./../../video/canvas/canvas_renderer";
-import game from "./../../game.js";
+import { world } from "./../../game.js";
 
 /**
  * Create required arrays for the given layer object
@@ -77,13 +77,13 @@ function preRenderLayer(layer, renderer) {
  * @param {me.TMXTilesetGroup} tilesets tileset as defined in Tiled
  * @param {Number} z z-index position
  */
-var TMXLayer = Renderable.extend({
+class TMXLayer extends Renderable {
     /**
      * @ignore
      */
-    init: function (map, data, tilewidth, tileheight, orientation, tilesets, z) {
+    constructor(map, data, tilewidth, tileheight, orientation, tilesets, z) {
         // super constructor
-        this._super(Renderable, "init", [0, 0, 0, 0]);
+        super(0, 0, 0, 0);
 
         // tile width & height
         this.tilewidth = data.tilewidth || tilewidth;
@@ -176,7 +176,7 @@ var TMXLayer = Renderable.extend({
 
         // check for the correct rendering method
         if (typeof (this.preRender) === "undefined") {
-            this.preRender = game.world.preRender;
+            this.preRender = world.preRender;
         }
 
         // set a renderer
@@ -191,11 +191,11 @@ var TMXLayer = Renderable.extend({
                 data.compression
             )
         );
-    },
+    }
 
 
     // called when the layer is added to the game world or a container
-    onActivateEvent : function () {
+    onActivateEvent() {
 
         if (this.animatedTilesets === undefined) {
             this.animatedTilesets = [];
@@ -224,21 +224,21 @@ var TMXLayer = Renderable.extend({
         // if pre-rendering method is use, create an offline canvas/renderer
         if ((this.preRender === true) && (!this.canvasRenderer)) {
             this.canvasRenderer = new CanvasRenderer({
-                canvas : video.createCanvas(this.width, this.height),
+                canvas : createCanvas(this.width, this.height),
                 widht : this.width,
                 heigth : this.height,
                 transparent : true
             });
             preRenderLayer(this, this.canvasRenderer);
         }
-    },
+    }
 
     // called when the layer is removed from the game world or a container
-    onDeactivateEvent : function () {
+    onDeactivateEvent() {
         // clear all allocated objects
         //this.layerData = undefined;
         this.animatedTilesets = undefined;
-    },
+    }
 
     /**
      * Set the TMX renderer for this layer object
@@ -252,9 +252,9 @@ var TMXLayer = Renderable.extend({
      * var layer = new me.TMXLayer(...);
      * layer.setRenderer(map.getRenderer());
      */
-    setRenderer : function (renderer) {
+    setRenderer(renderer) {
         this.renderer = renderer;
-    },
+    }
 
     /**
      * Return the layer current renderer object
@@ -264,9 +264,9 @@ var TMXLayer = Renderable.extend({
      * @function
      * @return {me.TMXRenderer} renderer
      */
-    getRenderer : function () {
+    getRenderer() {
         return this.renderer;
-    },
+    }
 
 
     /**
@@ -279,10 +279,10 @@ var TMXLayer = Renderable.extend({
      * @param {Number} y Y coordinate (in world/pixels coordinates)
      * @return {Number} TileId or null if there is no Tile at the given position
      */
-    getTileId : function (x, y) {
+    getTileId(x, y) {
         var tile = this.getTile(x, y);
         return (tile ? tile.tileId : null);
-    },
+    }
 
     /**
      * Return the Tile object at the specified position
@@ -299,7 +299,7 @@ var TMXLayer = Renderable.extend({
      * // get the tile object corresponding to the latest pointer position
      * var tile = layer.getTile(me.input.pointer.pos.x, me.input.pointer.pos.y);
      */
-    getTile : function (x, y) {
+    getTile(x, y) {
         var tile = null;
 
         if (this.contains(x, y)) {
@@ -308,7 +308,7 @@ var TMXLayer = Renderable.extend({
             pool.push(coord);
         }
         return tile;
-    },
+    }
 
     /**
      * assign the given Tile object to the specified position
@@ -321,10 +321,10 @@ var TMXLayer = Renderable.extend({
      * @param {Number} y Y coordinate (in world/pixels coordinates)
      * @return {me.Tile} the tile object
      */
-    setTile : function (tile, x, y) {
+    setTile(tile, x, y) {
         this.layerData[x][y] = tile;
         return tile;
-    },
+    }
 
     /**
      * return a new the Tile object corresponding to the given tile id
@@ -337,13 +337,13 @@ var TMXLayer = Renderable.extend({
      * @param {Number} y Y coordinate (in world/pixels coordinates)
      * @return {me.Tile} the tile object
      */
-    getTileById : function (tileId, x, y) {
+    getTileById(tileId, x, y) {
         if (!this.tileset.contains(tileId)) {
             // look for the corresponding tileset
             this.tileset = this.tilesets.getTilesetByGid(tileId);
         }
         return new Tile(x, y, tileId, this.tileset);
-    },
+    }
 
     /**
      * Return the Tile object at the specified tile coordinates
@@ -359,7 +359,7 @@ var TMXLayer = Renderable.extend({
      * // return the first tile at offset 0, 0
      * var tile = layer.cellAt(0, 0);
      */
-    cellAt : function (x, y, boundsCheck) {
+    cellAt(x, y, boundsCheck) {
         var _x = ~~x;
         var _y = ~~y;
 
@@ -370,7 +370,7 @@ var TMXLayer = Renderable.extend({
         } else {
             return null;
         }
-    },
+    }
 
     /**
      * clear the tile at the specified position
@@ -386,20 +386,20 @@ var TMXLayer = Renderable.extend({
      *     layer.clearTile(x, y);
      * });
      */
-    clearTile : function (x, y) {
+    clearTile(x, y) {
         // clearing tile
         this.layerData[x][y] = null;
         // erase the corresponding area in the canvas
         if (this.preRender) {
             this.canvasRenderer.clearRect(x * this.tilewidth, y * this.tileheight, this.tilewidth, this.tileheight);
         }
-    },
+    }
 
     /**
      * update animations in a tileset layer
      * @ignore
      */
-    update : function (dt) {
+    update(dt) {
         if (this.isAnimated) {
             var result = false;
             for (var i = 0; i < this.animatedTilesets.length; i++) {
@@ -409,13 +409,13 @@ var TMXLayer = Renderable.extend({
         }
 
         return false;
-    },
+    }
 
     /**
      * draw a tileset layer
      * @ignore
      */
-    draw : function (renderer, rect) {
+    draw(renderer, rect) {
         // use the offscreen canvas
         if (this.preRender) {
             var width = Math.min(rect.width, this.width);
@@ -436,5 +436,6 @@ var TMXLayer = Renderable.extend({
             this.getRenderer().drawTileLayer(renderer, this, rect);
         }
     }
-});
+};
+
 export default TMXLayer;

package/src/level/tiled/TMXTileMap.js

@@ -1,6 +1,6 @@
 import pool from "./../../system/pooling.js";
-import event from "./../../system/event.js";
-import game from "./../../game.js";
+import * as event from "./../../system/event.js";
+import { viewport } from "./../../game.js";
 import collision from "./../../physics/collision.js";
 import Body from "./../../physics/body.js";
 import TMXOrthogonalRenderer from "./renderer/TMXOrthogonalRenderer.js";
@@ -19,9 +19,6 @@ import Rect from "./../../shapes/rectangle.js";
 // constant to identify the collision object layer
 var COLLISION_GROUP = "collision";
 
-// onresize handler
-var onresize_handler = null;
-
 /**
  * set a compatible renderer object
  * for the specified map
@@ -297,7 +294,6 @@ export default class TMXTileMap {
 
         // to automatically increment z index
         var zOrder = 0;
-        var self = this;
 
         // Tileset information
         if (!this.tilesets) {
@@ -308,9 +304,9 @@ export default class TMXTileMap {
         // parse all tileset objects
         if (typeof (data.tilesets) !== "undefined") {
             var tilesets = data.tilesets;
-            tilesets.forEach(function (tileset) {
+            tilesets.forEach((tileset) => {
                 // add the new tileset
-                self.tilesets.add(readTileset(tileset));
+                this.tilesets.add(readTileset(tileset));
             });
         }
 
@@ -338,24 +334,24 @@ export default class TMXTileMap {
             ));
         }
 
-        data.layers.forEach(function (layer) {
+        data.layers.forEach((layer) => {
             switch (layer.type) {
                 case "imagelayer":
-                    self.layers.push(readImageLayer(self, layer, zOrder++));
+                    this.layers.push(readImageLayer(this, layer, zOrder++));
                     break;
 
                 case "tilelayer":
-                    self.layers.push(readLayer(self, layer, zOrder++));
+                    this.layers.push(readLayer(this, layer, zOrder++));
                     break;
 
                 // get the object groups information
                 case "objectgroup":
-                    self.objectGroups.push(readObjectGroup(self, layer, zOrder++));
+                    this.objectGroups.push(readObjectGroup(this, layer, zOrder++));
                     break;
 
                 // get the object groups information
                 case "group":
-                    self.objectGroups.push(readObjectGroup(self, layer, zOrder++));
+                    this.objectGroups.push(readObjectGroup(this, layer, zOrder++));
                     break;
 
                 default:
@@ -412,7 +408,7 @@ export default class TMXTileMap {
         // callback funtion for the viewport resize event
         function _setBounds(width, height) {
             // adjust the viewport bounds if level is smaller
-            game.viewport.setBounds(
+            viewport.setBounds(
                 0, 0,
                 Math.max(levelBounds.width, width),
                 Math.max(levelBounds.height, height)
@@ -427,13 +423,11 @@ export default class TMXTileMap {
         }
 
         if (setViewportBounds === true) {
+            event.off(event.VIEWPORT_ONRESIZE, _setBounds);
             // force viewport bounds update
-            _setBounds(game.viewport.width, game.viewport.height);
+            _setBounds(viewport.width, viewport.height);
             // Replace the resize handler
-            if (onresize_handler) {
-                event.unsubscribe(onresize_handler);
-            }
-            onresize_handler = event.subscribe(event.VIEWPORT_ONRESIZE, _setBounds);
+            event.on(event.VIEWPORT_ONRESIZE, _setBounds, this);
         }
 
         //  set back auto-sort and auto-depth
@@ -523,6 +517,7 @@ export default class TMXTileMap {
                     // check if a me.Tile object is embedded
                     obj = settings.tile.getRenderable(settings);
                     obj.body = new Body(obj, settings.shapes || new Rect(0, 0, this.width, this.height));
+                    obj.body.setStatic(true);
                     // set the obj z order
                     obj.pos.setMuted(settings.x, settings.y, settings.z);
                 } else {
@@ -545,6 +540,7 @@ export default class TMXTileMap {
                         obj.type = settings.type;
                         obj.id = settings.id;
                         obj.body = new Body(obj, settings.shapes || new Rect(0, 0, obj.width, obj.height));
+                        obj.body.setStatic(true);
                         obj.resize(obj.body.getBounds().width, obj.body.getBounds().height);
                     }
                     // set the obj z order

package/src/level/tiled/TMXTileset.js

@@ -1,6 +1,6 @@
 import Vector2d from "./../../math/vector2.js";
-import video from "./../../video/video.js";
-import utils from "./../../utils/utils.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";
 
@@ -29,10 +29,10 @@ export default class TMXTileset {
         // check if an external tileset is defined
         if (typeof(tileset.source) !== "undefined") {
             var src = tileset.source;
-            var ext = utils.file.getExtension(src);
+            var ext = fileUtil.getExtension(src);
             if (ext === "tsx" || ext === "json") {
                 // load the external tileset (TSX/JSON)
-                tileset = loader.getTMX(utils.file.getBasename(src));
+                tileset = loader.getTMX(fileUtil.getBasename(src));
                 if (!tileset) {
                     throw new Error(src + " external TSX/JSON tileset not found");
                 }
@@ -143,7 +143,7 @@ export default class TMXTileset {
             }
 
             // create a texture atlas for the given tileset
-            this.texture = video.renderer.cache.get(this.image, {
+            this.texture = renderer.cache.get(this.image, {
                 framewidth : this.tilewidth,
                 frameheight : this.tileheight,
                 margin : this.margin,

package/src/level/tiled/TMXUtils.js

@@ -1,4 +1,4 @@
-import utils from "./../../utils/utils.js";
+import * as stringUtil from "./../../utils/string.js";
 
 /**
  * set and interpret a TMX property value
@@ -25,11 +25,11 @@ function setTMXValue(name, type, value) {
 
         default :
             // try to parse it anyway
-            if (!value || utils.string.isBoolean(value)) {
+            if (!value || stringUtil.isBoolean(value)) {
                 // if value not defined or boolean
                 value = value ? (value === "true") : true;
             }
-            else if (utils.string.isNumeric(value)) {
+            else if (stringUtil.isNumeric(value)) {
                 // check if numeric
                 value = Number(value);
             }

package/src/level/tiled/renderer/TMXRenderer.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-unused-vars */
+
 import pool from "./../../../system/pooling.js";
 import TMXLayer from "./../TMXLayer.js";
 import Bounds from "./../../../physics/Bounds.js";
@@ -118,3 +120,5 @@ class TMXRenderer {
 };
 
 export default TMXRenderer;
+
+/* eslint-enable no-unused-vars */

package/src/loader/loader.js

@@ -1,7 +1,7 @@
-import utils from "./../utils/utils.js";
-import event from "./../system/event.js";
+import * as fileUtil from "./../utils/file.js";
+import * as event from "./../system/event.js";
 import device from "./../system/device.js";
-import audio from "./../audio/audio.js";
+import * as audio from "./../audio/audio.js";
 import state from "./../state/state.js";
 import level from "./../level/level.js";
 import * as TMXUtils from "./../level/tiled/TMXUtils.js";
@@ -38,7 +38,7 @@ function checkLoadStatus(onload) {
             var callback = onload || loader.onload;
             setTimeout(function () {
                 callback();
-                event.publish(event.LOADER_COMPLETE);
+                event.emit(event.LOADER_COMPLETE);
             }, 300);
         }
         else {
@@ -91,7 +91,7 @@ function preloadFontFace(data, onload, onerror) {
         document.body.style.fontFamily = data.name;
         // onloaded callback
         onload();
-    }, function (e) {
+    }, function () {
         // rejected
         onerror(data.name);
     });
@@ -122,7 +122,7 @@ function preloadTMX(tmxData, onload, onerror) {
 
     var xmlhttp = new XMLHttpRequest();
     // check the data format ('tmx', 'json')
-    var format = utils.file.getExtension(tmxData.src);
+    var format = fileUtil.getExtension(tmxData.src);
 
     if (xmlhttp.overrideMimeType) {
         if (format === "json") {
@@ -385,7 +385,7 @@ var loader = {
             // pass the load progress in percent, as parameter
             this.onProgress(progress, res);
         }
-        event.publish(event.LOADER_PROGRESS, [progress, res]);
+        event.emit(event.LOADER_PROGRESS, progress, res);
     },
 
     /**
@@ -732,7 +732,7 @@ var loader = {
      */
     getImage(image) {
         // force as string and extract the base name
-        image = utils.file.getBasename("" + image);
+        image = fileUtil.getBasename("" + image);
         if (image in imgList) {
             // return the corresponding Image object
             return imgList[image];
@@ -756,21 +756,6 @@ var loader = {
             return jsonList[elt];
         }
         return null;
-    },
-
-    /**
-     * Return the loading progress in percent
-     * @name getLoadProgress
-     * @memberOf me.loader
-     * @public
-     * @function
-     * @deprecated use callback instead
-     * @see me.loader.onProgress
-     * @see me.event.LOADER_PROGRESS
-     * @return {Number}
-     */
-    getLoadProgress() {
-        return loadCount / resourceCount;
     }
 
 };