Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-22 20:53:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Modified camera effect durations and prevented callbacks from being overwritten

Browse source
This commit is contained in:
Richard Davey 2018-03-19 23:53:03 +00:00
parent 490aa2838d
commit 00a3f71859
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/cameras/2d/Camera.js
View file

@ -724,7 +724,7 @@ var Camera = new Class({
*/ */
fade: function (duration, red, green, blue, force, callback) fade: function (duration, red, green, blue, force, callback)
{ {
if (!duration) { duration = 0; } if (!duration) { duration = Number.MIN_VALUE; }
if (red === undefined) { red = 0; } if (red === undefined) { red = 0; }
if (green === undefined) { green = 0; } if (green === undefined) { green = 0; }
if (blue === undefined) { blue = 0; } if (blue === undefined) { blue = 0; }
@ -741,7 +741,7 @@ var Camera = new Class({
this._fadeBlue = blue; this._fadeBlue = blue;
this._fadeCallback = callback; this._fadeCallback = callback;
this._fadeDuration = duration; this._fadeDuration = duration;
this._fadeAlpha = 0; this._fadeAlpha = Number.MIN_VALUE;
return this; return this;
}, },
@ -763,7 +763,7 @@ var Camera = new Class({
*/ */
flash: function (duration, red, green, blue, force, callback) flash: function (duration, red, green, blue, force, callback)
{ {
if (!duration) { duration = 0; } if (!duration) { duration = Number.MIN_VALUE; }
if (red === undefined) { red = 1; } if (red === undefined) { red = 1; }
if (green === undefined) { green = 1; } if (green === undefined) { green = 1; }
if (blue === undefined) { blue = 1; } if (blue === undefined) { blue = 1; }
@ -800,7 +800,7 @@ var Camera = new Class({
*/ */
shake: function (duration, intensity, force, callback) shake: function (duration, intensity, force, callback)
{ {
if (!duration) { duration = 0; } if (!duration) { duration = Number.MIN_VALUE; }
if (intensity === undefined) { intensity = 0.05; } if (intensity === undefined) { intensity = 0.05; }
if (force === undefined) { force = false; } if (force === undefined) { force = false; }
if (callback === undefined) { callback = null; } if (callback === undefined) { callback = null; }
@ -1350,9 +1350,12 @@ var Camera = new Class({
if (this._flashCallback) if (this._flashCallback)
{ {
this._flashCallback(this); // Do this in case the callback flashes again (otherwise we'd overwrite the new callback)
var flashCallback = this._flashCallback;
this._flashCallback = null; this._flashCallback = null;
flashCallback(this);
} }
} }
} }
@ -1367,9 +1370,12 @@ var Camera = new Class({
if (this._fadeCallback) if (this._fadeCallback)
{ {
this._fadeCallback(this); // Do this in case the callback flashes again (otherwise we'd overwrite the new callback)
var fadeCallback = this._fadeCallback;
this._fadeCallback = null; this._fadeCallback = null;
fadeCallback(this);
} }
} }
} }
@ -1387,9 +1393,12 @@ var Camera = new Class({
if (this._shakeCallback) if (this._shakeCallback)
{ {
this._shakeCallback(this); // Do this in case the callback flashes again (otherwise we'd overwrite the new callback)
var shakeCallback = this._shakeCallback;
this._shakeCallback = null; this._shakeCallback = null;
shakeCallback(this);
} }
} }
else else