melonjs 11.0.0 → 12.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "melonjs",
-  "version": "11.0.0",
+  "version": "12.0.0",
   "description": "melonJS Game Engine",
   "homepage": "http://www.melonjs.org/",
   "keywords": [
@@ -55,7 +55,7 @@
   ],
   "dependencies": {
     "@teppeis/multimaps": "^2.0.0",
-    "core-js": "^3.23.2",
+    "core-js": "^3.23.3",
     "earcut": "2.2.3",
     "eventemitter3": "^4.0.7",
     "howler": "2.2.3"
@@ -63,7 +63,8 @@
   "devDependencies": {
     "@melonjs/webdoc-theme": "^1.1.1",
     "@rollup/plugin-buble": "^0.21.3",
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^22.0.1",
+    "@rollup/plugin-image": "^2.1.1",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
     "@types/offscreencanvas": "^2019.7.0",

package/src/audio/audio.js

@@ -11,31 +11,31 @@ import loader from "./../loader/loader.js";
  * audio channel list
  * @ignore
  */
-var audioTracks = {};
+let audioTracks = {};
 
 /**
  * current active track
  * @ignore
  */
-var current_track_id = null;
+let current_track_id = null;
 
 /**
  * error retry counter
  * @ignore
  */
-var retry_counter = 0;
+let retry_counter = 0;
 
 /**
  * list of active audio formats
  * @ignore
  */
-var audioExts = [];
+let audioExts = [];
 
 /**
  * event listener callback on load error
  * @ignore
  */
-var soundLoadError = function (sound_name, onerror_cb) {
+let soundLoadError = function (sound_name, onerror_cb) {
     // check the retry counter
     if (retry_counter++ > 3) {
         // something went wrong

package/src/loader/loadingscreen.js

@@ -1,10 +1,10 @@
 import { world, viewport } from "./../game.js";
 import { renderer } from "./../video/video.js";
 import * as event from "./../system/event.js";
-import {nextPowerOfTwo} from "./../math/math.js";
-import pool from "./../system/pooling.js";
 import Renderable from "./../renderable/renderable.js";
+import Sprite from "./../renderable/sprite.js";
 import Stage from "./../state/stage.js";
+import melonjs_logo from "./melonjs_logo.png";
 
 
 // a basic progress bar object
@@ -61,70 +61,22 @@ class ProgressBar extends Renderable {
 
 };
 
-// the melonJS Logo
-class IconLogo extends Renderable {
-    /**
-     * @ignore
-     */
+/**
+ * the melonJS Logo
+ * @ignore
+ */
+class IconLogo extends Sprite {
     constructor(x, y) {
-        super(x, y, 100, 85);
-
-        this.iconTexture = pool.pull("CanvasTexture",
-            renderer.WebGLVersion > 1 ? this.width : nextPowerOfTwo(this.width),
-            renderer.WebGLVersion > 1 ? this.height : nextPowerOfTwo(this.height),
-            { offscreenCanvas: true }
-        );
-
-        var context = this.iconTexture.context;
-
-        context.beginPath();
-        context.moveTo(0.7, 48.9);
-        context.bezierCurveTo(10.8, 68.9, 38.4, 75.8, 62.2, 64.5);
-        context.bezierCurveTo(86.1, 53.1, 97.2, 27.7, 87.0, 7.7);
-        context.lineTo(87.0, 7.7);
-        context.bezierCurveTo(89.9, 15.4, 73.9, 30.2, 50.5, 41.4);
-        context.bezierCurveTo(27.1, 52.5, 5.2, 55.8, 0.7, 48.9);
-        context.lineTo(0.7, 48.9);
-        context.closePath();
-        context.fillStyle = "rgb(255, 255, 255)";
-        context.fill();
-
-        context.beginPath();
-        context.moveTo(84.0, 7.0);
-        context.bezierCurveTo(87.6, 14.7, 72.5, 30.2, 50.2, 41.6);
-        context.bezierCurveTo(27.9, 53.0, 6.9, 55.9, 3.2, 48.2);
-        context.bezierCurveTo(-0.5, 40.4, 14.6, 24.9, 36.9, 13.5);
-        context.bezierCurveTo(59.2, 2.2, 80.3, -0.8, 84.0, 7.0);
-        context.lineTo(84.0, 7.0);
-        context.closePath();
-        context.lineWidth = 5.3;
-        context.strokeStyle = "rgb(255, 255, 255)";
-        context.lineJoin = "miter";
-        context.miterLimit = 4.0;
-        context.stroke();
-
-        this.anchorPoint.set(0.5, 0.5);
-    }
-
-    /**
-     * @ignore
-     */
-    draw(renderer) {
-        renderer.drawImage(this.iconTexture.canvas, renderer.getWidth() / 2, this.pos.y);
+        // TODO: create a sprite or texture from a Base64 encoded image
+        var image = new Image();
+        image.src = melonjs_logo;
+        super(x, y, {
+            image : image,
+            framewidth : 256,
+            frameheight : 256
+        });
     }
-
-    /**
-     * Destroy function
-     * @ignore
-     */
-    destroy() {
-        // call the parent destroy method
-        super.destroy(arguments);
-        pool.push(this.iconTexture);
-        this.iconTexture = undefined;
-    }
-};
-
+}
 
 /**
  * a default loading screen
@@ -152,47 +104,9 @@ class DefaultLoadingScreen extends Stage {
         // melonJS logo
         world.addChild(new IconLogo(
             renderer.getWidth() / 2,
-            (renderer.getHeight() / 2) - (barHeight * 2) - 35
+            (renderer.getHeight() / 2)
 
         ), 2);
-
-        var logo1 = pool.pull("Text",
-            renderer.getWidth() / 2,
-            (renderer.getHeight() / 2) + 16, {
-                font: "century gothic",
-                size: 32,
-                fillStyle: "white",
-                textAlign: "left",
-                textBaseline : "top",
-                text: "melon",
-                offScreenCanvas: renderer.WebGLVersion >= 1
-            }
-        );
-        logo1.anchorPoint.set(0, 0);
-
-        var logo2 = pool.pull("Text",
-            renderer.getWidth() / 2,
-            (renderer.getHeight() / 2) + 16, {
-                font: "century gothic",
-                size: 32,
-                fillStyle: "#55aa00",
-                textAlign: "left",
-                textBaseline : "top",
-                bold: true,
-                text: "JS",
-                offScreenCanvas: renderer.WebGLVersion >= 1
-            }
-        );
-        logo2.anchorPoint.set(0, 0);
-
-        // adjust position of both text
-        var text_width = logo1.getBounds().width + logo2.getBounds().width;
-        logo1.pos.x = renderer.getWidth() / 2 - text_width / 2;
-        logo2.pos.x = logo1.pos.x + logo1.getBounds().width;
-
-        // melonJS text
-        world.addChild(logo1, 2);
-        world.addChild(logo2, 2);
     }
 };
 

package/src/polyfill/index.js

@@ -1,6 +1,10 @@
 // https://github.com/melonjs/melonJS/issues/1092
 import "core-js/proposals/global-this";
 
+// es10 string trim functions
+import "core-js/es/string/trim-left";
+import "core-js/es/string/trim-right";
+
 // "built-in" polyfills
 import "./console.js";
 import "./performance.js";

package/src/text/bitmaptext.js

@@ -1,5 +1,4 @@
 import Color from "./../math/color.js";
-import * as stringUtil from "./../utils/string.js";
 import pool from "./../system/pooling.js";
 import loader from "./../loader/loader.js";
 import Renderable from "./../renderable/renderable.js";
@@ -254,7 +253,7 @@ class BitmapText extends Renderable {
 
         for (var i = 0; i < this._text.length; i++) {
             x = lX;
-            var string = stringUtil.trimRight(this._text[i]);
+            var string = this._text[i].trimRight();
             // adjust x pos based on alignment value
             var stringWidth = this.metrics.lineWidth(string);
             switch (this.textAlign) {

package/src/text/text.js

@@ -1,7 +1,6 @@
 import Color from "./../math/color.js";
 import WebGLRenderer from "./../video/webgl/webgl_renderer.js";
 import { renderer as globalRenderer } from "./../video/video.js";
-import { trimRight } from "./../utils/string.js";
 import pool from "./../system/pooling.js";
 import Renderable from "./../renderable/renderable.js";
 import { nextPowerOfTwo } from "./../math/math.js";
@@ -423,7 +422,7 @@ class Text extends Renderable {
         setContextStyle(context, this, stroke);
 
         for (var i = 0; i < text.length; i++) {
-            var string = trimRight(text[i]);
+            var string = text[i].trimRight();
             // draw the string
             context[stroke ? "strokeText" : "fillText"](string, x, y);
             // add leading space

package/src/text/textmetrics.js

@@ -1,5 +1,4 @@
 import Bounds from "./../physics/bounds.js";
-import { trimRight } from "./../utils/string.js";
 import Text from "./text.js";
 import setContextStyle from "./textstyle.js";
 
@@ -92,7 +91,7 @@ class TextMetrics extends Bounds {
         this.width = this.height = 0;
 
         for (var i = 0; i < strings.length; i++) {
-            this.width = Math.max(this.lineWidth(trimRight(strings[i]), context), this.width);
+            this.width = Math.max(this.lineWidth(strings[i].trimRight(), context), this.width);
             this.height += this.lineHeight();
         }
         this.width = Math.ceil(this.width);

package/src/utils/string.js

@@ -15,30 +15,6 @@ export function capitalize(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 };
 
-/**
- * returns the string stripped of whitespace from the left.
- * @public
- * @memberof utils.string
- * @name trimLeft
- * @param {string} str the string to be trimmed
- * @returns {string} trimmed string
- */
-export function trimLeft(str) {
-    return str.replace(/^\s+/, "");
-};
-
-/**
- * returns the string stripped of whitespace from the right.
- * @public
- * @memberof utils.string
- * @name trimRight
- * @param {string} str the string to be trimmed
- * @returns {string} trimmed string
- */
-export function trimRight(str) {
-    return str.replace(/\s+$/, "");
-};
-
 /**
  * returns true if the given string contains a numeric integer or float value
  * @public