scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-11 10:39:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #975 from ericrosenbaum/bugfix/move-volume-to-rendered-target

Browse source 
Move volume to rendered target
This commit is contained in:
Eric Rosenbaum 2018-03-19 16:45:25 -04:00 committed by GitHub
commit 2b985fa083
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/blocks/scratch3_sensing.js
View file

@ -238,7 +238,7 @@ class Scratch3SensingBlocks {
case 'backdrop #': return attrTarget.currentCostume + 1; case 'backdrop #': return attrTarget.currentCostume + 1;
case 'backdrop name': case 'backdrop name':
return attrTarget.getCostumes()[attrTarget.currentCostume].name; return attrTarget.getCostumes()[attrTarget.currentCostume].name;
case 'volume': return; // @todo: Keep this in mind for sound blocks! case 'volume': return attrTarget.volume;
} }
} else { } else {
switch (args.PROPERTY) { switch (args.PROPERTY) {
@ -249,7 +249,7 @@ class Scratch3SensingBlocks {
case 'costume name': case 'costume name':
return attrTarget.getCostumes()[attrTarget.currentCostume].name; return attrTarget.getCostumes()[attrTarget.currentCostume].name;
case 'size': return attrTarget.size; case 'size': return attrTarget.size;
case 'volume': return; // @todo: above, keep in mind for sound blocks.. case 'volume': return attrTarget.volume;
} }
} }

12
src/blocks/scratch3_sound.js
View file

@ -37,7 +37,6 @@ class Scratch3SoundBlocks {
*/ */
static get DEFAULT_SOUND_STATE () { static get DEFAULT_SOUND_STATE () {
return { return {
volume: 100,
effects: { effects: {
pitch: 0, pitch: 0,
pan: 0 pan: 0
@ -267,22 +266,19 @@ class Scratch3SoundBlocks {
} }
changeVolume (args, util) { changeVolume (args, util) {
const soundState = this._getSoundState(util.target); const volume = Cast.toNumber(args.VOLUME) + util.target.volume;
const volume = Cast.toNumber(args.VOLUME) + soundState.volume;
this._updateVolume(volume, util); this._updateVolume(volume, util);
} }
_updateVolume (volume, util) { _updateVolume (volume, util) {
const soundState = this._getSoundState(util.target);
volume = MathUtil.clamp(volume, 0, 100); volume = MathUtil.clamp(volume, 0, 100);
soundState.volume = volume; util.target.volume = volume;
if (util.target.audioPlayer === null) return; if (util.target.audioPlayer === null) return;
util.target.audioPlayer.setVolume(soundState.volume); util.target.audioPlayer.setVolume(util.target.volume);
} }
getVolume (args, util) { getVolume (args, util) {
const soundState = this._getSoundState(util.target); return util.target.volume;
return soundState.volume;
} }
soundsMenu (args) { soundsMenu (args) {

6
src/sprites/rendered-target.js
View file

@ -122,6 +122,12 @@ class RenderedTarget extends Target {
* @type {number} * @type {number}
*/ */
this.tempo = 60; this.tempo = 60;
/**
* Loudness for sound playback for this target, as a percentage.
* @type {number}
*/
this.volume = 100;
} }
/** /**