Merge branch 'master' into containers

Author: bitnenfer

CHANGELOG.md

@@ -34,6 +34,7 @@ being passed to the simulation. The default value is 1 to remain consistent with
 * BaseSound `setRate` and `setDetune` from the 3.3.0 release have moved to the WebAudioSound and HTML5AudioSound classes respectively, as they each handle the values differently.
 * The file `InteractiveObject.js` has been renamed to `CreateInteractiveObject.js` to more accurately reflect what it does and to avoid type errors in the docs.
 * Renamed the Camera Controls module exports for `Fixed` to `FixedKeyControl` and `Smoothed` to `SmoothedKeyControl` to match the class names. Fix #3463 (thanks @seivan)
+* The ComputedSize Component now has `setSize` and `setDisplaySize` methods. This component is used for Game Objects that have a non-texture based size.
 
 
 

src/boot/Game.js

@@ -115,7 +115,7 @@ var Game = new Class({
          * An Event Emitter which is used to broadcast game-level events from the global systems.
          *
          * @name Phaser.Game#events
-         * @type {EventEmitter}
+         * @type {Phaser.Events.EventEmitter}
          * @since 3.0.0
          */
         this.events = new EventEmitter();

src/cache/BaseCache.js

@@ -42,7 +42,7 @@ var BaseCache = new Class({
          * An instance of EventEmitter used by the cache to emit related events.
          *
          * @name Phaser.Cache.BaseCache#events
-         * @type {EventEmitter}
+         * @type {Phaser.Events.EventEmitter}
          * @since 3.0.0
          */
         this.events = new EventEmitter();

src/data/DataManager.js

@@ -27,7 +27,7 @@ var Class = require('../utils/Class');
  * @since 3.0.0
  *
  * @param {*} parent - [description]
- * @param {EventEmitter} eventEmitter - [description]
+ * @param {Phaser.Events.EventEmitter} eventEmitter - [description]
  */
 var DataManager = new Class({
 
@@ -48,7 +48,7 @@ var DataManager = new Class({
          * [description]
          *
          * @name Phaser.Data.DataManager#events
-         * @type {EventEmitter}
+         * @type {Phaser.Events.EventEmitter}
          * @since 3.0.0
          */
         this.events = eventEmitter;

src/gameobjects/blitter/Blitter.js

@@ -90,7 +90,7 @@ var Blitter = new Class({
          * [description]
          *
          * @name Phaser.GameObjects.Blitter#children
-         * @type {Phaser.Structs.List.<Phaser.GameObjects.Blitter.Blitter>}
+         * @type {Phaser.Structs.List.<Phaser.GameObjects.Blitter.Bob>}
          * @since 3.0.0
          */
         this.children = new List();

src/gameobjects/components/Alpha.js

@@ -19,11 +19,59 @@ var _FLAG = 2; // 0010
 
 var Alpha = {
 
+    /**
+     * Private internal value. Holds the global alpha value.
+     * 
+     * @name Phaser.GameObjects.Components.Alpha#_alpha
+     * @type {float}
+     * @private
+     * @default 1
+     * @since 3.0.0
+     */
     _alpha: 1,
 
+    /**
+     * Private internal value. Holds the top-left alpha value.
+     * 
+     * @name Phaser.GameObjects.Components.Alpha#_alphaTL
+     * @type {float}
+     * @private
+     * @default 1
+     * @since 3.0.0
+     */
     _alphaTL: 1,
+
+    /**
+     * Private internal value. Holds the top-right alpha value.
+     * 
+     * @name Phaser.GameObjects.Components.Alpha#_alphaTR
+     * @type {float}
+     * @private
+     * @default 1
+     * @since 3.0.0
+     */
     _alphaTR: 1,
+
+    /**
+     * Private internal value. Holds the bottom-left alpha value.
+     * 
+     * @name Phaser.GameObjects.Components.Alpha#_alphaBL
+     * @type {float}
+     * @private
+     * @default 1
+     * @since 3.0.0
+     */
     _alphaBL: 1,
+
+    /**
+     * Private internal value. Holds the bottom-right alpha value.
+     * 
+     * @name Phaser.GameObjects.Components.Alpha#_alphaBR
+     * @type {float}
+     * @private
+     * @default 1
+     * @since 3.0.0
+     */
     _alphaBR: 1,
 
     /**

src/gameobjects/components/BlendMode.js

@@ -16,6 +16,15 @@ var BlendModes = require('../../renderer/BlendModes');
 
 var BlendMode = {
 
+    /**
+     * Private internal value. Holds the current blend mode.
+     * 
+     * @name Phaser.GameObjects.Components.BlendMode#_blendMode
+     * @type {integer}
+     * @private
+     * @default 0
+     * @since 3.0.0
+     */
     _blendMode: BlendModes.NORMAL,
 
     /**

src/gameobjects/components/ComputedSize.js

@@ -5,7 +5,7 @@
  */
 
 /**
- * Provides methods used for setting the blend mode of a Game Object.
+ * Provides methods used for calculating and setting the size of a non-Frame based Game Object.
  * Should be applied as a mixin and not used directly.
  * 
  * @name Phaser.GameObjects.Components.ComputedSize
@@ -74,6 +74,45 @@ var ComputedSize = {
             this.scaleY = value / this.height;
         }
 
+    },
+
+    /**
+     * Sets the size of this Game Object.
+     * 
+     * @method Phaser.GameObjects.Components.ComputedSize#setSize
+     * @since 3.4.0
+     *
+     * @param {number} width - The width of this Game Object.
+     * @param {number} height - The height of this Game Object.
+     * 
+     * @return {Phaser.GameObjects.GameObject} This Game Object instance.
+     */
+    setSize: function (width, height)
+    {
+        this.width = width;
+        this.height = height;
+
+        return this;
+    },
+
+    /**
+     * Sets the display size of this Game Object.
+     * Calling this will adjust the scale.
+     * 
+     * @method Phaser.GameObjects.Components.ComputedSize#setDisplaySize
+     * @since 3.4.0
+     *
+     * @param {number} width - The width of this Game Object.
+     * @param {number} height - The height of this Game Object.
+     * 
+     * @return {Phaser.GameObjects.GameObject} This Game Object instance.
+     */
+    setDisplaySize: function (width, height)
+    {
+        this.displayWidth = width;
+        this.displayHeight = height;
+
+        return this;
     }
 
 };

src/gameobjects/components/Depth.js

@@ -14,6 +14,15 @@
 
 var Depth = {
 
+    /**
+     * Private internal value. Holds the depth of the Game Object.
+     * 
+     * @name Phaser.GameObjects.Components.Depth#_depth
+     * @type {integer}
+     * @private
+     * @default 0
+     * @since 3.0.0
+     */
     _depth: 0,
 
     /**

src/gameobjects/components/MatrixStack.js

@@ -55,7 +55,7 @@ var MatrixStack = {
     initMatrixStack: function ()
     {
         this.matrixStack = new Float32Array(6000); // up to 1000 matrices
-        this.currentMatrix = new Float32Array([ 1.0, 0.0, 0.0, 1.0, 0.0, 0.0 ]);
+        this.currentMatrix = new Float32Array([ 1, 0, 0, 1, 0, 0 ]);
         this.currentMatrixIndex = 0;
 
         return this;
@@ -126,7 +126,7 @@ var MatrixStack = {
      */
     loadIdentity: function ()
     {
-        this.setTransform(1.0, 0.0, 0.0, 1.0, 0.0, 0.0);
+        this.setTransform(1, 0, 0, 1, 0, 0);
 
         return this;
     },