Skip to content

Commit da4c387

Browse files
committed
Reference fixes
1 parent 6734932 commit da4c387

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/renderer/webgl/PipelineManager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@ var PipelineManager = new Class({
279279
*/
280280
flush: function ()
281281
{
282-
if (this.currentPipeline)
282+
if (this.current)
283283
{
284-
this.currentPipeline.flush();
284+
this.current.flush();
285285
}
286286
},
287287

src/renderer/webgl/WebGLRenderer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,7 @@ var WebGLRenderer = new Class({
11981198
*/
11991199
setTextureSource: function (textureSource)
12001200
{
1201-
if (this.currentPipeline.forceZero)
1201+
if (this.pipelines.current.forceZero)
12021202
{
12031203
this.setTextureZero(textureSource.glTexture, true);
12041204

@@ -1428,7 +1428,7 @@ var WebGLRenderer = new Class({
14281428
*/
14291429
setTexture2D: function (texture)
14301430
{
1431-
if (this.currentPipeline.forceZero)
1431+
if (this.pipelines.current.forceZero)
14321432
{
14331433
this.setTextureZero(texture, true);
14341434

src/renderer/webgl/pipelines/BitmapMaskPipeline.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ var BitmapMaskPipeline = new Class({
189189
}
190190

191191
// Bind bitmap mask pipeline and draw
192-
renderer.setPipeline(this);
192+
renderer.pipelines.set(this);
193193

194194
gl.activeTexture(gl.TEXTURE1);
195195
gl.bindTexture(gl.TEXTURE_2D, mask.maskTexture);

src/renderer/webgl/pipelines/MultiPipeline.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ var MultiPipeline = new Class({
416416
batchSprite: function (sprite, camera, parentTransformMatrix)
417417
{
418418
// Will cause a flush if this isn't the current pipeline, vertexbuffer or program
419-
this.renderer.setPipeline(this);
419+
this.renderer.pipelines.set(this);
420420

421421
var camMatrix = this._tempMatrix1;
422422
var spriteMatrix = this._tempMatrix2;
@@ -823,7 +823,7 @@ var MultiPipeline = new Class({
823823
{
824824
var renderer = this.renderer;
825825

826-
renderer.setPipeline(this, gameObject);
826+
renderer.pipelines.set(this, gameObject);
827827

828828
var camMatrix = this._tempMatrix1;
829829
var spriteMatrix = this._tempMatrix2;
@@ -975,7 +975,7 @@ var MultiPipeline = new Class({
975975
parentTransformMatrix
976976
)
977977
{
978-
this.renderer.setPipeline(this);
978+
this.renderer.pipelines.set(this);
979979

980980
var spriteMatrix = this._tempMatrix1.copyFrom(transformMatrix);
981981
var calcMatrix = this._tempMatrix2;
@@ -1064,7 +1064,7 @@ var MultiPipeline = new Class({
10641064
*/
10651065
batchFillRect: function (x, y, width, height, currentMatrix, parentMatrix)
10661066
{
1067-
this.renderer.setPipeline(this);
1067+
this.renderer.pipelines.set(this);
10681068

10691069
var calcMatrix = this._tempMatrix3;
10701070

@@ -1119,7 +1119,7 @@ var MultiPipeline = new Class({
11191119
*/
11201120
batchFillTriangle: function (x0, y0, x1, y1, x2, y2, currentMatrix, parentMatrix)
11211121
{
1122-
this.renderer.setPipeline(this);
1122+
this.renderer.pipelines.set(this);
11231123

11241124
var calcMatrix = this._tempMatrix3;
11251125

@@ -1206,7 +1206,7 @@ var MultiPipeline = new Class({
12061206
*/
12071207
batchFillPath: function (path, currentMatrix, parentMatrix)
12081208
{
1209-
this.renderer.setPipeline(this);
1209+
this.renderer.pipelines.set(this);
12101210

12111211
var calcMatrix = this._tempMatrix3;
12121212

@@ -1289,7 +1289,7 @@ var MultiPipeline = new Class({
12891289
*/
12901290
batchStrokePath: function (path, lineWidth, pathOpen, currentMatrix, parentMatrix)
12911291
{
1292-
this.renderer.setPipeline(this);
1292+
this.renderer.pipelines.set(this);
12931293

12941294
// Reset the closePath booleans
12951295
this.prevQuad[4] = 0;
@@ -1335,7 +1335,7 @@ var MultiPipeline = new Class({
13351335
*/
13361336
batchLine: function (ax, ay, bx, by, aLineWidth, bLineWidth, lineWidth, index, closePath, currentMatrix, parentMatrix)
13371337
{
1338-
this.renderer.setPipeline(this);
1338+
this.renderer.pipelines.set(this);
13391339

13401340
var calcMatrix = this._tempMatrix3;
13411341

src/renderer/webgl/pipelines/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
var CONST = require('./const');
8-
var Extend = require('../utils/object/Extend');
8+
var Extend = require('../../../utils/object/Extend');
99

1010
/**
1111
* @namespace Phaser.Renderer.WebGL.Pipelines

0 commit comments

Comments
 (0)