scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 15:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

adding theremin block and set instrument

Browse source
This commit is contained in:
Eric Rosenbaum 2016-10-19 15:44:30 -04:00
parent f3f2fea3dd
commit 0858a22ffb
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/blocks/scratch3_sound.js
View file

@ -1,4 +1,5 @@
var MathUtil = require('../util/math-util'); var MathUtil = require('../util/math-util');
var Cast = require('../util/cast');
var Promise = require('promise'); var Promise = require('promise');
function Scratch3SoundBlocks(runtime) { function Scratch3SoundBlocks(runtime) {
@ -19,7 +20,9 @@ Scratch3SoundBlocks.prototype.getPrimitives = function() {
'sound_playuntildone': this.playSoundAndWait, 'sound_playuntildone': this.playSoundAndWait,
'sound_stopallsounds': this.stopAllSounds, 'sound_stopallsounds': this.stopAllSounds,
'sound_playnoteforbeats': this.playNoteForBeats, 'sound_playnoteforbeats': this.playNoteForBeats,
'sound_playthereminforbeats': this.playThereminForBeats,
'sound_playdrumforbeats': this.playDrumForBeats, 'sound_playdrumforbeats': this.playDrumForBeats,
'sound_setinstrumentto': this.setInstrument,
'sound_seteffectto' : this.setEffect, 'sound_seteffectto' : this.setEffect,
'sound_changeeffectby' : this.changeEffect, 'sound_changeeffectby' : this.changeEffect,
'sound_cleareffects' : this.clearEffects, 'sound_cleareffects' : this.clearEffects,
@ -77,6 +80,15 @@ Scratch3SoundBlocks.prototype.playNoteForBeats = function (args, util) {
}); });
}; };
Scratch3SoundBlocks.prototype.playThereminForBeats = function (args, util) {
util.target.audioEngine.playThereminForBeats(args.NOTE, args.BEATS);
return new Promise(function(resolve) {
setTimeout(function() {
resolve();
}, (1000 * args.BEATS) );
});
};
Scratch3SoundBlocks.prototype.playDrumForBeats = function (args, util) { Scratch3SoundBlocks.prototype.playDrumForBeats = function (args, util) {
util.target.audioEngine.playDrumForBeats(args.DRUMTYPE, args.BEATS); util.target.audioEngine.playDrumForBeats(args.DRUMTYPE, args.BEATS);
return new Promise(function(resolve) { return new Promise(function(resolve) {
@ -86,6 +98,11 @@ Scratch3SoundBlocks.prototype.playDrumForBeats = function (args, util) {
}); });
}; };
Scratch3SoundBlocks.prototype.setInstrument = function (args, util) {
var instNum = Cast.toNumber(args.INSTRUMENT);
return util.target.audioEngine.setInstrument(instNum);
};
Scratch3SoundBlocks.prototype.setEffect = function (args, util) { Scratch3SoundBlocks.prototype.setEffect = function (args, util) {
util.target.audioEngine.setEffect(args.EFFECT, args.VALUE); util.target.audioEngine.setEffect(args.EFFECT, args.VALUE);
}; };