Skip to content

Commit d088889

Browse files
committed
Added resetFX to 2D camera
1 parent 1676792 commit d088889

1 file changed

Lines changed: 30 additions & 10 deletions

File tree

src/cameras/2d/Camera.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ var Camera = new Class({
375375
{
376376
this.scrollX = (this._bounds.width * 0.5) - (this.width * 0.5);
377377
this.scrollY = (this._bounds.height * 0.5) - (this.height * 0.5);
378-
378+
379379
return this;
380380
},
381381

@@ -391,7 +391,7 @@ var Camera = new Class({
391391
{
392392
this.scrollX = this.width * 0.5;
393393
this.scrollY = this.height * 0.5;
394-
394+
395395
return this;
396396
},
397397

@@ -418,7 +418,7 @@ var Camera = new Class({
418418
var mvb = cameraMatrix[1];
419419
var mvc = cameraMatrix[2];
420420
var mvd = cameraMatrix[3];
421-
421+
422422
/* First Invert Matrix */
423423
var determinant = (mva * mvd) - (mvb * mvc);
424424

@@ -495,7 +495,7 @@ var Camera = new Class({
495495
var mvb = cameraMatrix[1];
496496
var mvc = cameraMatrix[2];
497497
var mvd = cameraMatrix[3];
498-
498+
499499
/* First Invert Matrix */
500500
var determinant = (mva * mvd) - (mvb * mvc);
501501

@@ -566,7 +566,7 @@ var Camera = new Class({
566566
var mvb = cameraMatrix[1];
567567
var mvc = cameraMatrix[2];
568568
var mvd = cameraMatrix[3];
569-
569+
570570
/* First Invert Matrix */
571571
var determinant = (mva * mvd) - (mvb * mvc);
572572

@@ -718,7 +718,7 @@ var Camera = new Class({
718718
var mvd = cameraMatrix[3];
719719
var mve = cameraMatrix[4];
720720
var mvf = cameraMatrix[5];
721-
721+
722722
/* First Invert Matrix */
723723
var determinant = (mva * mvd) - (mvb * mvc);
724724

@@ -753,7 +753,7 @@ var Camera = new Class({
753753
/* Apply transform to point */
754754
output.x = (sx * ima + sy * imc + ime);
755755
output.y = (sx * imb + sy * imd + imf);
756-
756+
757757
return output;
758758
},
759759

@@ -764,7 +764,7 @@ var Camera = new Class({
764764
* @since 3.0.0
765765
*
766766
* @param {[type]} gameObjectOrArray - [description]
767-
*
767+
*
768768
* @return {Phaser.Cameras.Scene2D.Camera} This Camera instance.
769769
*/
770770
ignore: function (gameObjectOrArray)
@@ -806,7 +806,7 @@ var Camera = new Class({
806806
{
807807
originX = follow.x;
808808
originY = follow.y;
809-
809+
810810
this.scrollX = originX - width * 0.5;
811811
this.scrollY = originY - height * 0.5;
812812
}
@@ -1164,7 +1164,7 @@ var Camera = new Class({
11641164
*
11651165
* @method Phaser.Cameras.Scene2D.Camera#stopFollow
11661166
* @since 3.0.0
1167-
*
1167+
*
11681168
* @return {Phaser.Cameras.Scene2D.Camera} This Camera instance.
11691169
*/
11701170
stopFollow: function ()
@@ -1211,6 +1211,26 @@ var Camera = new Class({
12111211
return output;
12121212
},
12131213

1214+
/**
1215+
* Resets any active FX, such as a fade, flash or shake. Useful to call after a fade in order to
1216+
* remove the fade.
1217+
*
1218+
* @method Phaser.Cameras.Scene2D.Camera#resetFX
1219+
* @since 3.0.0
1220+
*
1221+
* @return {Phaser.Cameras.Scene2D.Camera} This Camera instance.
1222+
*/
1223+
resetFX: function ()
1224+
{
1225+
this._flashAlpha = 0;
1226+
this._fadeAlpha = 0;
1227+
this._shakeOffsetX = 0.0;
1228+
this._shakeOffsetY = 0.0;
1229+
this._shakeDuration = 0;
1230+
1231+
return this;
1232+
},
1233+
12141234
/**
12151235
* [description]
12161236
*

0 commit comments

Comments
 (0)