Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-27 15:12:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sound.fadeIn now supports fading from a marker, as well as the entire audio clip, so now works with audio sprites (thanks @vorrin #1413)

Browse source
This commit is contained in:
photonstorm 2015-02-11 13:52:16 +00:00
parent 6506e8d7e6
commit 74bee324a5
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -124,6 +124,7 @@ Thanks to @pnstickne for vast majority of this update.
* Loader.onLoadComplete is dispatched *before* the Loader is reset. If you have a `create` method in your State please note that the Loader will have been reset before this method is called. This allows you to immediately re-use the Loader without having to first reset it manually. * Loader.onLoadComplete is dispatched *before* the Loader is reset. If you have a `create` method in your State please note that the Loader will have been reset before this method is called. This allows you to immediately re-use the Loader without having to first reset it manually.
* World.setBounds will now adjust the World.x/y values to match those given (#1555) * World.setBounds will now adjust the World.x/y values to match those given (#1555)
* ArcadePhysics.distanceToPointer now calculates the distance in world space values. * ArcadePhysics.distanceToPointer now calculates the distance in world space values.
* Sound.fadeIn now supports fading from a marker, as well as the entire audio clip, so now works with audio sprites (thanks @vorrin #1413)
### Bug Fixes ### Bug Fixes

7
src/sound/Sound.js
View file

@ -840,23 +840,26 @@ Phaser.Sound.prototype = {
/** /**
* Starts this sound playing (or restarts it if already doing so) and sets the volume to zero. * Starts this sound playing (or restarts it if already doing so) and sets the volume to zero.
* Then increases the volume from 0 to 1 over the duration specified. * Then increases the volume from 0 to 1 over the duration specified.
*
* At the end of the fade Sound.onFadeComplete is dispatched with this Sound object as the first parameter, * At the end of the fade Sound.onFadeComplete is dispatched with this Sound object as the first parameter,
* and the final volume (1) as the second parameter. * and the final volume (1) as the second parameter.
* *
* @method Phaser.Sound#fadeIn * @method Phaser.Sound#fadeIn
* @param {number} [duration=1000] - The time in milliseconds over which the Sound should fade in. * @param {number} [duration=1000] - The time in milliseconds over which the Sound should fade in.
* @param {boolean} [loop=false] - Should the Sound be set to loop? Note that this doesn't cause the fade to repeat. * @param {boolean} [loop=false] - Should the Sound be set to loop? Note that this doesn't cause the fade to repeat.
* @param {string} [marker=(current marker)] - The marker to start at; defaults to the current (last played) marker. To start playing from the beginning specify specify a marker of `''`.
*/ */
fadeIn: function (duration, loop) { fadeIn: function (duration, loop, marker) {
if (typeof loop === 'undefined') { loop = false; } if (typeof loop === 'undefined') { loop = false; }
if (typeof marker === 'undefined') { marker = this.currentMarker; }
if (this.paused) if (this.paused)
{ {
return; return;
} }
this.play('', 0, 0, loop); this.play(marker, 0, 0, loop);
this.fadeTo(duration, 1); this.fadeTo(duration, 1);