melonjs 9.1.0 → 10.0.1

package/src/state/stage.js

@@ -1,8 +1,6 @@
-import video from "./../video/video.js";
-import game from "./../game.js";
+import { renderer } from "./../video/video.js";
+import * as  game from "./../game.js";
 import Camera2d from "./../camera/camera2d.js";
-import "jay-extend";
-
 
 // a default camera instance to use across all stages
 var default_camera;
@@ -27,11 +25,12 @@ var default_settings = {
  * @param {Function} [options.onDestroyEvent] called by the state manager before switching to another state
  * @see me.state
  */
-var Stage = window.Jay.extend({
+class Stage {
+
     /**
      * @ignore
      */
-    init: function (settings) {
+    constructor(settings) {
         /**
          * The list of active cameras in this stage.
          * Cameras will be renderered based on this order defined in this list.
@@ -51,25 +50,24 @@ var Stage = window.Jay.extend({
          * @enum {Object}
          */
         this.settings = Object.assign(default_settings, settings || {});
-    },
+    }
 
     /**
      * Object reset function
      * @ignore
      */
-    reset : function () {
-        var self = this;
-
+    reset() {
+        
         // add all defined cameras
-        this.settings.cameras.forEach(function(camera) {
-            self.cameras.set(camera.name, camera);
+        this.settings.cameras.forEach((camera) => {
+            this.cameras.set(camera.name, camera);
         });
 
         // empty or no default camera
         if (this.cameras.has("default") === false) {
             if (typeof default_camera === "undefined") {
-                var width = video.renderer.getWidth();
-                var height = video.renderer.getHeight();
+                var width = renderer.getWidth();
+                var height = renderer.getHeight();
                 // new default camera instance
                 default_camera = new Camera2d(0, 0, width, height);
             }
@@ -81,7 +79,7 @@ var Stage = window.Jay.extend({
 
         // call the onReset Function
         this.onResetEvent.apply(this, arguments);
-    },
+    }
 
     /**
      * update function
@@ -92,7 +90,7 @@ var Stage = window.Jay.extend({
      * @param {Number} dt time since the last update in milliseconds.
      * @return false
      **/
-    update : function (dt) {
+    update(dt) {
         // update all objects (and pass the elapsed time since last frame)
         var isDirty = game.world.update(dt);
 
@@ -105,7 +103,7 @@ var Stage = window.Jay.extend({
         });
 
         return isDirty;
-    },
+    }
 
     /**
      * draw the current stage
@@ -115,24 +113,24 @@ var Stage = window.Jay.extend({
      * @function
      * @param {me.CanvasRenderer|me.WebGLRenderer} renderer a renderer object
      */
-    draw : function (renderer) {
+    draw(renderer) {
         // iterate through all cameras
         this.cameras.forEach(function(camera) {
             // render the root container
             camera.draw(renderer, game.world);
         });
-    },
+    }
 
     /**
      * destroy function
      * @ignore
      */
-    destroy : function () {
+    destroy() {
         // clear all cameras
         this.cameras.clear();
         // notify the object
         this.onDestroyEvent.apply(this, arguments);
-    },
+    }
 
     /**
      * onResetEvent function<br>
@@ -144,13 +142,13 @@ var Stage = window.Jay.extend({
      * @param {} [arguments...] optional arguments passed when switching state
      * @see me.state#change
      */
-    onResetEvent : function () {
+    onResetEvent() {
         // execute onResetEvent function if given through the constructor
         if (typeof this.settings.onResetEvent === "function") {
             this.settings.onResetEvent.apply(this, arguments);
         }
 
-    },
+    }
 
     /**
      * onDestroyEvent function<br>
@@ -159,12 +157,12 @@ var Stage = window.Jay.extend({
      * @memberOf me.Stage
      * @function
      */
-    onDestroyEvent : function () {
+    onDestroyEvent() {
         // execute onDestroyEvent function if given through the constructor
         if (typeof this.settings.onDestroyEvent === "function") {
             this.settings.onDestroyEvent.apply(this, arguments);
         }
     }
-});
+};
 
 export default Stage;

package/src/state/state.js

@@ -1,8 +1,8 @@
-import audio from "./../audio/audio.js";
-import utils from "./../utils/utils.js";
-import event from "./../system/event.js";
+import { pauseTrack, resumeTrack } from "./../audio/audio.js";
+import * as fctUtil from "./../utils/function.js";
+import * as event from "./../system/event.js";
 import timer from "./../system/timer.js";
-import game from "./../game.js";
+import * as game from "./../game.js";
 import Stage from "./../state/stage.js";
 import defaultLoadingScreen from "./../loader/loadingscreen.js";
 
@@ -134,6 +134,18 @@ function _switchState(state) {
     }
 }
 
+// initialize me.state on system boot
+event.on(event.BOOT, () => {
+    // set the built-in loading stage
+    state.set(state.LOADING, defaultLoadingScreen);
+    // set and enable the default stage
+    state.set(state.DEFAULT, new Stage());
+    // enable by default as soon as the display is initialized
+    event.on(event.VIDEO_INIT, () => {
+        state.change(state.DEFAULT, true);
+    });
+});
+
 
 /**
  * a State Manager (state machine)
@@ -237,53 +249,6 @@ var state = {
      */
     USER : 100,
 
-    /**
-     * onPause callback
-     * @function
-     * @name onPause
-     * @memberOf me.state
-     */
-    onPause : null,
-
-    /**
-     * onResume callback
-     * @function
-     * @name onResume
-     * @memberOf me.state
-     */
-    onResume : null,
-
-    /**
-     * onStop callback
-     * @function
-     * @name onStop
-     * @memberOf me.state
-     */
-    onStop : null,
-
-    /**
-     * onRestart callback
-     * @function
-     * @name onRestart
-     * @memberOf me.state
-     */
-    onRestart : null,
-
-    /**
-     * @ignore
-     */
-    init() {
-        // set the built-in loading stage
-        this.set(this.LOADING, defaultLoadingScreen);
-        // set and enable the default stage
-        this.set(this.DEFAULT, new Stage());
-        // enable by default as soon as the display is initialized
-        var _state = this;
-        event.subscribe(event.VIDEO_INIT, function () {
-            _state.change(_state.DEFAULT, true);
-        });
-    },
-
     /**
      * Stop the current screen object.
      * @name stop
@@ -299,18 +264,14 @@ var state = {
             _stopRunLoop();
             // current music stop
             if (music === true) {
-                audio.pauseTrack();
+                pauseTrack();
             }
 
             // store time when stopped
             _pauseTime = window.performance.now();
 
             // publish the stop notification
-            event.publish(event.STATE_STOP);
-            // any callback defined ?
-            if (typeof(this.onStop) === "function") {
-                this.onStop();
-            }
+            event.emit(event.STATE_STOP);
         }
     },
 
@@ -329,18 +290,14 @@ var state = {
             _pauseRunLoop();
             // current music stop
             if (music === true) {
-                audio.pauseTrack();
+                pauseTrack();
             }
 
             // store time when paused
             _pauseTime = window.performance.now();
 
             // publish the pause event
-            event.publish(event.STATE_PAUSE);
-            // any callback defined ?
-            if (typeof(this.onPause) === "function") {
-                this.onPause();
-            }
+            event.emit(event.STATE_PAUSE);
         }
     },
 
@@ -358,7 +315,7 @@ var state = {
             _startRunLoop();
             // current music stop
             if (music === true) {
-                audio.resumeTrack();
+                resumeTrack();
             }
 
             // calculate the elpased time
@@ -368,11 +325,7 @@ var state = {
             game.repaint();
 
             // publish the restart notification
-            event.publish(event.STATE_RESTART, [ _pauseTime ]);
-            // any callback defined ?
-            if (typeof(this.onRestart) === "function") {
-                this.onRestart();
-            }
+            event.emit(event.STATE_RESTART, _pauseTime);
         }
     },
 
@@ -390,18 +343,14 @@ var state = {
             _resumeRunLoop();
             // current music stop
             if (music === true) {
-                audio.resumeTrack();
+                resumeTrack();
             }
 
             // calculate the elpased time
             _pauseTime = window.performance.now() - _pauseTime;
 
             // publish the resume event
-            event.publish(event.STATE_RESUME, [ _pauseTime ]);
-            // any callback defined ?
-            if (typeof(this.onResume) === "function") {
-                this.onResume();
-            }
+            event.emit(event.STATE_RESUME, _pauseTime);
         }
     },
 
@@ -439,16 +388,16 @@ var state = {
      * @param {me.Stage} stage Instantiated Stage to associate with state ID
      * @param {Boolean} [start = false] if true the state will be changed immediately after adding it.
      * @example
-     * var MenuButton = me.GUI_Object.extend({
-     *     "onClick" : function () {
+     * class MenuButton extends me.GUI_Object {
+     *     onClick() {
      *         // Change to the PLAY state when the button is clicked
      *         me.state.change(me.state.PLAY);
      *         return true;
      *     }
-     * });
+     * };
      *
-     * var MenuScreen = me.Stage.extend({
-     *     onResetEvent: function() {
+     * class MenuScreen extends me.Stage {
+     *     onResetEvent() {
      *         // Load background image
      *         me.game.world.addChild(
      *             new me.ImageLayer(0, 0, {
@@ -465,17 +414,17 @@ var state = {
      *
      *         // Play music
      *         me.audio.playTrack("menu");
-     *     },
+     *     }
      *
-     *     "onDestroyEvent" : function () {
+     *     onDestroyEvent() {
      *         // Stop music
      *         me.audio.stopTrack();
      *     }
-     * });
+     * };
      *
      * me.state.set(me.state.MENU, new MenuScreen());
      */
-    set(state, stage, start) {
+    set(state, stage, start = false) {
         if (!(stage instanceof Stage)) {
             throw new Error(stage + " is not an instance of me.Stage");
         }
@@ -573,7 +522,7 @@ var state = {
                 _fade.color,
                 _fade.duration,
                 function () {
-                    utils.function.defer(_switchState, this, state);
+                    fctUtil.defer(_switchState, this, state);
                 }
             );
 
@@ -585,7 +534,7 @@ var state = {
             if (forceChange === true) {
                 _switchState(state);
             } else {
-                utils.function.defer(_switchState, this, state);
+                fctUtil.defer(_switchState, this, state);
             }
         }
     },