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

Fixing #1454: extension should cast and clamp input values.

Browse source
This commit is contained in:
Evelyn Eastmond 2018-08-14 11:45:40 -04:00
parent d89020cfb1
commit 9f25872c1f
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/extensions/scratch3_wedo2/index.js
View file

@ -1,9 +1,11 @@
const ArgumentType = require('../../extension-support/argument-type'); const ArgumentType = require('../../extension-support/argument-type');
const BlockType = require('../../extension-support/block-type'); const BlockType = require('../../extension-support/block-type');
const Cast = require('../../util/cast');
const color = require('../../util/color'); const color = require('../../util/color');
const log = require('../../util/log'); const log = require('../../util/log');
const BLESession = require('../../io/bleSession'); const BLESession = require('../../io/bleSession');
const Base64Util = require('../../util/base64-util'); const Base64Util = require('../../util/base64-util');
const MathUtil = require('../../util/math-util');
/** /**
* Icon svg to be displayed at the left edge of each extension block, encoded as a data URI. * Icon svg to be displayed at the left edge of each extension block, encoded as a data URI.
@ -868,7 +870,8 @@ class Scratch3WeDo2Blocks {
* @return {Promise} - a promise which will resolve at the end of the duration. * @return {Promise} - a promise which will resolve at the end of the duration.
*/ */
motorOnFor (args) { motorOnFor (args) {
const durationMS = args.DURATION * 1000; let durationMS = Cast.toNumber(args.DURATION) * 1000;
durationMS = MathUtil.clamp(durationMS, 0, 15000);
return new Promise(resolve => { return new Promise(resolve => {
this._forEachMotor(args.MOTOR_ID, motorIndex => { this._forEachMotor(args.MOTOR_ID, motorIndex => {
const motor = this._device.motor(motorIndex); const motor = this._device.motor(motorIndex);
@ -920,7 +923,7 @@ class Scratch3WeDo2Blocks {
this._forEachMotor(args.MOTOR_ID, motorIndex => { this._forEachMotor(args.MOTOR_ID, motorIndex => {
const motor = this._device.motor(motorIndex); const motor = this._device.motor(motorIndex);
if (motor) { if (motor) {
motor.power = args.POWER; motor.power = MathUtil.clamp(Cast.toNumber(args.POWER), 0, 100);
motor.setMotorOn(); motor.setMotorOn();
} }
}); });
@ -962,7 +965,8 @@ class Scratch3WeDo2Blocks {
*/ */
setLightHue (args) { setLightHue (args) {
// Convert from [0,100] to [0,360] // Convert from [0,100] to [0,360]
const hue = args.HUE * 360 / 100; const inputHue = Cast.toNumber(args.HUE);
const hue = MathUtil.clamp(inputHue, 0, 100) * 360 / 100;
const rgbObject = color.hsvToRgb({h: hue, s: 1, v: 1}); const rgbObject = color.hsvToRgb({h: hue, s: 1, v: 1});
@ -979,9 +983,12 @@ class Scratch3WeDo2Blocks {
* @return {Promise} - a promise which will resolve at the end of the duration. * @return {Promise} - a promise which will resolve at the end of the duration.
*/ */
playNoteFor (args) { playNoteFor (args) {
let durationMS = Cast.toNumber(args.DURATION) * 1000;
durationMS = MathUtil.clamp(durationMS, 0, 3000);
const note = MathUtil.clamp(Cast.toNumber(args.NOTE), 25, 125); // valid WeDo2 sounds
if (durationMS === 0) return; // WeDo2 plays duration '0' forever
return new Promise(resolve => { return new Promise(resolve => {
const durationMS = args.DURATION * 1000; const tone = this._noteToTone(note);
const tone = this._noteToTone(args.NOTE);
this._device.playTone(tone, durationMS); this._device.playTone(tone, durationMS);
// Ensure this block runs for a fixed amount of time even when no device is connected. // Ensure this block runs for a fixed amount of time even when no device is connected.
@ -1000,10 +1007,10 @@ class Scratch3WeDo2Blocks {
switch (args.OP) { switch (args.OP) {
case '<': case '<':
case '&lt;': case '&lt;':
return this._device.distance < args.REFERENCE; return this._device.distance < Cast.toNumber(args.REFERENCE);
case '>': case '>':
case '&gt;': case '&gt;':
return this._device.distance > args.REFERENCE; return this._device.distance > Cast.toNumber(args.REFERENCE);
default: default:
log.warn(`Unknown comparison operator in whenDistance: ${args.OP}`); log.warn(`Unknown comparison operator in whenDistance: ${args.OP}`);
return false; return false;