Skip to content

Commit 0abf9d9

Browse files
committed
Updated scaleMode global.
1 parent 3fab1ce commit 0abf9d9

10 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/core/Stage.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,19 +393,19 @@ Object.defineProperty(Phaser.Stage.prototype, "smoothed", {
393393

394394
get: function () {
395395

396-
return PIXI.scaleModes.DEFAULT === PIXI.scaleModes.LINEAR;
396+
return Phaser.scaleModes.DEFAULT === Phaser.scaleModes.LINEAR;
397397

398398
},
399399

400400
set: function (value) {
401401

402402
if (value)
403403
{
404-
PIXI.scaleModes.DEFAULT = PIXI.scaleModes.LINEAR;
404+
Phaser.scaleModes.DEFAULT = Phaser.scaleModes.LINEAR;
405405
}
406406
else
407407
{
408-
PIXI.scaleModes.DEFAULT = PIXI.scaleModes.NEAREST;
408+
Phaser.scaleModes.DEFAULT = Phaser.scaleModes.NEAREST;
409409
}
410410
}
411411

src/gameobjects/BitmapData.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ Phaser.BitmapData.prototype = {
15071507
this.op = blendMode;
15081508
}
15091509

1510-
ctx[this.smoothProperty] = (source.texture.baseTexture.scaleMode === PIXI.scaleModes.LINEAR);
1510+
ctx[this.smoothProperty] = (source.texture.baseTexture.scaleMode === Phaser.scaleModes.LINEAR);
15111511

15121512
ctx.setTransform(wt.a, wt.b, wt.c, wt.d, tx, ty);
15131513

src/gameobjects/Graphics.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -918,7 +918,7 @@ Phaser.Graphics.prototype.clear = function () {
918918
Phaser.Graphics.prototype.generateTexture = function (resolution, scaleMode, padding) {
919919

920920
if (resolution === undefined) { resolution = 1; }
921-
if (scaleMode === undefined) { scaleMode = PIXI.scaleModes.DEFAULT; }
921+
if (scaleMode === undefined) { scaleMode = Phaser.scaleModes.DEFAULT; }
922922
if (padding === undefined) { padding = 0; }
923923

924924
var bounds = this.getBounds();

src/pixi/display/DisplayObject.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ PIXI.DisplayObject.prototype = {
418418
*
419419
* @method PIXI.DisplayObject#generateTexture
420420
* @param {number} [resolution=1] - The resolution of the texture being generated.
421-
* @param {number} [scaleMode=PIXI.scaleModes.DEFAULT] - See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values.
421+
* @param {number} [scaleMode=Phaser.scaleModes.DEFAULT] - See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values.
422422
* @param {PIXI.CanvasRenderer|PIXI.WebGLRenderer} renderer - The renderer used to generate the texture.
423423
* @return {Phaser.RenderTexture} - A RenderTexture containing an image of this DisplayObject at the time it was invoked.
424424
*/

src/pixi/display/Sprite.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ PIXI.Sprite.prototype._renderCanvas = function(renderSession, matrix)
472472
if (renderSession.smoothProperty && renderSession.scaleMode !== this.texture.baseTexture.scaleMode)
473473
{
474474
renderSession.scaleMode = this.texture.baseTexture.scaleMode;
475-
renderSession.context[renderSession.smoothProperty] = (renderSession.scaleMode === PIXI.scaleModes.LINEAR);
475+
renderSession.context[renderSession.smoothProperty] = (renderSession.scaleMode === Phaser.scaleModes.LINEAR);
476476
}
477477

478478
// If the texture is trimmed we offset by the trim x/y, otherwise we use the frame dimensions

src/pixi/textures/BaseTexture.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @uses EventTarget
1010
* @constructor
1111
* @param source {String|Canvas} the source object (image or canvas)
12-
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
12+
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values
1313
*/
1414
PIXI.BaseTexture = function(source, scaleMode)
1515
{
@@ -44,9 +44,9 @@ PIXI.BaseTexture = function(source, scaleMode)
4444
*
4545
* @property scaleMode
4646
* @type {Number}
47-
* @default PIXI.scaleModes.LINEAR
47+
* @default Phaser.scaleModes.LINEAR
4848
*/
49-
this.scaleMode = scaleMode || PIXI.scaleModes.DEFAULT;
49+
this.scaleMode = scaleMode || Phaser.scaleModes.DEFAULT;
5050

5151
/**
5252
* [read-only] Set to true once the base texture has loaded
@@ -218,7 +218,7 @@ PIXI.BaseTexture.prototype.unloadFromGPU = function()
218218
* @static
219219
* @method fromCanvas
220220
* @param canvas {Canvas} The canvas element source of the texture
221-
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
221+
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values
222222
* @return {BaseTexture}
223223
*/
224224
PIXI.BaseTexture.fromCanvas = function(canvas, scaleMode)

src/pixi/textures/Texture.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ PIXI.Texture.prototype._updateUvsInverted = function () {
289289
* @static
290290
* @method fromCanvas
291291
* @param canvas {Canvas} The canvas element source of the texture
292-
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
292+
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values
293293
* @return {Texture}
294294
*/
295295
PIXI.Texture.fromCanvas = function(canvas, scaleMode)

src/renderer/webgl/FilterTexture.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* @param {Phaser.Game} game - Game reference to the currently running game.
1414
* @param width {Number} the horizontal range of the filter
1515
* @param height {Number} the vertical range of the filter
16-
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
16+
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values
1717
*/
1818
Phaser.Renderer.WebGL.FilterTexture = function (renderer, width, height, scaleMode, textureUnit)
1919
{

src/textures/Texture.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ Phaser.Texture.prototype = {
128128
* @static
129129
* @method fromCanvas
130130
* @param canvas {Canvas} The canvas element source of the texture
131-
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}PIXI.scaleModes{{/crossLink}} for possible values
131+
* @param scaleMode {Number} See {{#crossLink "PIXI/scaleModes:property"}}Phaser.scaleModes{{/crossLink}} for possible values
132132
* @return {BaseTexture}
133133
*/
134134
Phaser.Texture.fromCanvas = function (canvas, scaleMode)

src/textures/TextureManager.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,16 +249,16 @@ Phaser.TextureManager.prototype = {
249249

250250
gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, texture.source);
251251

252-
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, texture.scaleMode === PIXI.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST);
252+
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, texture.scaleMode === Phaser.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST);
253253

254254
if (texture.mipmap && Phaser.Math.isPowerOfTwo(texture.width, texture.height))
255255
{
256-
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, texture.scaleMode === PIXI.scaleModes.LINEAR ? gl.LINEAR_MIPMAP_LINEAR : gl.NEAREST_MIPMAP_NEAREST);
256+
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, texture.scaleMode === Phaser.scaleModes.LINEAR ? gl.LINEAR_MIPMAP_LINEAR : gl.NEAREST_MIPMAP_NEAREST);
257257
gl.generateMipmap(gl.TEXTURE_2D);
258258
}
259259
else
260260
{
261-
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, texture.scaleMode === PIXI.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST);
261+
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, texture.scaleMode === Phaser.scaleModes.LINEAR ? gl.LINEAR : gl.NEAREST);
262262
}
263263

264264
if (!texture._powerOf2)

0 commit comments

Comments
 (0)