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

Author: JasonHK

CHANGELOG.md

@@ -7,10 +7,14 @@
 * `Line.GetEasedPoints` is a new function that will take a Line, a quantity, and an ease function, and returns an array of points where each point has been spaced out across the length of the Line based on the ease function given.
 * `XHRSettings.withCredentials` is a new boolean property that controls the `withCredentials` setting of the XHR Request made by the Loader. It indicates whether or not cross-site Access-Control requests should be made using credentials such as cookies, authorization headers or TLS client certificates. You can set this on a per-file basis, or global in the Game Config.
 * `Config.loaderWithCredentials` is the new global setting for `XHRSettings.withCredentials`.
+* `Camera.renderToGame` is a new property used in conjunction with `renderToTexture`. It controls if the Camera should still render to the Game canvas after rendering to its own texture or not. By default, it will render to both, but you can now toggle this at run-time.
+* `Camera.setRenderToTexture` has a new optional parameter `renderToGame` which sets the `Camera.renderToGame` property, controlling if the Camera should render to both its texture and the Game canvas, or just its texture.
 
 ### Updates
 
 * `XHRLoader` will now use the `XHRSettings.withCredentials` as set in the file or global loader config.
+* `Animation.setCurrentFrame` will no longer try to call `setOrigin` or `updateDisplayOrigin` if the Game Object doesn't have the Origin component, preventing unknown function errors.
+* `MatterTileBody` now extends `EventEmitter`, meaning you can listen to collision events from Tiles directly and it will no longer throw errors about `gameObject.emit` not working. Fix #4967 (thanks @reinildo)
 
 ### Bug Fixes
 
@@ -20,7 +24,7 @@
 
 My thanks to the following for helping with the Phaser 3 Examples, Docs and TypeScript definitions, either by reporting errors, fixing them or helping author the docs:
 
-
+@JasonHK
 
 ## Version 3.22 - Kohaku - January 15th 2020
 

README.md

@@ -2,6 +2,11 @@
 
 ![Phaser Header](https://phaser.io/images/github/300/phaser-header.png "Phaser 3 Header Banner")
 
+[![Discord chat](https://img.shields.io/discord/244245946873937922?style=for-the-badge)](https://discord.gg/phaser)
+[![Twitter Follow](https://img.shields.io/twitter/follow/phaser_?style=for-the-badge)](https://twitter.com/phaser_)
+![GitHub All Releases](https://img.shields.io/github/downloads/photonstorm/phaser/total?style=for-the-badge)
+![npm](https://img.shields.io/npm/dy/phaser?label=npm&style=for-the-badge)
+
 Phaser is a fast, free, and fun open source HTML5 game framework that offers WebGL and Canvas rendering across desktop and mobile web browsers. Games can be compiled to iOS, Android and native apps by using 3rd party tools. You can use JavaScript or TypeScript for development.
 
 Along with the fantastic open source community, Phaser is actively developed and maintained by [Photon Storm](http://www.photonstorm.com). As a result of rapid support, and a developer friendly API, Phaser is currently one of the [most starred](https://github.com/collections/javascript-game-engines) game frameworks on GitHub.

src/cameras/2d/Camera.js

@@ -208,6 +208,24 @@ var Camera = new Class({
          */
         this.renderToTexture = false;
 
+        /**
+         * If this Camera is rendering to a texture (via `setRenderToTexture`) then you
+         * have the option to control if it should also render to the Game canvas as well.
+         * 
+         * By default, a Camera will render both to its texture and to the Game canvas.
+         * 
+         * However, if you set ths property to `false` it will only render to the texture
+         * and skip rendering to the Game canvas.
+         * 
+         * Setting this property if the Camera isn't rendering to a texture has no effect.
+         *
+         * @name Phaser.Cameras.Scene2D.Camera#renderToGame
+         * @type {boolean}
+         * @default true
+         * @since 3.23.0
+         */
+        this.renderToGame = true;
+
         /**
          * If this Camera has been set to render to a texture then this holds a reference
          * to the HTML Canvas Element that the Camera is drawing to.
@@ -304,6 +322,9 @@ var Camera = new Class({
      *
      * You should not enable this unless you plan on actually using the texture it creates
      * somehow, otherwise you're just doubling the work required to render your game.
+     * 
+     * If you only require the Camera to render to a texture, and not also to the Game,
+     * them set the `renderToGame` parameter to `false`.
      *
      * To temporarily disable rendering to a texture, toggle the `renderToTexture` boolean.
      *
@@ -314,11 +335,14 @@ var Camera = new Class({
      * @since 3.13.0
      *
      * @param {(string|Phaser.Renderer.WebGL.WebGLPipeline)} [pipeline] - An optional WebGL Pipeline to render with, can be either a string which is the name of the pipeline, or a pipeline reference.
+     * @param {boolean} [renderToGame=true] - If you do not need the Camera to still render to the Game, set this parameter to `false`.
      *
      * @return {Phaser.Cameras.Scene2D.Camera} This Camera instance.
      */
-    setRenderToTexture: function (pipeline)
+    setRenderToTexture: function (pipeline, renderToGame)
     {
+        if (renderToGame === undefined) { renderToGame = true; }
+
         var renderer = this.scene.sys.game.renderer;
 
         if (renderer.gl)
@@ -333,6 +357,7 @@ var Camera = new Class({
         }
 
         this.renderToTexture = true;
+        this.renderToGame = renderToGame;
 
         if (pipeline)
         {

src/gameobjects/components/Animation.js

@@ -1020,13 +1020,16 @@ var Animation = new Class({
 
         gameObject.setSizeToFrame();
 
-        if (animationFrame.frame.customPivot)
+        if (gameObject._originComponent)
         {
-            gameObject.setOrigin(animationFrame.frame.pivotX, animationFrame.frame.pivotY);
-        }
-        else
-        {
-            gameObject.updateDisplayOrigin();
+            if (animationFrame.frame.customPivot)
+            {
+                gameObject.setOrigin(animationFrame.frame.pivotX, animationFrame.frame.pivotY);
+            }
+            else
+            {
+                gameObject.updateDisplayOrigin();
+            }
         }
 
         return gameObject;