melonjs 14.5.0 → 15.1.0

package/src/video/webgl/webgl_renderer.js

@@ -1,13 +1,14 @@
 import Color from "./../../math/color.js";
 import Matrix2d from "./../../math/matrix2.js";
-import WebGLCompositor from "./compositors/webgl_compositor.js";
+import QuadCompositor from "./compositors/quad_compositor";
+import PrimitiveCompositor from "./compositors/primitive_compositor";
 import Renderer from "./../renderer.js";
 import TextureCache from "./../texture/cache.js";
 import { TextureAtlas, createAtlas } from "./../texture/atlas.js";
-import { createCanvas, renderer } from "./../video.js";
+import { renderer } from "./../video.js";
 import * as event from "./../../system/event.js";
 import pool from "./../../system/pooling.js";
-import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
+import { isPowerOfTwo } from "./../../math/math.js";
 
 /**
  * @classdesc
@@ -26,13 +27,13 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [options.premultipliedAlpha=true] - in WebGL, whether the renderer will assume that colors have premultiplied alpha when canvas transparency is enabled
      * @param {boolean} [options.subPixel=false] - Whether to enable subpixel renderering (performance hit when enabled)
      * @param {boolean} [options.preferWebGL1=false] - if true the renderer will only use WebGL 1
+     * @param {boolean} [options.depthTest="sorting"] - ~Experimental~ the default method to sort object on the z axis in WebGL ("sorting", "z-buffer")
      * @param {string} [options.powerPreference="default"] - a hint to the user agent indicating what configuration of GPU is suitable for the WebGL context ("default", "high-performance", "low-power"). To be noted that Safari and Chrome (since version 80) both default to "low-power" to save battery life and improve the user experience on these dual-GPU machines.
      * @param {number} [options.zoomX=width] - The actual width of the canvas with scaling applied
      * @param {number} [options.zoomY=height] - The actual height of the canvas with scaling applied
-     * @param {WebGLCompositor} [options.compositor] - A class that implements the compositor API
+     * @param {Compositor} [options.compositor] - A class that implements the compositor API for sprite rendering
      */
     constructor(options) {
-
         // parent contructor
         super(options);
 
@@ -47,25 +48,31 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         /**
          * The vendor string of the underlying graphics driver.
          * @type {string}
-         * @default null
+         * @default undefined
          * @readonly
          */
-        this.GPUVendor = null;
+        this.GPUVendor = undefined;
 
         /**
          * The renderer string of the underlying graphics driver.
          * @type {string}
-         * @default null
+         * @default undefined
          * @readonly
          */
-        this.GPURenderer = null;
+        this.GPURenderer = undefined;
 
         /**
          * The WebGL context
          * @name gl
          * @type {WebGLRenderingContext}
          */
-        this.context = this.gl = this.getContextGL(this.getCanvas(), options.transparent);
+        this.context = this.gl = this.getContextGL(this.getCanvas(), options.transparent, options.depthTest === "z-buffer");
+
+        /**
+         * the vertex buffer used by this WebGL Renderer
+         * @type {WebGLBuffer}
+         */
+        this.vertexBuffer = this.gl.createBuffer();
 
         /**
          * Maximum number of texture unit supported under the current context
@@ -104,7 +111,13 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
          * The current compositor used by the renderer
          * @type {WebGLCompositor}
          */
-        this.currentCompositor = null;
+        this.currentCompositor = undefined;
+
+        /**
+         * a reference to the current shader program used by the renderer
+         * @type {WebGLProgram}
+         */
+        this.currentProgram = undefined;
 
         /**
          * The list of active compositors
@@ -112,14 +125,27 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
          */
         this.compositors = new Map();
 
-        // Create a default compositor
-        var compositor = new (this.settings.compositor || WebGLCompositor)(this);
-        this.compositors.set("default", compositor);
-        this.setCompositor(compositor);
+        // bind the vertex buffer
+        this.gl.bindBuffer(this.gl.ARRAY_BUFFER, this.vertexBuffer);
+
+        // Create both quad and primitive compositor
+        this.addCompositor(new (this.settings.compositor || QuadCompositor)(this), "quad", true);
+        this.addCompositor(new (this.settings.compositor || PrimitiveCompositor)(this), "primitive");
 
+        // depth Test settings
+        this.depthTest = options.depthTest;
 
         // default WebGL state(s)
-        this.gl.disable(this.gl.DEPTH_TEST);
+        if (this.depthTest === "z-buffer") {
+            this.gl.enable(this.gl.DEPTH_TEST);
+            // https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext/depthFunc
+            this.gl.depthFunc(this.gl.LEQUAL);
+            this.gl.depthMask(true);
+        } else {
+            this.gl.disable(this.gl.DEPTH_TEST);
+            this.gl.depthMask(false);
+        }
+
         this.gl.disable(this.gl.SCISSOR_TEST);
         this.gl.enable(this.gl.BLEND);
 
@@ -127,12 +153,16 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         this.setBlendMode(this.settings.blendMode);
 
         // get GPU vendor and renderer
-        var debugInfo = this.gl.getExtension("WEBGL_debug_renderer_info");
+        let debugInfo = this.gl.getExtension("WEBGL_debug_renderer_info");
         if (debugInfo !== null) {
             this.GPUVendor = this.gl.getParameter(debugInfo.UNMASKED_VENDOR_WEBGL);
             this.GPURenderer = this.gl.getParameter(debugInfo.UNMASKED_RENDERER_WEBGL);
         }
 
+        // a private property that when set will make `setCompositor`
+        // to use this specific shader instead of the default one
+        this.customShader = undefined;
+
         // Create a texture cache
         this.cache = new TextureCache(this.maxTextures);
 
@@ -140,7 +170,7 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         this.type =  "WebGL" + this.WebGLVersion;
 
         // to simulate context lost and restore in WebGL:
-        // var ctx = me.video.renderer.context.getExtension('WEBGL_lose_context');
+        // let ctx = me.video.renderer.context.getExtension('WEBGL_lose_context');
         // ctx.loseContext()
         this.getCanvas().addEventListener("webglcontextlost", (e) => {
             e.preventDefault();
@@ -153,6 +183,17 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
             this.isContextValid = true;
             event.emit(event.ONCONTEXT_RESTORED, this);
         }, false );
+
+        // reset the renderer on game reset
+        event.on(event.GAME_RESET, () => {
+            this.reset();
+        });
+
+        // register to the CANVAS resize channel
+        event.on(event.CANVAS_ONRESIZE, (width, height) => {
+            this.flush();
+            this.setViewport(0, 0, width, height);
+        });
     }
 
     /**
@@ -161,6 +202,21 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
     reset() {
         super.reset();
 
+        // clear gl context
+        this.clear();
+
+        // initial viewport size
+        this.setViewport();
+
+        // rebind the vertex buffer if required (e.g in case of context loss)
+        if (this.gl.getParameter(this.gl.ARRAY_BUFFER_BINDING) !== this.vertexBuffer) {
+            this.gl.bindBuffer(this.gl.ARRAY_BUFFER, this.vertexBuffer);
+        }
+
+        this.currentCompositor = undefined;
+        this.currentProgram = undefined;
+        this.customShader = undefined;
+
         this.compositors.forEach((compositor) => {
             if (this.isContextValid === false) {
                 // on context lost/restore
@@ -170,35 +226,62 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
             }
         });
 
+        this.setCompositor("quad");
+
         this.gl.disable(this.gl.SCISSOR_TEST);
-        if (typeof this.fontContext2D !== "undefined" ) {
-            this.createFontTexture(this.cache);
+    }
+
+    /**
+     * add a new compositor to this renderer
+     * @param {Compositor} compositor - a compositor instance
+     * @param {String} name - a name uniquely identifying this compositor
+     * @param {Boolean} [activate=false] - true if the given compositor should be set as the active one
+     */
+    addCompositor(compositor, name = "default", activate = false) {
+        // make sure there is no existing compositor with the same name
+        if (typeof this.compositors.get(name) !== "undefined") {
+            throw new Error("Invalid Compositor name");
         }
 
+        // add the new compositor
+        this.compositors.set(name, compositor);
+
+        if (activate === true) {
+            // set as active one
+            this.setCompositor(name);
+        }
     }
 
     /**
      * set the active compositor for this renderer
-     * @param {WebGLCompositor|string} compositor - a compositor name or instance
+     * @param {String} name - a compositor name
+     * @param {GLShader} [shader] - an optional shader program to be used, instead of the default one, when activating the compositor
+     * @return {Compositor} an instance to the current active compositor
      */
-    setCompositor(compositor = "default") {
-
-        if (typeof compositor === "string") {
-            compositor = this.compositors.get(compositor);
-        }
+    setCompositor(name = "default", shader = this.customShader) {
+        let compositor = this.compositors.get(name);
 
         if (typeof compositor === "undefined") {
-            throw new Error("Invalid WebGL Compositor");
+            throw new Error("Invalid Compositor");
         }
 
         if (this.currentCompositor !== compositor) {
-            if (this.currentCompositor !== null) {
+            if (this.currentCompositor !== undefined) {
                 // flush the current compositor
                 this.currentCompositor.flush();
             }
-            // set given one as current
+            // set as the active one
             this.currentCompositor = compositor;
         }
+
+        if (name === "quad" && typeof shader === "object") {
+            this.currentCompositor.useShader(shader);
+        } else {
+            // (re)bind the compositor with the default shader (program & attributes)
+            this.currentCompositor.bind();
+        }
+
+        return this.currentCompositor;
     }
 
     /**
@@ -208,66 +291,31 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         this.currentTransform.identity();
     }
 
-    /**
-     * @ignore
-     */
-    createFontTexture(cache) {
-        if (typeof this.fontTexture === "undefined") {
-            var canvas = this.getCanvas();
-            var width = canvas.width;
-            var height = canvas.height;
-
-            if (this.WebGLVersion === 1) {
-                if (!isPowerOfTwo(width)) {
-                    width = nextPowerOfTwo(canvas.width);
-                }
-                if (!isPowerOfTwo(height)) {
-                    height = nextPowerOfTwo(canvas.height);
-                }
-            }
-
-            var image = createCanvas(width, height, true);
-
-            /**
-             * @ignore
-             */
-            this.fontContext2D = this.getContext2d(image);
-
-            /**
-             * @ignore
-             */
-            this.fontTexture = new TextureAtlas(createAtlas(canvas.width, canvas.height, "fontTexture"), image, cache);
-            this.currentCompositor.uploadTexture(this.fontTexture, 0, 0, 0);
-
-        } else {
-           // fontTexture was already created, just add it back into the cache
-           cache.set(this.fontContext2D.canvas, this.fontTexture);
-       }
-    }
-
     /**
      * Create a pattern with the specified repetition
-     * @param {Image} image - Source image
+     * @param {HTMLImageElement|SVGImageElement|HTMLVideoElement|HTMLCanvasElement|ImageBitmap|OffscreenCanvas|VideoFrame} image - Source image to be used as the pattern's image
      * @param {string} repeat - Define how the pattern should be repeated
      * @returns {TextureAtlas}
      * @see ImageLayer#repeat
      * @example
-     * var tileable   = renderer.createPattern(image, "repeat");
-     * var horizontal = renderer.createPattern(image, "repeat-x");
-     * var vertical   = renderer.createPattern(image, "repeat-y");
-     * var basic      = renderer.createPattern(image, "no-repeat");
+     * let tileable   = renderer.createPattern(image, "repeat");
+     * let horizontal = renderer.createPattern(image, "repeat-x");
+     * let vertical   = renderer.createPattern(image, "repeat-y");
+     * let basic      = renderer.createPattern(image, "no-repeat");
      */
     createPattern(image, repeat) {
 
+        this.setCompositor("quad");
+
         if (renderer.WebGLVersion === 1 && (!isPowerOfTwo(image.width) || !isPowerOfTwo(image.height))) {
-            var src = typeof image.src !== "undefined" ? image.src : image;
+            let src = typeof image.src !== "undefined" ? image.src : image;
             throw new Error(
                 "[WebGL Renderer] " + src + " is not a POT texture " +
                 "(" + image.width + "x" + image.height + ")"
             );
         }
 
-        var texture = new TextureAtlas(createAtlas(image.width, image.height, "pattern", repeat), image);
+        let texture = new TextureAtlas(createAtlas(image.width, image.height, "pattern", repeat), image);
 
         // FIXME: Remove old cache entry and texture when changing the repeat mode
         this.currentCompositor.uploadTexture(texture);
@@ -292,10 +340,27 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
     }
 
     /**
-     * prepare the framebuffer for drawing a new frame
+     * Sets the WebGL viewport, which specifies the affine transformation of x and y from normalized device coordinates to window coordinates
+     * @param {number} [x = 0] - x the horizontal coordinate for the lower left corner of the viewport origin
+     * @param {number} [y = 0] - y the vertical coordinate for the lower left corner of the viewport origin
+     * @param {number} [w = width of the canvas] - the width of viewport
+     * @param {number} [h = height of the canvas] - the height of viewport
+     */
+    setViewport(x = 0, y = 0, w = this.getCanvas().width, h = this.getCanvas().height) {
+        this.gl.viewport(x, y, w, h);
+    }
+
+    /**
+     * Clear the frame buffer
      */
     clear() {
-        this.currentCompositor.clear(this.settings.transparent ? 0.0 : 1.0);
+        let gl = this.gl;
+        gl.clearColor(0, 0, 0, this.settings.transparent ? 0.0 : 1.0);
+        if (this.depthTest === "z-buffer") {
+            gl.clear(gl.DEPTH_BUFFER_BIT | gl.COLOR_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
+        } else {
+            gl.clear(gl.COLOR_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
+        }
     }
 
     /**
@@ -304,18 +369,21 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [opaque=false] - Allow transparency [default] or clear the surface completely [true]
      */
     clearColor(color = "#000000", opaque = false) {
-        var glArray;
+        let glArray;
+        let gl = this.gl;
 
         if (color instanceof Color) {
             glArray = color.toArray();
         } else {
-            var _color = pool.pull("me.Color");
+            let _color = pool.pull("me.Color");
             // reuse temporary the renderer default color object
             glArray = _color.parseCSS(color).toArray();
             pool.push(_color);
         }
+
         // clear gl context with the specified color
-        this.currentCompositor.clearColor(glArray[0], glArray[1], glArray[2], (opaque === true) ? 1.0 : glArray[3]);
+        gl.clearColor(glArray[0], glArray[1], glArray[2], (opaque === true) ? 1.0 : glArray[3]);
+        gl.clear(gl.COLOR_BUFFER_BIT);
     }
 
     /**
@@ -332,42 +400,9 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         this.restore();
     }
 
-    /**
-     * @ignore
-     */
-    drawFont(bounds) {
-        var fontContext = this.getFontContext();
-
-        // Force-upload the new texture
-        this.currentCompositor.uploadTexture(this.fontTexture, 0, 0, 0, true);
-
-        // Add the new quad
-        var uvs = this.fontTexture.getUVs(bounds.left + "," + bounds.top + "," + bounds.width + "," + bounds.height);
-        this.currentCompositor.addQuad(
-            this.fontTexture,
-            bounds.left,
-            bounds.top,
-            bounds.width,
-            bounds.height,
-            uvs[0],
-            uvs[1],
-            uvs[2],
-            uvs[3],
-            this.currentTint.toUint32(this.getGlobalAlpha())
-        );
-
-        // Clear font context2D
-        fontContext.clearRect(
-            bounds.left,
-            bounds.top,
-            bounds.width,
-            bounds.height
-        );
-    }
-
     /**
      * Draw an image to the gl context
-     * @param {Image} image - An element to draw into the context. The specification permits any canvas image source (CanvasImageSource), specifically, a CSSImageValue, an HTMLImageElement, an SVGImageElement, an HTMLVideoElement, an HTMLCanvasElement, an ImageBitmap, or an OffscreenCanvas.
+     * @param {HTMLImageElement|SVGImageElement|HTMLVideoElement|HTMLCanvasElement|ImageBitmap|OffscreenCanvas|VideoFrame} image - An element to draw into the context.
      * @param {number} sx - The X coordinate of the top left corner of the sub-rectangle of the source image to draw into the destination context.
      * @param {number} sy - The Y coordinate of the top left corner of the sub-rectangle of the source image to draw into the destination context.
      * @param {number} sw - The width of the sub-rectangle of the source image to draw into the destination context. If not specified, the entire rectangle from the coordinates specified by sx and sy to the bottom-right corner of the image is used.
@@ -410,8 +445,10 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
             dy |= 0;
         }
 
-        var texture = this.cache.get(image);
-        var uvs = texture.getUVs(sx + "," + sy + "," + sw + "," + sh);
+        this.setCompositor("quad");
+
+        let texture = this.cache.get(image);
+        let uvs = texture.getUVs(sx + "," + sy + "," + sw + "," + sh);
         this.currentCompositor.addQuad(texture, dx, dy, dw, dh, uvs[0], uvs[1], uvs[2], uvs[3], this.currentTint.toUint32(this.getGlobalAlpha()));
     }
 
@@ -425,7 +462,8 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @see WebGLRenderer#createPattern
      */
     drawPattern(pattern, x, y, width, height) {
-        var uvs = pattern.getUVs("0,0," + width + "," + height);
+        let uvs = pattern.getUVs("0,0," + width + "," + height);
+        this.setCompositor("quad");
         this.currentCompositor.addQuad(pattern, x, y, width, height, uvs[0], uvs[1], uvs[2], uvs[3], this.currentTint.toUint32(this.getGlobalAlpha()));
     }
 
@@ -433,9 +471,10 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * Returns the WebGL Context object of the given canvas element
      * @param {HTMLCanvasElement} canvas
      * @param {boolean} [transparent=false] - use true to enable transparency
+     * @param {boolean} [depth=false] - use true to enable depth buffer testing
      * @returns {WebGLRenderingContext}
      */
-    getContextGL(canvas, transparent = false) {
+    getContextGL(canvas, transparent = false, depth = false) {
         if (typeof canvas === "undefined" || canvas === null) {
             throw new Error(
                 "You must pass a canvas element in order to create " +
@@ -443,10 +482,10 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
             );
         }
 
-        var attr = {
+        let attr = {
             alpha : transparent,
             antialias : this.settings.antiAlias,
-            depth : false,
+            depth : depth,
             stencil: true,
             preserveDrawingBuffer : false,
             premultipliedAlpha: transparent ? this.settings.premultipliedAlpha : false,
@@ -454,7 +493,7 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
             failIfMajorPerformanceCaveat : this.settings.failIfMajorPerformanceCaveat
         };
 
-        var gl;
+        let gl;
 
         // attempt to create a WebGL2 context if requested
         if (this.settings.preferWebGL1 === false) {
@@ -532,28 +571,14 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
         }
     }
 
-    /**
-     * return a reference to the font 2d Context
-     * @ignore
-     */
-    getFontContext() {
-        if (typeof this.fontContext2D === "undefined" ) {
-            // warn the end user about performance impact
-            console.warn("[WebGL Renderer] WARNING : Using Standard me.Text with WebGL will severly impact performances !");
-            // create the font texture if not done yet
-            this.createFontTexture(this.cache);
-        }
-        return this.fontContext2D;
-    }
-
     /**
      * restores the canvas context
      */
     restore() {
         // do nothing if there is no saved states
         if (this._matrixStack.length !== 0) {
-            var color = this._colorStack.pop();
-            var matrix = this._matrixStack.pop();
+            let color = this._colorStack.pop();
+            let matrix = this._matrixStack.pop();
 
             // restore the previous context
             this.currentColor.copy(color);
@@ -642,7 +667,7 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {Color|string} color - css color string.
      */
     setColor(color) {
-        var alpha = this.currentColor.alpha;
+        let alpha = this.currentColor.alpha;
         this.currentColor.copy(color);
         this.currentColor.alpha *= alpha;
     }
@@ -666,10 +691,7 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [fill=false]
      */
     strokeArc(x, y, radius, start, end, antiClockwise = false, fill = false) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.path2D.beginPath();
         this.path2D.arc(x, y, radius, start, end, antiClockwise);
         if (fill === false) {
@@ -702,15 +724,12 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [fill=false] - also fill the shape with the current color if true
      */
     strokeEllipse(x, y, w, h, fill = false) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.path2D.beginPath();
         this.path2D.ellipse(x, y, w, h, 0, 0, 360);
         this.path2D.closePath();
         if (fill === false) {
-            this.currentCompositor.drawVertices(this.gl.LINE_LOOP, this.path2D.points);
+            this.currentCompositor.drawVertices(this.gl.LINE_STRIP, this.path2D.points);
         } else {
             this.currentCompositor.drawVertices(this.gl.TRIANGLES, this.path2D.triangulatePath());
         }
@@ -735,14 +754,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {number} endY - the end y coordinate
      */
     strokeLine(startX, startY, endX, endY) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.path2D.beginPath();
         this.path2D.moveTo(startX, startY);
         this.path2D.lineTo(endX, endY);
-        this.currentCompositor.drawVertices(this.gl.LINE_STRIP, this.path2D.points);
+        this.currentCompositor.drawVertices(this.gl.LINES, this.path2D.points);
     }
 
 
@@ -763,22 +779,19 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [fill=false] - also fill the shape with the current color if true
      */
     strokePolygon(poly, fill = false) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.translate(poly.pos.x, poly.pos.y);
         this.path2D.beginPath();
-        this.path2D.moveTo(poly.points[0].x, poly.points[0].y);
-        var point;
-        for (var i = 1; i < poly.points.length; i++) {
-            point = poly.points[i];
-            this.path2D.lineTo(point.x, point.y);
+
+        let points = poly.points;
+        for (let i = 1; i < points.length; i++) {
+            this.path2D.moveTo(points[i-1].x, points[i-1].y);
+            this.path2D.lineTo(points[i].x, points[i].y);
         }
-        this.path2D.lineTo(poly.points[0].x, poly.points[0].y);
+        this.path2D.lineTo(points[points.length - 1].x, points[points.length - 1].y);
         this.path2D.closePath();
         if (fill === false) {
-            this.currentCompositor.drawVertices(this.gl.LINE_LOOP, this.path2D.points);
+            this.currentCompositor.drawVertices(this.gl.LINES, this.path2D.points);
         } else {
             // draw all triangles
             this.currentCompositor.drawVertices(this.gl.TRIANGLES, this.path2D.triangulatePath());
@@ -803,14 +816,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [fill=false] - also fill the shape with the current color if true
      */
     strokeRect(x, y, width, height, fill = false) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.path2D.beginPath();
         this.path2D.rect(x, y, width, height);
         if (fill === false) {
-            this.currentCompositor.drawVertices(this.gl.LINE_LOOP, this.path2D.points);
+            this.currentCompositor.drawVertices(this.gl.LINES, this.path2D.points);
         } else {
             this.currentCompositor.drawVertices(this.gl.TRIANGLES, this.path2D.triangulatePath());
         }
@@ -837,14 +847,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [fill=false] - also fill the shape with the current color if true
      */
     strokeRoundRect(x, y, width, height, radius, fill = false) {
-        if (this.getGlobalAlpha() < 1 / 255) {
-            // Fast path: don't draw fully transparent
-            return;
-        }
+        this.setCompositor("primitive");
         this.path2D.beginPath();
         this.path2D.roundRect(x, y, width, height, radius);
         if (fill === false) {
-            this.currentCompositor.drawVertices(this.gl.LINE_LOOP, this.path2D.points);
+            this.currentCompositor.drawVertices(this.gl.LINE_STRIP, this.path2D.points);
         } else {
             this.path2D.closePath();
             this.currentCompositor.drawVertices(this.gl.TRIANGLES, this.path2D.triangulatePath());
@@ -898,11 +905,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {Matrix2d} mat2d - Matrix to transform by
      */
     transform(mat2d) {
-        var currentTransform = this.currentTransform;
+        let currentTransform = this.currentTransform;
         currentTransform.multiply(mat2d);
         if (this.settings.subPixel === false) {
             // snap position values to pixel grid
-            var a = currentTransform.toArray();
+            let a = currentTransform.toArray();
             a[6] |= 0;
             a[7] |= 0;
         }
@@ -914,11 +921,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {number} y
      */
     translate(x, y) {
-        var currentTransform = this.currentTransform;
+        let currentTransform = this.currentTransform;
         currentTransform.translate(x, y);
         if (this.settings.subPixel === false) {
             // snap position values to pixel grid
-            var a = currentTransform.toArray();
+            let a = currentTransform.toArray();
             a[6] |= 0;
             a[7] |= 0;
         }
@@ -936,11 +943,11 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {number} height
      */
     clipRect(x, y, width, height) {
-        var canvas = this.getCanvas();
-        var gl = this.gl;
+        let canvas = this.getCanvas();
+        let gl = this.gl;
         // if requested box is different from the current canvas size
         if (x !== 0 || y !== 0 || width !== canvas.width || height !== canvas.height) {
-            var currentScissor = this.currentScissor;
+            let currentScissor = this.currentScissor;
             if (gl.isEnabled(gl.SCISSOR_TEST)) {
                 // if same as the current scissor box do nothing
                 if (currentScissor[0] === x && currentScissor[1] === y &&
@@ -979,7 +986,7 @@ import { isPowerOfTwo, nextPowerOfTwo } from "./../../math/math.js";
      * @param {boolean} [invert=false] - either the given shape should define what is visible (default) or the opposite
      */
     setMask(mask, invert = false) {
-        var gl = this.gl;
+        let gl = this.gl;
 
         // flush the compositor
         this.flush();