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

Use the new note picker field in music and EV3 extensions (#1720)

Browse source 
* Add note field type

* Note picker in music extension plays notes

* Use note picker in EV3 beep block
This commit is contained in:
Eric Rosenbaum 2018-11-07 11:50:15 -05:00 committed by GitHub
parent eef1885fad
commit 2cff4159bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/runtime.js
View file

@ -68,6 +68,10 @@ const ArgumentTypeMap = (() => {
shadowType: 'matrix',
fieldType: 'MATRIX'
};
map[ArgumentType.NOTE] = {
shadowType: 'note',
fieldType: 'NOTE'
};
return map;
})();

9
src/extension-support/argument-type.js
View file

@ -29,9 +29,14 @@ const ArgumentType = {
STRING: 'string',
/**
* String value with matirx field
* String value with matrix field
*/
MATRIX: 'matrix'
MATRIX: 'matrix',
/**
* MIDI note number with note picker (piano) field
*/
NOTE: 'note'
};
module.exports = ArgumentType;

13
src/extensions/scratch3_ev3/index.js
View file

@ -910,6 +910,9 @@ class Scratch3Ev3Blocks {
// Create a new EV3 peripheral instance
this._peripheral = new EV3(this.runtime, Scratch3Ev3Blocks.EXTENSION_ID);
this._playNoteForPicker = this._playNoteForPicker.bind(this);
this.runtime.on('PLAY_NOTE', this._playNoteForPicker);
}
/**
@ -1089,7 +1092,7 @@ class Scratch3Ev3Blocks {
blockType: BlockType.COMMAND,
arguments: {
NOTE: {
type: ArgumentType.NUMBER,
type: ArgumentType.NOTE,
defaultValue: 60
},
TIME: {
@ -1212,6 +1215,14 @@ class Scratch3Ev3Blocks {
return this._peripheral.brightness;
}
_playNoteForPicker (note, category) {
if (category !== this.getInfo().name) return;
this.beep({
NOTE: note,
TIME: 0.25
});
}
beep (args) {
const note = MathUtil.clamp(Cast.toNumber(args.NOTE), 47, 99); // valid EV3 sounds
let time = Cast.toNumber(args.TIME) * 1000;

14
src/extensions/scratch3_music/index.js
View file

@ -85,6 +85,9 @@ class Scratch3MusicBlocks {
this._onTargetCreated = this._onTargetCreated.bind(this);
this.runtime.on('targetWasCreated', this._onTargetCreated);
this._playNoteForPicker = this._playNoteForPicker.bind(this);
this.runtime.on('PLAY_NOTE', this._playNoteForPicker);
}
/**
@ -747,7 +750,7 @@ class Scratch3MusicBlocks {
}),
arguments: {
NOTE: {
type: ArgumentType.NUMBER,
type: ArgumentType.NOTE,
defaultValue: 60
},
BEATS: {
@ -940,6 +943,15 @@ class Scratch3MusicBlocks {
}
}
_playNoteForPicker (noteNum, category) {
if (category !== this.getInfo().name) return;
const util = {
runtime: this.runtime,
target: this.runtime.getEditingTarget()
};
this._playNote(util, noteNum, 0.25);
}
/**
* Play a note using the current instrument for a duration in seconds.
* This function actually plays the sound, and handles the timing of the sound, including the