melonjs 9.1.0 → 10.0.1

package/src/video/webgl/glshader.js

@@ -1,4 +1,4 @@
-import event from "./../../system/event.js";
+import * as event from "./../../system/event.js";
 import device from "./../../system/device.js";
 
 /**
@@ -286,7 +286,7 @@ class GLShader {
         this.uniforms = extractUniforms(this.gl, this);
 
         // destroy the shader on context lost (will be recreated on context restore)
-        event.subscribe(event.WEBGL_ONCONTEXT_LOST, this.destroy.bind(this));
+        event.on(event.WEBGL_ONCONTEXT_LOST, this.destroy, this);
 
         return this;
     }

package/src/video/webgl/webgl_compositor.js

@@ -1,6 +1,6 @@
 import Vector2d from "./../../math/vector2.js";
 import GLShader from "./glshader.js";
-import event from "./../../system/event.js";
+import * as event from "./../../system/event.js";
 import { isPowerOfTwo } from "./../../math/math.js";
 
 import primitiveVertex from "./shaders/primitive.vert";
@@ -39,6 +39,14 @@ var MAX_LENGTH = 16000;
 class WebGLCompositor {
 
     constructor (renderer) {
+        this.init(renderer);
+    }
+
+    /**
+     * Initialize the compositor
+     * @ignore
+     */
+    init (renderer) {
         // local reference
         var gl = renderer.gl;
 
@@ -133,12 +141,10 @@ class WebGLCompositor {
         gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, this.createIB(), gl.STATIC_DRAW);
 
         // register to the CANVAS resize channel
-        event.subscribe(
-            event.CANVAS_ONRESIZE, (function(width, height) {
-                this.flush();
-                this.setViewport(0, 0, width, height);
-            }).bind(this)
-        );
+        event.on(event.CANVAS_ONRESIZE, (width, height) => {
+            this.flush();
+            this.setViewport(0, 0, width, height);
+        });
 
         this.reset();
     }
@@ -507,7 +513,7 @@ class WebGLCompositor {
      * @memberOf me.WebGLCompositor
      * @function
      * @param {GLENUM} [mode=gl.TRIANGLES] primitive type to render (gl.POINTS, gl.LINE_STRIP, gl.LINE_LOOP, gl.LINES, gl.TRIANGLE_STRIP, gl.TRIANGLE_FAN, gl.TRIANGLES)
-     * @param {me.Vector2d[]} verts vertices
+     * @param {me.Vector2d[]} [verts=[]] vertices
      * @param {Number} [vertexCount=verts.length] amount of points defined in the points array
      */
     drawVertices(mode, verts, vertexCount) {

package/src/video/webgl/webgl_renderer.js

@@ -5,8 +5,8 @@ import WebGLCompositor from "./webgl_compositor.js";
 import Renderer from "./../renderer.js";
 import TextureCache from "./../texture_cache.js";
 import {Texture, createAtlas } from "./../texture.js";
-import video from "./../video.js";
-import event from "./../../system/event.js";
+import { createCanvas, renderer } from "./../video.js";
+import * as event from "./../../system/event.js";
 import pool from "./../../system/pooling.js";
 import { isPowerOfTwo, nextPowerOfTwo, TAU } from "./../../math/math.js";
 
@@ -154,18 +154,16 @@ class WebGLRenderer extends Renderer {
         // to simulate context lost and restore :
         // var ctx = me.video.renderer.context.getExtension('WEBGL_lose_context');
         // ctx.loseContext()
-        // reference to this renderer
-        var renderer = this;
-        this.getScreenCanvas().addEventListener("webglcontextlost", function (e) {
-            event.preventDefault();
-            renderer.isContextValid = false;
-            event.publish(event.WEBGL_ONCONTEXT_LOST, [ renderer ]);
+        this.getScreenCanvas().addEventListener("webglcontextlost", (e) => {
+            e.preventDefault();
+            this.isContextValid = false;
+            event.emit(event.WEBGL_ONCONTEXT_LOST, this);
         }, false );
         // ctx.restoreContext()
-        this.getScreenCanvas().addEventListener("webglcontextrestored", function (e) {
-            renderer.reset();
-            renderer.isContextValid = true;
-            event.publish(event.WEBGL_ONCONTEXT_RESTORED, [ renderer ]);
+        this.getScreenCanvas().addEventListener("webglcontextrestored", () => {
+            this.reset();
+            this.isContextValid = true;
+            event.emit(event.WEBGL_ONCONTEXT_RESTORED, this);
         }, false );
 
         return this;
@@ -236,7 +234,7 @@ class WebGLRenderer extends Renderer {
                 }
             }
 
-            var image = video.createCanvas(width, height, true);
+            var image = createCanvas(width, height, true);
 
             /**
              * @ignore
@@ -272,7 +270,7 @@ class WebGLRenderer extends Renderer {
      */
     createPattern(image, repeat) {
 
-        if (video.renderer.WebGLVersion === 1 && (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height))) {
+        if (renderer.WebGLVersion === 1 && (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height))) {
             var src = typeof image.src !== "undefined" ? image.src : image;
             throw new Error(
                 "[WebGL Renderer] " + src + " is not a POT texture " +
@@ -694,8 +692,9 @@ class WebGLRenderer extends Renderer {
      * @param {Number} start start angle in radians
      * @param {Number} end end angle in radians
      * @param {Boolean} [antiClockwise=false] draw arc anti-clockwise
+     * @param {Boolean} [fill=false]
      */
-    strokeArc(x, y, radius, start, end, antiClockwise, fill) {
+    strokeArc(x, y, radius, start, end, antiClockwise = false, fill) {
         if (fill === true ) {
             this.fillArc(x, y, radius, start, end, antiClockwise);
         } else {
@@ -738,7 +737,7 @@ class WebGLRenderer extends Renderer {
      * @param {Number} end end angle in radians
      * @param {Boolean} [antiClockwise=false] draw arc anti-clockwise
      */
-    fillArc(x, y, radius, start, end, antiClockwise) {
+    fillArc(x, y, radius, start, end /*, antiClockwise = false*/) {
         // XXX to be optimzed using a specific shader
         var points = this._glPoints;
         var i, index = 0;
@@ -778,8 +777,9 @@ class WebGLRenderer extends Renderer {
      * @param {Number} y ellipse center point y-axis
      * @param {Number} w horizontal radius of the ellipse
      * @param {Number} h vertical radius of the ellipse
+     * @param {Boolean} [fill=false] also fill the shape with the current color if true
      */
-    strokeEllipse(x, y, w, h, fill) {
+    strokeEllipse(x, y, w, h, fill = false) {
         if (fill === true ) {
             this.fillEllipse(x, y, w, h);
         } else {
@@ -880,8 +880,9 @@ class WebGLRenderer extends Renderer {
      * @memberOf me.WebGLRenderer.prototype
      * @function
      * @param {me.Polygon} poly the shape to draw
+     * @param {Boolean} [fill=false] also fill the shape with the current color if true
      */
-    strokePolygon(poly, fill) {
+    strokePolygon(poly, fill = false) {
         if (fill === true ) {
             this.fillPolygon(poly);
         } else {
@@ -940,8 +941,9 @@ class WebGLRenderer extends Renderer {
      * @param {Number} y
      * @param {Number} width
      * @param {Number} height
+     * @param {Boolean} [fill=false] also fill the shape with the current color if true
      */
-    strokeRect(x, y, width, height, fill) {
+    strokeRect(x, y, width, height, fill = false) {
         if (fill === true ) {
             this.fillRect(x, y, width, height);
         } else {