Skip to content

Commit e80ed94

Browse files
committed
Removed copy params
1 parent 91924be commit e80ed94

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

src/renderer/webgl/pipelines/MultiPipeline.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ var MultiPipeline = new Class({
236236
}
237237

238238
// Auto-invert the flipY if this is coming from a GLTexture
239+
239240
if (sprite.flipY || (frame.source.isGLTexture && !texture.flipY))
240241
{
241242
if (!customPivot)
@@ -354,8 +355,6 @@ var MultiPipeline = new Class({
354355
* @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - Parent container.
355356
* @param {boolean} [skipFlip=false] - Skip the renderTexture check.
356357
* @param {number} [textureUnit] - Use the currently bound texture unit?
357-
* @param {boolean} [cropWidth=0] - Crop the width to the given value?
358-
* @param {boolean} [cropHeight=0] - Crop the height to the given value?
359358
*/
360359
batchTexture: function (
361360
gameObject,
@@ -374,8 +373,7 @@ var MultiPipeline = new Class({
374373
camera,
375374
parentTransformMatrix,
376375
skipFlip,
377-
textureUnit,
378-
cropWidth, cropHeight)
376+
textureUnit)
379377
{
380378
this.manager.set(this, gameObject);
381379

@@ -394,12 +392,12 @@ var MultiPipeline = new Class({
394392
var x = -displayOriginX;
395393
var y = -displayOriginY;
396394

397-
if (gameObject.isCropped || cropWidth !== textureWidth || cropHeight !== textureHeight)
395+
if (gameObject.isCropped)
398396
{
399397
var crop = gameObject._crop;
400398

401-
cropWidth = Math.max(crop.width, cropWidth);
402-
cropHeight = Math.max(crop.height, cropHeight);
399+
var cropWidth = crop.width;
400+
var cropHeight = crop.height;
403401

404402
width = cropWidth;
405403
height = cropHeight;
@@ -529,7 +527,7 @@ var MultiPipeline = new Class({
529527
parentTransformMatrix
530528
)
531529
{
532-
this.renderer.pipelines.set(this);
530+
this.manager.set(this);
533531

534532
var spriteMatrix = this._tempMatrix1.copyFrom(transformMatrix);
535533
var calcMatrix = this._tempMatrix2;

0 commit comments

Comments
 (0)