melonjs 9.1.0 → 10.0.1

package/src/renderable/sprite.js

@@ -1,5 +1,5 @@
 import Vector2d from "./../math/vector2.js";
-import video from "./../video/video.js";
+import { renderer } from "./../video/video.js";
 import pool from "./../system/pooling.js";
 import loader from "./../loader/loader.js";
 import {Texture } from "./../video/texture.js";
@@ -7,6 +7,7 @@ import Renderable from "./renderable.js";
 
 
 /**
+ * @classdesc
  * An object to display a fixed or animated sprite on screen.
  * @class
  * @extends me.Renderable
@@ -43,11 +44,16 @@ import Renderable from "./renderable.js";
  *     region : "npc2.png",
  * });
  */
-var Sprite = Renderable.extend({
+
+class Sprite extends Renderable {
+
     /**
      * @ignore
      */
-    init : function (x, y, settings) {
+    constructor(x, y, settings) {
+
+        // call the super constructor
+        super(x, y, 0, 0);
 
         /**
          * pause and resume animation
@@ -121,9 +127,6 @@ var Sprite = Renderable.extend({
             state : false
         };
 
-        // call the super constructor
-        this._super(Renderable, "init", [ x, y, 0, 0 ]);
-
         // set the proper image/texture to use
         if (settings.image instanceof Texture) {
             this.source = settings.image;
@@ -147,22 +150,17 @@ var Sprite = Renderable.extend({
         } else {
             // HTMLImageElement/Canvas or String
             this.image = (typeof settings.image === "object") ? settings.image : loader.getImage(settings.image);
+            // throw an error if image ends up being null/undefined
+            if (!this.image) {
+                throw new Error("me.Sprite: '" + settings.image + "' image/texture not found!");
+            }
             // update the default "current" frame size
             this.current.width = settings.framewidth = settings.framewidth || this.image.width;
             this.current.height = settings.frameheight = settings.frameheight || this.image.height;
-            this.source = video.renderer.cache.get(this.image, settings);
+            this.source = renderer.cache.get(this.image, settings);
             this.textureAtlas = this.source.getAtlas();
         }
 
-        // throw an error if image ends up being null/undefined
-        if (!this.image) {
-            throw new Error((
-                (typeof(settings.image) === "string") ?
-                "'" + settings.image + "'" :
-                "Image"
-            ) + " file for Image Layer '" + this.name + "' not found!");
-        }
-
         // store/reset the current atlas information if specified
         if (typeof(settings.atlas) !== "undefined") {
             this.textureAtlas = settings.atlas;
@@ -214,7 +212,7 @@ var Sprite = Renderable.extend({
 
         // enable currentTransform for me.Sprite based objects
         this.autoTransform = true;
-    },
+    }
 
     /**
      * return the flickering state of the object
@@ -223,9 +221,9 @@ var Sprite = Renderable.extend({
      * @function
      * @return {Boolean}
      */
-    isFlickering : function () {
+    isFlickering() {
         return this._flicker.isFlickering;
-    },
+    }
 
     /**
      * make the object flicker
@@ -242,7 +240,7 @@ var Sprite = Renderable.extend({
      *     me.game.world.removeChild(this);
      * });
      */
-    flicker : function (duration, callback) {
+    flicker(duration, callback) {
         this._flicker.duration = duration;
         if (this._flicker.duration <= 0) {
             this._flicker.isFlickering = false;
@@ -253,7 +251,7 @@ var Sprite = Renderable.extend({
             this._flicker.isFlickering = true;
         }
         return this;
-    },
+    }
 
     /**
      * add an animation <br>
@@ -289,7 +287,7 @@ var Sprite = Renderable.extend({
      * // set the standing animation as default
      * this.setCurrentAnimation("stand");
      */
-    addAnimation : function (name, index, animationspeed) {
+    addAnimation(name, index, animationspeed) {
         this.anim[name] = {
             name : name,
             frames : [],
@@ -355,7 +353,7 @@ var Sprite = Renderable.extend({
         this.anim[name].length = counter;
 
         return counter;
-    },
+    }
 
     /**
      * set the current animation
@@ -396,7 +394,7 @@ var Sprite = Renderable.extend({
      *    return false; // do not reset to first frame
      * }).bind(this));
      **/
-    setCurrentAnimation : function (name, resetAnim, _preserve_dt) {
+    setCurrentAnimation(name, resetAnim, _preserve_dt) {
         if (this.anim[name]) {
             this.current.name = name;
             this.current.length = this.anim[this.current.name].length;
@@ -416,7 +414,7 @@ var Sprite = Renderable.extend({
             throw new Error("animation id '" + name + "' not defined");
         }
         return this;
-    },
+    }
 
     /**
      * reverse the given or current animation if none is specified
@@ -427,7 +425,7 @@ var Sprite = Renderable.extend({
      * @return {me.Sprite} Reference to this object for method chaining
      * @see me.Sprite#animationspeed
      */
-    reverseAnimation : function (name) {
+    reverseAnimation(name) {
         if (typeof name !== "undefined" && typeof this.anim[name] !== "undefined") {
             this.anim[name].frames.reverse();
         } else {
@@ -435,7 +433,7 @@ var Sprite = Renderable.extend({
         }
         this.isDirty = true;
         return this;
-    },
+    }
 
     /**
      * return true if the specified animation is the current one.
@@ -449,9 +447,9 @@ var Sprite = Renderable.extend({
      *     // do something funny...
      * }
      */
-    isCurrentAnimation : function (name) {
+    isCurrentAnimation(name) {
         return this.current.name === name;
-    },
+    }
 
     /**
      * change the current texture atlas region for this sprite
@@ -465,7 +463,7 @@ var Sprite = Renderable.extend({
      * // change the sprite to "shadedDark13.png";
      * mySprite.setRegion(game.texture.getRegion("shadedDark13.png"));
      */
-    setRegion : function (region) {
+    setRegion(region) {
         // set the source texture for the given region
         this.image = this.source.getTexture(region);
         // set the sprite offset within the texture
@@ -484,7 +482,7 @@ var Sprite = Renderable.extend({
         }
         this.isDirty = true;
         return this;
-    },
+    }
 
     /**
      * force the current animation frame index.
@@ -497,10 +495,10 @@ var Sprite = Renderable.extend({
      * // reset the current animation to the first frame
      * this.setAnimationFrame();
      */
-    setAnimationFrame : function (idx) {
+    setAnimationFrame(idx) {
         this.current.idx = (idx || 0) % this.current.length;
         return this.setRegion(this.getAnimationFrameObjectByIndex(this.current.idx));
-    },
+    }
 
     /**
      * return the current animation frame index.
@@ -509,9 +507,9 @@ var Sprite = Renderable.extend({
      * @function
      * @return {Number} current animation frame index
      */
-    getCurrentAnimationFrame : function () {
+    getCurrentAnimationFrame() {
         return this.current.idx;
-    },
+    }
 
     /**
      * Returns the frame object by the index.
@@ -521,14 +519,14 @@ var Sprite = Renderable.extend({
      * @private
      * @return {Number} if using number indices. Returns {Object} containing frame data if using texture atlas
      */
-    getAnimationFrameObjectByIndex : function (id) {
+    getAnimationFrameObjectByIndex(id) {
         return this.anim[this.current.name].frames[id];
-    },
+    }
 
     /**
      * @ignore
      */
-    update : function (dt) {
+    update(dt) {
 
         // Update animation if necessary
         if (!this.animationpause && this.current && this.current.length > 0) {
@@ -586,22 +584,22 @@ var Sprite = Renderable.extend({
         }
 
         return this.isDirty;
-    },
+    }
 
     /**
      * Destroy function<br>
      * @ignore
      */
-    destroy : function () {
+    destroy() {
         pool.push(this.offset);
         this.offset = undefined;
-        this._super(Renderable, "destroy");
-    },
+        super.destroy();
+    }
 
     /**
      * @ignore
      */
-    draw : function (renderer) {
+    draw(renderer) {
         // do nothing if we are flickering
         if (this._flicker.isFlickering) {
             this._flicker.state = !this._flicker.state;
@@ -643,6 +641,6 @@ var Sprite = Renderable.extend({
             w, h                         // dw,dh
         );
     }
-});
+};
 
 export default Sprite;

package/src/renderable/trigger.js

@@ -3,9 +3,10 @@ import collision from "./../physics/collision.js";
 import Body from "./../physics/body.js";
 import Rect from "./../shapes/rectangle.js";
 import level from "./../level/level.js";
-import game from "./../game.js";
+import { world, viewport } from "./../game.js";
 
 /**
+ * classdesc
  * trigger an event when colliding with another object
  * @class
  * @extends me.Renderable
@@ -34,12 +35,15 @@ import game from "./../game.js";
  *     }
  * ));
  */
-var Trigger = Renderable.extend({
+
+class Trigger extends Renderable {
+
     /**
      * @ignore
      */
-    init : function (x, y, settings) {
-        this._super(Renderable, "init", [x, y, settings.width || 0, settings.height || 0]);
+    constructor(x, y, settings) {
+
+        super(x, y, settings.width || 0, settings.height || 0);
 
         // for backward compatibility
         this.anchorPoint.set(0, 0);
@@ -72,28 +76,30 @@ var Trigger = Renderable.extend({
         // physic body to check for collision against
         this.body = new Body(this, settings.shapes || new Rect(0, 0, this.width, this.height));
         this.body.collisionType = collision.types.ACTION_OBJECT;
+        // by default only collides with PLAYER_OBJECT
+        this.body.setCollisionMask(collision.types.PLAYER_OBJECT);
+        this.body.setStatic(true);
         this.resize(this.body.getBounds().width, this.body.getBounds().height);
-
-    },
+    }
 
     /**
      * @ignore
      */
-     getTriggerSettings : function () {
+     getTriggerSettings() {
          // Lookup for the container instance
          if (typeof(this.triggerSettings.container) === "string") {
-             this.triggerSettings.container = game.world.getChildByName(this.triggerSettings.container)[0];
+             this.triggerSettings.container = world.getChildByName(this.triggerSettings.container)[0];
          }
          return this.triggerSettings;
-     },
+     }
 
     /**
      * @ignore
      */
-    onFadeComplete : function () {
+    onFadeComplete() {
         level.load(this.gotolevel, this.getTriggerSettings());
-        game.viewport.fadeOut(this.fade, this.duration);
-    },
+        viewport.fadeOut(this.fade, this.duration);
+    }
 
     /**
      * go to the specified level
@@ -103,7 +109,7 @@ var Trigger = Renderable.extend({
      * @param {String} [level=this.nextlevel] name of the level to load
      * @protected
      */
-    triggerEvent : function () {
+    triggerEvent() {
         var triggerSettings = this.getTriggerSettings();
 
         if (triggerSettings.event === "level") {
@@ -113,7 +119,7 @@ var Trigger = Renderable.extend({
             if (this.fade && this.duration) {
                 if (!this.fading) {
                     this.fading = true;
-                    game.viewport.fadeIn(this.fade, this.duration,
+                    viewport.fadeIn(this.fade, this.duration,
                             this.onFadeComplete.bind(this));
                 }
             } else {
@@ -122,15 +128,16 @@ var Trigger = Renderable.extend({
         } else {
             throw new Error("Trigger invalid type");
         }
-    },
+    }
 
     /** @ignore */
-    onCollision : function () {
+    onCollision() {
         if (this.name === "Trigger") {
             this.triggerEvent.apply(this);
         }
         return false;
     }
-});
+
+};
 
 export default Trigger;

package/src/shapes/ellipse.js

@@ -1,8 +1,8 @@
 import Vector2d from "./../math/vector2.js";
 import pool from "./../system/pooling.js";
-import "jay-extend";
 
 /**
+ * @classdesc
  * an ellipse Object
  * @class
  * @extends me.Object
@@ -13,11 +13,10 @@ import "jay-extend";
  * @param {Number} w width (diameter) of the ellipse
  * @param {Number} h height (diameter) of the ellipse
  */
-var Ellipse = window.Jay.extend({
-    /**
-     * @ignore
-     */
-    init : function (x, y, w, h) {
+
+class Ellipse {
+
+    constructor(x, y, w, h) {
         /**
          * the center coordinates of the ellipse
          * @public
@@ -75,12 +74,12 @@ var Ellipse = window.Jay.extend({
         // the shape type
         this.shapeType = "Ellipse";
         this.setShape(x, y, w, h);
-    },
+    }
 
     /** @ignore */
-    onResetEvent : function (x, y, w, h) {
+    onResetEvent(x, y, w, h) {
         this.setShape(x, y, w, h);
-    },
+    }
 
     /**
      * set new value to the Ellipse shape
@@ -92,7 +91,7 @@ var Ellipse = window.Jay.extend({
      * @param {Number} w width (diameter) of the ellipse
      * @param {Number} h height (diameter) of the ellipse
      */
-    setShape : function (x, y, w, h) {
+    setShape(x, y, w, h) {
         var hW = w / 2;
         var hH = h / 2;
 
@@ -109,7 +108,7 @@ var Ellipse = window.Jay.extend({
         this.getBounds().translate(-this.radiusV.x, -this.radiusV.y);
 
         return this;
-    },
+    }
 
     /**
      * Rotate this Ellipse (counter-clockwise) by the specified angle (in radians).
@@ -120,13 +119,13 @@ var Ellipse = window.Jay.extend({
      * @param {me.Vector2d|me.ObservableVector2d} [v] an optional point to rotate around
      * @return {me.Ellipse} Reference to this object for method chaining
      */
-    rotate : function (angle, v) {
+    rotate(angle, v) {
         // TODO : only works for circle
         this.pos.rotate(angle, v);
         this.getBounds().shift(this.pos);
         this.getBounds().translate(-this.radiusV.x, -this.radiusV.y);
         return this;
-    },
+    }
 
     /**
      * Scale this Ellipse by the specified scalar.
@@ -137,7 +136,7 @@ var Ellipse = window.Jay.extend({
      * @param {Number} [y=x]
      * @return {me.Ellipse} Reference to this object for method chaining
      */
-    scale : function (x, y) {
+    scale(x, y) {
         y = typeof (y) !== "undefined" ? y : x;
         return this.setShape(
             this.pos.x,
@@ -145,7 +144,7 @@ var Ellipse = window.Jay.extend({
             this.radiusV.x * 2 * x,
             this.radiusV.y * 2 * y
         );
-    },
+    }
 
     /**
      * Scale this Ellipse by the specified vector.
@@ -155,9 +154,9 @@ var Ellipse = window.Jay.extend({
      * @param {me.Vector2d} v
      * @return {me.Ellipse} Reference to this object for method chaining
      */
-    scaleV : function (v) {
+    scaleV(v) {
         return this.scale(v.x, v.y);
-    },
+    }
 
     /**
      * apply the given transformation matrix to this ellipse
@@ -167,10 +166,10 @@ var Ellipse = window.Jay.extend({
      * @param {me.Matrix2d} matrix the transformation matrix
      * @return {me.Polygon} Reference to this object for method chaining
      */
-    transform : function (/* m */) {
+    transform(/* m */) {
         // TODO
         return this;
-    },
+    }
 
     /**
      * translate the circle/ellipse by the specified offset
@@ -189,7 +188,7 @@ var Ellipse = window.Jay.extend({
      * @param {me.Vector2d} v vector offset
      * @return {me.Ellipse} this ellipse
      */
-    translate : function () {
+    translate() {
         var _x, _y;
 
         if (arguments.length === 2) {
@@ -207,7 +206,7 @@ var Ellipse = window.Jay.extend({
         this.getBounds().translate(_x, _y);
 
         return this;
-    },
+    }
 
     /**
      * check if this circle/ellipse contains the specified point
@@ -227,7 +226,7 @@ var Ellipse = window.Jay.extend({
      * @param  {Number} y y coordinate
      * @return {boolean} true if contains
      */
-    contains: function (x, y) {
+    contains() {
         var _x, _y;
 
         if (arguments.length === 2) {
@@ -248,7 +247,7 @@ var Ellipse = window.Jay.extend({
             ((_x * _x) / this.radiusSq.x) +
             ((_y * _y) / this.radiusSq.y)
         ) <= 1.0;
-    },
+    }
 
     /**
      * returns the bounding box for this shape, the smallest Rectangle object completely containing this shape.
@@ -257,12 +256,12 @@ var Ellipse = window.Jay.extend({
      * @function
      * @return {me.Bounds} this shape bounding box Rectangle object
      */
-    getBounds : function () {
+    getBounds() {
         if (typeof this._bounds === "undefined") {
             this._bounds = pool.pull("Bounds");
         }
         return this._bounds;
-    },
+    }
 
     /**
      * clone this Ellipse
@@ -271,7 +270,7 @@ var Ellipse = window.Jay.extend({
      * @function
      * @return {me.Ellipse} new Ellipse
      */
-    clone : function () {
+    clone() {
         return new Ellipse(
             this.pos.x,
             this.pos.y,
@@ -279,5 +278,6 @@ var Ellipse = window.Jay.extend({
             this.radiusV.y * 2
         );
     }
-});
+};
+
 export default Ellipse;

package/src/shapes/line.js

@@ -2,7 +2,8 @@ import Vector2d from "./../math/vector2.js";
 import Polygon from "./poly.js";
 
 /**
- * a line segment Object.<br>
+ * @classdesc
+ * a line segment Object
  * @class
  * @extends me.Polygon
  * @memberOf me
@@ -11,7 +12,8 @@ import Polygon from "./poly.js";
  * @param {Number} y origin point of the Line
  * @param {me.Vector2d[]} points array of vectors defining the Line
  */
-var Line = Polygon.extend({
+
+class Line extends Polygon {
 
     /**
      * Returns true if the Line contains the given point
@@ -31,7 +33,7 @@ var Line = Polygon.extend({
      * @param  {Number} y y coordinate
      * @return {boolean} true if contains
      */
-    contains: function () {
+    contains() {
         var _x, _y;
 
         if (arguments.length === 2) {
@@ -53,7 +55,7 @@ var Line = Polygon.extend({
 
         //(Cy - Ay) * (Bx - Ax) = (By - Ay) * (Cx - Ax)
         return (_y - start.y) * (end.x - start.x) === (end.y - start.y) * (_x - start.x);
-    },
+    }
 
     /**
      * Computes the calculated collision edges and normals.
@@ -62,7 +64,7 @@ var Line = Polygon.extend({
      * @memberOf me.Line.prototype
      * @function
      */
-    recalc : function () {
+    recalc() {
         var edges = this.edges;
         var normals = this.normals;
         var indices = this.indices;
@@ -89,7 +91,7 @@ var Line = Polygon.extend({
         indices.length = 0;
 
         return this;
-    },
+    }
 
     /**
      * clone this line segment
@@ -98,12 +100,14 @@ var Line = Polygon.extend({
      * @function
      * @return {me.Line} new Line
      */
-    clone : function () {
+    clone() {
         var copy = [];
         this.points.forEach(function (point) {
             copy.push(point.clone());
         });
         return new Line(this.pos.x, this.pos.y, copy);
     }
-});
+
+};
+
 export default Line;