melonjs 9.1.0 → 10.0.1

package/src/index.js

@@ -2,23 +2,18 @@
 import "./polyfill/console.js";
 import "./polyfill/requestAnimationFrame.js";
 
-// external dependencies
-import "jay-extend";
-// jay-extend does not properly export Jay
-var Jay = window.Jay;
-
 // utility classes
-import audio from "./audio/audio.js";
+import * as audio from "./audio/audio.js";
 import collision from "./physics/collision.js";
 import device from "./system/device.js";
-import event from "./system/event.js";
-import game from "./game.js";
+import * as event from "./system/event.js";
+import * as game from "./game.js";
 import 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";
 import { plugin, plugins } from "./plugin/plugin.js";
-import video from "./video/video.js";
+import * as video from "./video/video.js";
 import save from "./system/save.js";
 import timer from "./system/timer.js";
 import pool from "./system/pooling.js";
@@ -71,7 +66,7 @@ import Stage from "./state/stage.js";
 import Camera2d from "./camera/camera2d.js";
 import Container from "./renderable/container.js";
 import World from "./physics/world.js";
-import ParticleEmitter from "./particles/emitter.js";
+import { ParticleEmitterSettings, ParticleEmitter } from "./particles/emitter.js";
 import Particle from "./particles/particle.js";
 import Entity from "./entity/entity.js";
 import DraggableEntity from "./entity/draggable.js";
@@ -123,8 +118,6 @@ export {
 
 // export all class definition
 export {
-    // export as me.Object for backward compatibility
-    Jay as Object,
     Color,
     Vector2d,
     Vector3d,
@@ -171,6 +164,7 @@ export {
     Container,
     World,
     ParticleEmitter,
+    ParticleEmitterSettings,
     Particle,
     Entity,
     DraggableEntity,
@@ -218,9 +212,6 @@ export function boot() {
         return;
     }
 
-    // check the device capabilites
-    device._check();
-
     // register all built-ins objects into the object pool
     pool.register("me.Entity", Entity);
     pool.register("me.Collectable", Collectable);
@@ -231,9 +222,9 @@ export function boot() {
     pool.register("me.Sprite", Sprite);
     pool.register("me.Renderable", Renderable);
     pool.register("me.Text", Text, true);
-    pool.register("me.BitmapText", BitmapText, true);
+    pool.register("me.BitmapText", BitmapText);
     pool.register("me.BitmapTextData", BitmapTextData, true);
-    pool.register("me.ImageLayer", ImageLayer, true);
+    pool.register("me.ImageLayer", ImageLayer);
     pool.register("me.ColorLayer", ColorLayer, true);
     pool.register("me.Vector2d", Vector2d, true);
     pool.register("me.Vector3d", Vector3d, true);
@@ -257,9 +248,9 @@ export function boot() {
     pool.register("Sprite", Sprite);
     pool.register("Renderable", Renderable);
     pool.register("Text", Text, true);
-    pool.register("BitmapText", BitmapText, true);
+    pool.register("BitmapText", BitmapText);
     pool.register("BitmapTextData", BitmapTextData, true);
-    pool.register("ImageLayer", ImageLayer, true);
+    pool.register("ImageLayer", ImageLayer);
     pool.register("ColorLayer", ColorLayer, true);
     pool.register("Vector2d", Vector2d, true);
     pool.register("Vector3d", Vector3d, true);
@@ -273,24 +264,15 @@ export function boot() {
     pool.register("Ellipse", Ellipse, true);
     pool.register("Bounds", Bounds, true);
 
-    // initialize me.save
-    save.init();
-
-    // init the FPS counter if needed
-    timer.init();
+    // publish Boot notification
+    event.emit(event.BOOT);
 
     // enable/disable the cache
     loader.setNocache( utils.getUriFragment().nocache || false );
 
-    // init the stage Manager
-    state.init();
-
     // automatically enable keyboard events
     input.initKeyboardEvent();
 
-    // game instance init
-    game.init();
-
     // mark melonJS as initialized
     initialized = true;
 

package/src/input/gamepad.js

@@ -1,20 +1,9 @@
 import {getBindingKey, triggerKeyEvent} from "./keyboard.js";
-import event from "./../system/event.js";
+import * as event from "./../system/event.js";
 
 // Analog deadzone
 var deadzone = 0.1;
 
-/**
- * A function that returns a normalized value in range [-1.0..1.0], or 0.0 if the axis is unknown.
- * @callback me.input~normalize_fn
- * @param {Number} value The raw value read from the gamepad driver
- * @param {Number} axis The axis index from the standard mapping, or -1 if not an axis
- * @param {Number} button The button index from the standard mapping, or -1 if not a button
- */
-function defaultNormalizeFn(value) {
-    return value;
-}
-
 /**
  * Normalize axis values for wired Xbox 360
  * @ignore
@@ -82,7 +71,7 @@ function addMapping(id, mapping) {
     mapping.analog = mapping.analog || mapping.buttons.map(function () {
         return -1;
     });
-    mapping.normalize_fn = mapping.normalize_fn || defaultNormalizeFn;
+    mapping.normalize_fn = mapping.normalize_fn || function (value) { return value; };
 
     remap.set(expanded_id, mapping);
     remap.set(sparse_id, mapping);
@@ -202,7 +191,7 @@ var updateGamepads = function () {
                 }
             }
 
-            event.publish(event.GAMEPAD_UPDATE, [ index, "buttons", +button, current ]);
+            event.emit(event.GAMEPAD_UPDATE, index, "buttons", +button, current);
 
             // Edge detection
             if (!last.pressed && current.pressed) {
@@ -246,7 +235,7 @@ var updateGamepads = function () {
             }
             var pressed = (Math.abs(value) >= (deadzone + Math.abs(last[range].threshold)));
 
-            event.publish(event.GAMEPAD_UPDATE, [ index, "axes", +axis, value ]);
+            event.emit(event.GAMEPAD_UPDATE, index, "axes", +axis, value);
 
             // Edge detection
             if (!last[range].pressed && pressed) {
@@ -276,7 +265,7 @@ var updateGamepads = function () {
  * @ignore
  */
 window.addEventListener("gamepadconnected", function (e) {
-    event.publish(event.GAMEPAD_CONNECTED, [ e.gamepad ]);
+    event.emit(event.GAMEPAD_CONNECTED, e.gamepad);
 }, false);
 
 /**
@@ -284,7 +273,7 @@ window.addEventListener("gamepadconnected", function (e) {
  * @ignore
  */
 window.addEventListener("gamepaddisconnected", function (e) {
-    event.publish(event.GAMEPAD_DISCONNECTED, [ e.gamepad ]);
+    event.emit(event.GAMEPAD_DISCONNECTED, e.gamepad);
 }, false);
 
 /*
@@ -395,7 +384,7 @@ export function bindGamepad(index, button, keyCode) {
     // register to the the update event if not yet done and supported by the browser
     // if not supported, the function will fail silently (-> update loop won't be called)
     if (typeof updateEventHandler === "undefined" && typeof navigator.getGamepads === "function") {
-        updateEventHandler = event.subscribe(event.GAME_UPDATE, updateGamepads);
+        updateEventHandler = event.on(event.GAME_BEFORE_UPDATE, updateGamepads);
     }
 
     // Allocate bindings if not defined
@@ -484,7 +473,7 @@ export function setGamepadDeadzone(value) {
  * @param {Number[]} mapping.axes Standard analog control stick axis locations
  * @param {Number[]} mapping.buttons Standard digital button locations
  * @param {Number[]} [mapping.analog] Analog axis locations for buttons
- * @param {me.input~normalize_fn} [mapping.normalize_fn] Axis normalization function
+ * @param {Function} [mapping.normalize_fn] a function that returns a normalized value in range [-1.0..1.0] for the given value, axis and button
  * @example
  * // A weird controller that has its axis mappings reversed
  * me.input.setGamepadMapping("Generic USB Controller", {

package/src/input/keyboard.js

@@ -1,5 +1,5 @@
 import {preventDefault as preventDefaultAction} from "./input.js";
-import event from "./../system/event.js";
+import * as event from "./../system/event.js";
 import device from "./../system/device.js";
 
 // corresponding actions
@@ -29,11 +29,11 @@ var keyDownEvent = function (e, keyCode, mouseButton) {
     var action = _keyBindings[keyCode];
 
     // publish a message for keydown event
-    event.publish(event.KEYDOWN, [
+    event.emit(event.KEYDOWN,
         action,
         keyCode,
         action ? !_keyLocked[action] : true
-    ]);
+    );
 
     if (action) {
         if (!_keyLocked[action]) {
@@ -66,7 +66,7 @@ var keyUpEvent = function (e, keyCode, mouseButton) {
     var action = _keyBindings[keyCode];
 
     // publish a message for keydown event
-    event.publish(event.KEYUP, [ action, keyCode ]);
+    event.emit(event.KEYUP, action, keyCode);
 
     if (action) {
         var trigger = (typeof mouseButton !== "undefined") ? mouseButton : keyCode;

package/src/input/pointer.js

@@ -1,7 +1,7 @@
 import Vector2d from "./../math/vector2.js";
 import device from "./../system/device.js";
 import Rect from "./../shapes/rectangle.js";
-import game from "./../game.js";
+import { viewport } from "./../game.js";
 import { globalToLocal } from "./input.js";
 
 
@@ -12,18 +12,22 @@ import { globalToLocal } from "./input.js";
 var viewportOffset = new Vector2d();
 
 /**
+ * @classdesc
  * a pointer object, representing a single finger on a touch enabled device.
  * @class
  * @extends me.Rect
  * @memberOf me
  * @constructor
  */
-var Pointer = Rect.extend({
+class Pointer extends Rect {
 
     /**
      * @ignore
      */
-    init : function (x = 0, y = 0, w = 1, h = 1) {
+    constructor(x = 0, y = 0, w = 1, h = 1) {
+
+        // parent constructor
+        super(x, y, w, h);
 
         /**
          * constant for left button
@@ -261,10 +265,7 @@ var Pointer = Rect.extend({
 
         // bind list for mouse buttons
         this.bind = [ 0, 0, 0 ];
-
-        // parent constructor
-        this._super(Rect, "init", [x, y, w, h]);
-    },
+    }
 
     /**
      * initialize the Pointer object using the given Event Object
@@ -278,7 +279,7 @@ var Pointer = Rect.extend({
      * @param {Number} [clientX=0] the vertical coordinate within the application's client area at which the event occurred
      * @param {Number} [pointedId=1] the Pointer, Touch or Mouse event Id (1)
      */
-    setEvent : function (event, pageX = 0, pageY = 0, clientX = 0, clientY = 0, pointerId = 1) {
+    setEvent(event, pageX = 0, pageY = 0, clientX = 0, clientY = 0, pointerId = 1) {
         var width = 1;
         var height = 1;
 
@@ -320,9 +321,9 @@ var Pointer = Rect.extend({
         this.gameScreenX = this.pos.x;
         this.gameScreenY = this.pos.y;
 
-        // get the current screen to world offset
-        if (typeof game.viewport !== "undefined") {
-            game.viewport.localToWorld(this.gameScreenX, this.gameScreenY, viewportOffset);
+        // get the current screen to game world offset
+        if (typeof viewport !== "undefined") {
+            viewport.localToWorld(this.gameScreenX, this.gameScreenY, viewportOffset);
         }
 
         /* Initialize the two coordinate space properties. */
@@ -342,5 +343,6 @@ var Pointer = Rect.extend({
         // resize the pointer object accordingly
         this.resize(width, height);
     }
-});
+};
+
 export default Pointer;

package/src/input/pointerevent.js

@@ -1,9 +1,10 @@
 import {preventDefault} from "./input.js";
 import {getBindingKey, triggerKeyEvent} from "./keyboard.js";
 import Vector2d from "./../math/vector2.js";
-import video from "./../video/video.js";
-import utils from "./../utils/utils.js";
-import event from "./../system/event.js";
+import { renderer, scaleRatio } from "./../video/video.js";
+import * as fctUtil from "./../utils/function.js";
+import * as arrayUtil from "./../utils/array.js";
+import * as event from "./../system/event.js";
 import timer from "./../system/timer.js";
 import pool from "./../system/pooling.js";
 import device from "./../system/device.js";
@@ -11,7 +12,7 @@ import Pointer from "./pointer.js";
 import Rect from "./../shapes/rectangle.js";
 import Container from "./../renderable/container.js";
 import Renderable from "./../renderable/renderable.js";
-import game from "./../game.js";
+import { world, viewport } from "./../game.js";
 
 
 /**
@@ -129,7 +130,7 @@ function enablePointerEvent() {
 
         if (pointerEventTarget === null) {
             // default pointer event target
-            pointerEventTarget = video.renderer.getScreenCanvas();
+            pointerEventTarget = renderer.getScreenCanvas();
         }
 
         if (device.PointerEvent) {
@@ -182,7 +183,7 @@ function enablePointerEvent() {
                 if (activeEventList.indexOf(events[i]) !== -1) {
                     pointerEventTarget.addEventListener(
                         events[i],
-                        utils.function.throttle(
+                        fctUtil.throttle(
                             onMoveEvent,
                             throttlingInterval,
                             false
@@ -276,13 +277,14 @@ function dispatchEvent(normalizedEvents) {
         if (POINTER_MOVE.includes(pointer.type)) {
             pointer.gameX = pointer.gameLocalX = pointer.gameScreenX;
             pointer.gameY = pointer.gameLocalY = pointer.gameScreenY;
-            event.publish(event.POINTERMOVE, [pointer]);
+            event.emit(event.POINTERMOVE, pointer);
         }
 
-        var candidates = game.world.broadphase.retrieve(currentPointer, Container.prototype._sortReverseZ);
+        // fetch valid candiates from the game world container
+        var candidates = world.broadphase.retrieve(currentPointer, Container.prototype._sortReverseZ);
 
-        // add the main viewport to the list of candidates
-        candidates = candidates.concat([ game.viewport ]);
+        // add the main game viewport to the list of candidates
+        candidates = candidates.concat([ viewport ]);
 
         for (var c = candidates.length, candidate; c--, (candidate = candidates[c]);) {
             if (eventHandlers.has(candidate) && (candidate.isKinematic !== true)) {
@@ -544,11 +546,11 @@ export var throttlingInterval;
  */
 export function globalToLocal(x, y, v) {
     v = v || new Vector2d();
-    var rect = device.getElementBounds(video.renderer.getScreenCanvas());
+    var rect = device.getElementBounds(renderer.getScreenCanvas());
     var pixelRatio = device.devicePixelRatio;
     x -= rect.left + (window.pageXOffset || 0);
     y -= rect.top + (window.pageYOffset || 0);
-    var scale = video.scaleRatio;
+    var scale = scaleRatio;
     if (scale.x !== 1.0 || scale.y !== 1.0) {
         x /= scale.x;
         y /= scale.y;
@@ -726,7 +728,7 @@ export function releasePointerEvent(eventType, region, callback) {
             eventType = eventTypes[i];
             if (handlers.callbacks[eventType]) {
                 if (typeof (callback) !== "undefined") {
-                    utils.array.remove(handlers.callbacks[eventType], callback);
+                    arrayUtil.remove(handlers.callbacks[eventType], callback);
                 } else {
                     while (handlers.callbacks[eventType].length > 0) {
                         handlers.callbacks[eventType].pop();