mirror of
https://github.com/photonstorm/phaser
synced 2024-11-10 07:04:31 +00:00
Reference fixes
This commit is contained in:
parent
6734932a32
commit
da4c387d86
5 changed files with 14 additions and 14 deletions
|
@ -279,9 +279,9 @@ var PipelineManager = new Class({
|
|||
*/
|
||||
flush: function ()
|
||||
{
|
||||
if (this.currentPipeline)
|
||||
if (this.current)
|
||||
{
|
||||
this.currentPipeline.flush();
|
||||
this.current.flush();
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
@ -1198,7 +1198,7 @@ var WebGLRenderer = new Class({
|
|||
*/
|
||||
setTextureSource: function (textureSource)
|
||||
{
|
||||
if (this.currentPipeline.forceZero)
|
||||
if (this.pipelines.current.forceZero)
|
||||
{
|
||||
this.setTextureZero(textureSource.glTexture, true);
|
||||
|
||||
|
@ -1428,7 +1428,7 @@ var WebGLRenderer = new Class({
|
|||
*/
|
||||
setTexture2D: function (texture)
|
||||
{
|
||||
if (this.currentPipeline.forceZero)
|
||||
if (this.pipelines.current.forceZero)
|
||||
{
|
||||
this.setTextureZero(texture, true);
|
||||
|
||||
|
|
|
@ -189,7 +189,7 @@ var BitmapMaskPipeline = new Class({
|
|||
}
|
||||
|
||||
// Bind bitmap mask pipeline and draw
|
||||
renderer.setPipeline(this);
|
||||
renderer.pipelines.set(this);
|
||||
|
||||
gl.activeTexture(gl.TEXTURE1);
|
||||
gl.bindTexture(gl.TEXTURE_2D, mask.maskTexture);
|
||||
|
|
|
@ -416,7 +416,7 @@ var MultiPipeline = new Class({
|
|||
batchSprite: function (sprite, camera, parentTransformMatrix)
|
||||
{
|
||||
// Will cause a flush if this isn't the current pipeline, vertexbuffer or program
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var camMatrix = this._tempMatrix1;
|
||||
var spriteMatrix = this._tempMatrix2;
|
||||
|
@ -823,7 +823,7 @@ var MultiPipeline = new Class({
|
|||
{
|
||||
var renderer = this.renderer;
|
||||
|
||||
renderer.setPipeline(this, gameObject);
|
||||
renderer.pipelines.set(this, gameObject);
|
||||
|
||||
var camMatrix = this._tempMatrix1;
|
||||
var spriteMatrix = this._tempMatrix2;
|
||||
|
@ -975,7 +975,7 @@ var MultiPipeline = new Class({
|
|||
parentTransformMatrix
|
||||
)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var spriteMatrix = this._tempMatrix1.copyFrom(transformMatrix);
|
||||
var calcMatrix = this._tempMatrix2;
|
||||
|
@ -1064,7 +1064,7 @@ var MultiPipeline = new Class({
|
|||
*/
|
||||
batchFillRect: function (x, y, width, height, currentMatrix, parentMatrix)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var calcMatrix = this._tempMatrix3;
|
||||
|
||||
|
@ -1119,7 +1119,7 @@ var MultiPipeline = new Class({
|
|||
*/
|
||||
batchFillTriangle: function (x0, y0, x1, y1, x2, y2, currentMatrix, parentMatrix)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var calcMatrix = this._tempMatrix3;
|
||||
|
||||
|
@ -1206,7 +1206,7 @@ var MultiPipeline = new Class({
|
|||
*/
|
||||
batchFillPath: function (path, currentMatrix, parentMatrix)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var calcMatrix = this._tempMatrix3;
|
||||
|
||||
|
@ -1289,7 +1289,7 @@ var MultiPipeline = new Class({
|
|||
*/
|
||||
batchStrokePath: function (path, lineWidth, pathOpen, currentMatrix, parentMatrix)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
// Reset the closePath booleans
|
||||
this.prevQuad[4] = 0;
|
||||
|
@ -1335,7 +1335,7 @@ var MultiPipeline = new Class({
|
|||
*/
|
||||
batchLine: function (ax, ay, bx, by, aLineWidth, bLineWidth, lineWidth, index, closePath, currentMatrix, parentMatrix)
|
||||
{
|
||||
this.renderer.setPipeline(this);
|
||||
this.renderer.pipelines.set(this);
|
||||
|
||||
var calcMatrix = this._tempMatrix3;
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
var CONST = require('./const');
|
||||
var Extend = require('../utils/object/Extend');
|
||||
var Extend = require('../../../utils/object/Extend');
|
||||
|
||||
/**
|
||||
* @namespace Phaser.Renderer.WebGL.Pipelines
|
||||
|
|
Loading…
Reference in a new issue