Solidified use of pixelArt mode

Author: photonstorm

src/boot/Config.js

@@ -324,24 +324,30 @@ var Config = new Class({
         var renderConfig = GetValue(config, 'render', config);
 
         /**
-         * @const {boolean} Phaser.Boot.Config#antialias - [description]
+         * @const {boolean} Phaser.Boot.Config#autoResize - [description]
          */
-        this.antialias = GetValue(renderConfig, 'antialias', true);
+        this.autoResize = GetValue(renderConfig, 'autoResize', false);
 
         /**
-         * @const {boolean} Phaser.Boot.Config#pixelArt - [description]
+         * @const {boolean} Phaser.Boot.Config#antialias - [description]
          */
-        this.pixelArt = GetValue(renderConfig, 'pixelArt', false);
+        this.antialias = GetValue(renderConfig, 'antialias', true);
 
         /**
-         * @const {boolean} Phaser.Boot.Config#autoResize - [description]
+         * @const {boolean} Phaser.Boot.Config#roundPixels - [description]
          */
-        this.autoResize = GetValue(renderConfig, 'autoResize', false);
+        this.roundPixels = GetValue(renderConfig, 'roundPixels', false);
 
         /**
-         * @const {boolean} Phaser.Boot.Config#roundPixels - [description]
+         * @const {boolean} Phaser.Boot.Config#pixelArt - [description]
          */
-        this.roundPixels = GetValue(renderConfig, 'roundPixels', this.pixelArt);
+        this.pixelArt = GetValue(renderConfig, 'pixelArt', false);
+
+        if (this.pixelArt)
+        {
+            this.antialias = false;
+            this.roundPixels = true;
+        }
 
         /**
          * @const {boolean} Phaser.Boot.Config#transparent - [description]

src/boot/CreateRenderer.js

@@ -48,7 +48,7 @@ var CreateRenderer = function (game)
     }
 
     //  Pixel Art mode?
-    if (config.pixelArt || !config.antialias)
+    if (!config.antialias)
     {
         CanvasPool.disableSmoothing();
     }
@@ -70,7 +70,7 @@ var CreateRenderer = function (game)
     }
 
     //  Pixel Art mode?
-    if (config.pixelArt || !config.antialias)
+    if (!config.antialias)
     {
         CanvasInterpolation.setCrisp(game.canvas);
     }

src/cameras/2d/CameraManager.js

@@ -209,9 +209,8 @@ var CameraManager = new Class({
      * By default Cameras are transparent and will render anything that they can see based on their `scrollX`
      * and `scrollY` values. Game Objects can be set to be ignored by a Camera by using the `Camera.ignore` method.
      * 
-     * Please note that it will have its `roundPixels` propery set to whatever is set on the game and renderer
-     * configuration. So if you've got a game config with `pixelArt: true` in it, then `roundPixels` will always
-     * be set to `true` on the new Camera.
+     * The Camera will have its `roundPixels` propery set to whatever `CameraManager.roundPixels` is. You can change
+     * it after creation if required.
      * 
      * See the Camera class documentation for more details.
      *
@@ -259,9 +258,8 @@ var CameraManager = new Class({
      * 
      * The Camera should either be a `Phaser.Cameras.Scene2D.Camera` instance, or a class that extends from it.
      * 
-     * Please note that it will have its `roundPixels` propery set to whatever is set on the game and renderer
-     * configuration. So if you've got a game config with `pixelArt: true` in it, then `roundPixels` will always
-     * be set to `true` on the Camera added to this Camera Manager.
+     * The Camera will have its `roundPixels` propery set to whatever `CameraManager.roundPixels` is. You can change
+     * it after addition if required.
      * 
      * The Camera will be assigned an ID, which is used for Game Object exclusion and then added to the
      * manager. As long as it doesn't already exist in the manager it will be added then returned.

src/renderer/canvas/CanvasRenderer.js

@@ -86,7 +86,6 @@ var CanvasRenderer = new Class({
          */
         this.config = {
             clearBeforeRender: game.config.clearBeforeRender,
-            pixelArt: game.config.pixelArt,
             backgroundColor: game.config.backgroundColor,
             resolution: game.config.resolution,
             autoResize: game.config.autoResize,
@@ -101,7 +100,7 @@ var CanvasRenderer = new Class({
          * @type {integer}
          * @since 3.0.0
          */
-        this.scaleMode = (game.config.pixelArt || !game.config.antialias) ? ScaleModes.NEAREST : ScaleModes.LINEAR;
+        this.scaleMode = (game.config.antialias) ? ScaleModes.LINEAR : ScaleModes.NEAREST;
 
         /**
          * [description]

src/renderer/index.js

@@ -8,7 +8,7 @@
  * @typedef {object} RendererConfig
  *
  * @property {boolean} clearBeforeRender - [description]
- * @property {boolean} pixelArt - [description]
+ * @property {boolean} antialias - [description]
  * @property {Phaser.Display.Color} backgroundColor - [description]
  * @property {number} resolution - [description]
  * @property {boolean} autoResize - [description]

src/renderer/webgl/WebGLRenderer.js

@@ -80,7 +80,6 @@ var WebGLRenderer = new Class({
          */
         this.config = {
             clearBeforeRender: gameConfig.clearBeforeRender,
-            pixelArt: gameConfig.pixelArt,
             antialias: gameConfig.antialias,
             backgroundColor: gameConfig.backgroundColor,
             contextCreation: contextCreationConfig,
@@ -1125,7 +1124,7 @@ var WebGLRenderer = new Class({
         {
             filter = gl.LINEAR;
         }
-        else if (scaleMode === CONST.ScaleModes.NEAREST || this.config.pixelArt || !this.config.antialias)
+        else if (scaleMode === CONST.ScaleModes.NEAREST || !this.config.antialias)
         {
             filter = gl.NEAREST;
         }

src/renderer/webgl/pipelines/TextureTintPipeline.js

@@ -2080,7 +2080,7 @@ var TextureTintPipeline = new Class({
             this.flush();
         }
 
-        var roundPixels = camera.roundPixels;
+        var roundPixels = this.renderer.config.roundPixels;
         var vertexViewF32 = this.vertexViewF32;
         var vertexViewU32 = this.vertexViewU32;
         var width = frameWidth;

src/textures/TextureSource.js

@@ -164,7 +164,7 @@ var TextureSource = new Class({
             }
         }
 
-        if (game.config.pixelArt || !game.config.antialias)
+        if (!game.config.antialias)
         {
             this.setFilter(1);
         }