Merge branch 'master' of https://github.com/photonstorm/phaser

Author: photonstorm

src/gameobjects/container/ContainerCanvasRenderer.js

@@ -28,6 +28,8 @@ var ContainerCanvasRenderer = function (renderer, container, camera, parentMatri
         return;
     }
 
+    camera.addToRenderList(container);
+
     var transformMatrix = container.localTransform;
 
     if (parentMatrix)

src/gameobjects/container/ContainerWebGLRenderer.js

@@ -29,6 +29,8 @@ var ContainerWebGLRenderer = function (renderer, container, camera, parentMatrix
         return;
     }
 
+    camera.addToRenderList(container);
+
     var transformMatrix = container.localTransform;
 
     if (parentMatrix)

src/gameobjects/zone/Zone.js

@@ -286,9 +286,15 @@ var Zone = new Class({
      * @method Phaser.GameObjects.Zone#renderCanvas
      * @private
      * @since 3.0.0
+     * 
+     * @param {Phaser.Renderer.Canvas.CanvasRenderer} renderer - A reference to the current active Canvas renderer.
+     * @param {Phaser.GameObjects.Image} src - The Game Object being rendered in this call.
+     * @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
      */
-    renderCanvas: function ()
+    renderCanvas: function (renderer, src, camera, parentMatrix)
     {
+        camera.addToRenderList(src);
     },
 
     /**
@@ -297,9 +303,15 @@ var Zone = new Class({
      * @method Phaser.GameObjects.Zone#renderWebGL
      * @private
      * @since 3.0.0
+     * 
+     * @param {Phaser.Renderer.WebGL.WebGLRenderer} renderer - A reference to the current active WebGL renderer.
+     * @param {Phaser.GameObjects.Image} src - The Game Object being rendered in this call.
+     * @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
      */
-    renderWebGL: function ()
+    renderWebGL: function (renderer, src, camera, parentMatrix)
     {
+        camera.addToRenderList(src);
     }
 
 });

src/loader/filetypes/JSONFile.js

@@ -98,7 +98,18 @@ var JSONFile = new Class({
         {
             this.state = CONST.FILE_PROCESSING;
 
-            var json = JSON.parse(this.xhrLoader.responseText);
+            try
+            {
+                var json = JSON.parse(this.xhrLoader.responseText);
+            }
+            catch (e)
+            {
+                console.warn('Invalid JSON: ' + this.key);
+
+                this.onProcessError();
+
+                throw e;
+            }
 
             var key = this.config;
 

src/math/FromPercent.js

@@ -22,7 +22,7 @@ var FromPercent = function (percent, min, max)
 {
     percent = Clamp(percent, 0, 1);
 
-    return (max - min) * percent;
+    return (max - min) * percent + min;
 };
 
 module.exports = FromPercent;

src/physics/matter-js/components/SetBody.js

@@ -68,8 +68,8 @@ var SetBody = {
      * @method Phaser.Physics.Matter.Components.SetBody#setPolygon
      * @since 3.0.0
      *
-     * @param {number} sides - The number of sides the polygon will have.
      * @param {number} radius - The "radius" of the polygon, i.e. the distance from its center to any vertex. This is also the radius of its circumcircle.
+     * @param {number} sides - The number of sides the polygon will have.
      * @param {Phaser.Types.Physics.Matter.MatterBodyConfig} [options] - An optional Body configuration object that is used to set initial Body properties on creation.
      *
      * @return {Phaser.GameObjects.GameObject} This Game Object.

src/scene/Systems.js

@@ -391,6 +391,7 @@ var Systems = new Class({
      * Instructs the Scene to render itself via its Camera Manager to the renderer given.
      *
      * @method Phaser.Scenes.Systems#render
+     * @fires Phaser.Scenes.Events#PRE_RENDER
      * @fires Phaser.Scenes.Events#RENDER
      * @since 3.0.0
      *
@@ -402,6 +403,8 @@ var Systems = new Class({
 
         displayList.depthSort();
 
+        this.events.emit(Events.PRE_RENDER, renderer);
+
         this.cameras.render(renderer, displayList);
 
         this.events.emit(Events.RENDER, renderer);

src/scene/events/POST_UPDATE_EVENT.js

@@ -15,8 +15,9 @@
  * 2. [UPDATE]{@linkcode Phaser.Scenes.Events#event:UPDATE}
  * 3. The `Scene.update` method is called, if it exists
  * 4. [POST_UPDATE]{@linkcode Phaser.Scenes.Events#event:POST_UPDATE}
- * 5. [RENDER]{@linkcode Phaser.Scenes.Events#event:RENDER}
- * 
+ * 5. [PRE_RENDER]{@linkcode Phaser.Scenes.Events#event:PRE_RENDER}
+ * 6. [RENDER]{@linkcode Phaser.Scenes.Events#event:RENDER}
+ *
  * Listen to it from a Scene using `this.scene.events.on('postupdate', listener)`.
  * 
  * A Scene will only run its step if it is active.

src/scene/events/PRE_RENDER_EVENT.js

@@ -0,0 +1,31 @@
+/**
+ * @author       samme
+ * @copyright    2021 Photon Storm Ltd.
+ * @license      {@link https://opensource.org/licenses/MIT|MIT License}
+ */
+
+/**
+ * The Scene Systems Pre-Render Event.
+ *
+ * This event is dispatched by a Scene during the main game loop step.
+ *
+ * The event flow for a single step of a Scene is as follows:
+ *
+ * 1. [PRE_UPDATE]{@linkcode Phaser.Scenes.Events#event:PRE_UPDATE}
+ * 2. [UPDATE]{@linkcode Phaser.Scenes.Events#event:UPDATE}
+ * 3. The `Scene.update` method is called, if it exists
+ * 4. [POST_UPDATE]{@linkcode Phaser.Scenes.Events#event:POST_UPDATE}
+ * 5. [PRE_RENDER]{@linkcode Phaser.Scenes.Events#event:PRE_RENDER}
+ * 6. [RENDER]{@linkcode Phaser.Scenes.Events#event:RENDER}
+ *
+ * Listen to this event from a Scene using `this.scene.events.on('prerender', listener)`.
+ *
+ * A Scene will only render if it is visible.
+ * This event is dispatched after the Scene Display List is sorted and before the Scene is rendered.
+ *
+ * @event Phaser.Scenes.Events#PRE_RENDER
+ * @since 3.53.0
+ *
+ * @param {(Phaser.Renderer.Canvas.CanvasRenderer|Phaser.Renderer.WebGL.WebGLRenderer)} renderer - The renderer that rendered the Scene.
+ */
+module.exports = 'prerender';

src/scene/events/PRE_UPDATE_EVENT.js

@@ -15,8 +15,9 @@
  * 2. [UPDATE]{@linkcode Phaser.Scenes.Events#event:UPDATE}
  * 3. The `Scene.update` method is called, if it exists
  * 4. [POST_UPDATE]{@linkcode Phaser.Scenes.Events#event:POST_UPDATE}
- * 5. [RENDER]{@linkcode Phaser.Scenes.Events#event:RENDER}
- * 
+ * 5. [PRE_RENDER]{@linkcode Phaser.Scenes.Events#event:PRE_RENDER}
+ * 6. [RENDER]{@linkcode Phaser.Scenes.Events#event:RENDER}
+ *
  * Listen to it from a Scene using `this.scene.events.on('preupdate', listener)`.
  * 
  * A Scene will only run its step if it is active.