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

Author: photonstorm

src/boot/Config.js

@@ -31,15 +31,13 @@ var ValueToColor = require('../display/color/ValueToColor');
 /**
  * Config object containing various sound settings.
  *
- * @typedef {object} SoundConfig
+ * @typedef {object} AudioConfig
  *
- * @property {boolean} [mute=false] - Boolean indicating whether the sound should be muted or not.
- * @property {number} [volume=1] - A value between 0 (silence) and 1 (full volume).
- * @property {number} [rate=1] - Defines the speed at which the sound should be played.
- * @property {number} [detune=0] - Represents detuning of sound in [cents](https://en.wikipedia.org/wiki/Cent_%28music%29).
- * @property {number} [seek=0] - Position of playback for this sound, in seconds.
- * @property {boolean} [loop=false] - Whether or not the sound or current sound marker should loop.
- * @property {number} [delay=0] - Time, in seconds, that should elapse before the sound actually starts its playback.
+ * @property {boolean} [disableWebAudio=false] - Use HTML5 Audio instead of Web Audio.
+ * @property {AudioContext} [context] - An existing Web Audio context.
+ * @property {boolean} [noAudio=false] - Disable all audio output.
+ *
+ * @see Phaser.Sound.SoundManagerCreator
  */
 
 /**
@@ -481,7 +479,7 @@ var Config = new Class({
         this.disableContextMenu = GetValue(config, 'disableContextMenu', false);
 
         /**
-         * @const {SoundConfig} Phaser.Boot.Config#audio - The Audio Configuration object.
+         * @const {AudioConfig} Phaser.Boot.Config#audio - The Audio Configuration object.
          */
         this.audio = GetValue(config, 'audio');
 

src/gameobjects/bitmaptext/static/BitmapText.js

@@ -68,12 +68,12 @@ var Render = require('./BitmapTextRender');
  *
  * To create a BitmapText data files you need a 3rd party app such as:
  *
- * BMFont (Windows, free): http://www.angelcode.com/products/bmfont/
- * Glyph Designer (OS X, commercial): http://www.71squared.com/en/glyphdesigner
- * Littera (Web-based, free): http://kvazars.com/littera/
+ * BMFont (Windows, free): {@link http://www.angelcode.com/products/bmfont/|http://www.angelcode.com/products/bmfont/}
+ * Glyph Designer (OS X, commercial): {@link http://www.71squared.com/en/glyphdesigner|http://www.71squared.com/en/glyphdesigner}
+ * Littera (Web-based, free): {@link http://kvazars.com/littera/|http://kvazars.com/littera/}
  *
  * For most use cases it is recommended to use XML. If you wish to use JSON, the formatting should be equal to the result of
- * converting a valid XML file through the popular X2JS library. An online tool for conversion can be found here: http://codebeautify.org/xmltojson
+ * converting a valid XML file through the popular X2JS library. An online tool for conversion can be found here: {@link http://codebeautify.org/xmltojson|http://codebeautify.org/xmltojson}
  *
  * @class BitmapText
  * @extends Phaser.GameObjects.GameObject

src/gameobjects/text/TextStyle.js

@@ -537,9 +537,9 @@ var TextStyle = new Class({
 
             var i = 0;
 
-            this.fontStyle = (fontSplit.length > 2) ? fontSplit[i++] : '';
-            this.fontSize = fontSplit[i++] || '16px';
-            this.fontFamily = fontSplit[i++] || 'Courier';
+            fontStyle = (fontSplit.length > 2) ? fontSplit[i++] : '';
+            fontSize = fontSplit[i++] || '16px';
+            fontFamily = fontSplit[i++] || 'Courier';
         }
 
         if (fontFamily !== this.fontFamily || fontSize !== this.fontSize || fontStyle !== this.fontStyle)

src/renderer/webgl/pipelines/ForwardDiffuseLightPipeline.js

@@ -48,6 +48,15 @@ var ForwardDiffuseLightPipeline = new Class({
          * @since 3.11.0
          */
         this.defaultNormalMap;
+
+        /**
+         * Inverse rotation matrix for normal map rotation fixing.
+         */
+        this.inverseRotationMatrix = new Float32Array([
+            1, 0, 0,
+            0, 1, 0,
+            0, 0, 1
+        ]);
     },
 
     /**
@@ -244,6 +253,7 @@ var ForwardDiffuseLightPipeline = new Class({
         }
 
         this.setTexture2D(normalTexture.glTexture, 1);
+        this.setNormalMapRotation(rotation);
 
         var camMatrix = this._tempMatrix1;
         var spriteMatrix = this._tempMatrix2;
@@ -412,6 +422,33 @@ var ForwardDiffuseLightPipeline = new Class({
         this.renderer.setPipeline(gameObject.defaultPipeline);
     },
 
+    /**
+     * Rotates the normal map vectors inversely by the given angle.
+     * Only works in 2D space.
+     * @param {number} rotation rotation in angles
+     */
+    setNormalMapRotation: function (rotation)
+    {
+        var inverseRotationMatrix = this.inverseRotationMatrix;
+        if (rotation)
+        {
+            var rot = -rotation;
+            var c = Math.cos(rot);
+            var s = Math.sin(rot);
+
+            inverseRotationMatrix[1] = s;
+            inverseRotationMatrix[3] = -s;
+            inverseRotationMatrix[0] = inverseRotationMatrix[4] = c;
+        }
+        else
+        {
+            inverseRotationMatrix[0] = inverseRotationMatrix[4] = 1;
+            inverseRotationMatrix[1] = inverseRotationMatrix[3] = 0;
+        }
+
+        this.renderer.setMatrix3(this.program, 'uInverseRotationMatrix', false, inverseRotationMatrix);
+    },
+
     /**
      * Takes a Sprite Game Object, or any object that extends it, which has a normal texture and adds it to the batch.
      *
@@ -437,6 +474,7 @@ var ForwardDiffuseLightPipeline = new Class({
             this.renderer.setPipeline(this);
 
             this.setTexture2D(normalTexture.glTexture, 1);
+            this.setNormalMapRotation(sprite.rotation);
 
             TextureTintPipeline.prototype.batchSprite.call(this, sprite, camera, parentTransformMatrix);
         }

src/renderer/webgl/shaders/ForwardDiffuse-frag.js

@@ -19,6 +19,7 @@ module.exports = [
     'uniform sampler2D uNormSampler;',
     'uniform vec3 uAmbientLightColor;',
     'uniform Light uLights[kMaxLights];',
+    'uniform mat3 uInverseRotationMatrix;',
     '',
     'varying vec2 outTexCoord;',
     'varying vec4 outTint;',
@@ -28,7 +29,7 @@ module.exports = [
     '    vec3 finalColor = vec3(0.0, 0.0, 0.0);',
     '    vec4 color = texture2D(uMainSampler, outTexCoord) * vec4(outTint.rgb * outTint.a, outTint.a);',
     '    vec3 normalMap = texture2D(uNormSampler, outTexCoord).rgb;',
-    '    vec3 normal = normalize(vec3(normalMap * 2.0 - 1.0));',
+    '    vec3 normal = normalize(uInverseRotationMatrix * vec3(normalMap * 2.0 - 1.0));',
     '    vec2 res = vec2(min(uResolution.x, uResolution.y)) * uCamera.w;',
     '',
     '    for (int index = 0; index < kMaxLights; ++index)',

src/renderer/webgl/shaders/src/ForwardDiffuse.frag

@@ -18,6 +18,7 @@ uniform sampler2D uMainSampler;
 uniform sampler2D uNormSampler;
 uniform vec3 uAmbientLightColor;
 uniform Light uLights[kMaxLights];
+uniform mat3 uInverseRotationMatrix;
 
 varying vec2 outTexCoord;
 varying vec4 outTint;
@@ -27,7 +28,7 @@ void main()
     vec3 finalColor = vec3(0.0, 0.0, 0.0);
     vec4 color = texture2D(uMainSampler, outTexCoord) * vec4(outTint.rgb * outTint.a, outTint.a);
     vec3 normalMap = texture2D(uNormSampler, outTexCoord).rgb;
-    vec3 normal = normalize(vec3(normalMap * 2.0 - 1.0));
+    vec3 normal = normalize(uInverseRotationMatrix * vec3(normalMap * 2.0 - 1.0));
     vec2 res = vec2(min(uResolution.x, uResolution.y)) * uCamera.w;
 
     for (int index = 0; index < kMaxLights; ++index)

src/scene/Scene.js

@@ -242,6 +242,18 @@ var Scene = new Class({
          * @since 3.0.0
          */
         this.matter;
+
+        if(typeof PLUGIN_FBINSTANT){
+            /**
+             * A scene level Facebook Instant Games Plugin.
+             * This property will only be available if defined in the Scene Injection Map, the plugin is installed and configured.
+             *
+             * @name Phaser.Scene#facebook
+             * @type {Phaser.FacebookInstantGamesPlugin}
+             * @since 3.12.0
+             */
+            this.facebook;
+        }
     },
 
     /**

src/scene/Systems.js

@@ -58,7 +58,7 @@ var Systems = new Class({
              * The Facebook Instant Games Plugin.
              *
              * @name Phaser.Scenes.Systems#facebook
-             * @type {any}
+             * @type {Phaser.FacebookInstantGamesPlugin}
              * @since 3.12.0
              */
             this.facebook;