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

Fixing motor status setter to not clear rotation if already in rotation state.

Browse source
This commit is contained in:
Evelyn Eastmond 2019-04-28 20:42:38 -04:00
parent 5109cd474c
commit 75eae9a58a
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/extensions/scratch3_boost/index.js
View file

@ -432,7 +432,10 @@ class BoostMotor {
*/ */
set status (value) { set status (value) {
// Clear any time- or rotation-related state from motor and set new status. // Clear any time- or rotation-related state from motor and set new status.
this._clearRotationState(); if (value !== BoostMotorState.ON_FOR_ROTATION) {
this._clearRotationState();
console.log('clearing rotation state');
}
this._clearTimeout(); this._clearTimeout();
this._status = value; this._status = value;
} }
@ -493,7 +496,8 @@ class BoostMotor {
/** /**
* Turn this motor on indefinitely * Turn this motor on indefinitely
*/ */
turnOnForever (){ turnOnForever() {
console.log('turnOnForever');
this.status = BoostMotorState.ON_FOREVER; this.status = BoostMotorState.ON_FOREVER;
this._turnOn(); this._turnOn();
@ -504,7 +508,8 @@ class BoostMotor {
* Turn this motor on for a specific duration. * Turn this motor on for a specific duration.
* @param {number} milliseconds - run the motor for this long. * @param {number} milliseconds - run the motor for this long.
*/ */
turnOnFor (milliseconds) { turnOnFor(milliseconds) {
console.log('turnOnFor');
milliseconds = Math.max(0, milliseconds); milliseconds = Math.max(0, milliseconds);
this.status = BoostMotorState.ON_FOR_TIME; this.status = BoostMotorState.ON_FOR_TIME;
this._turnOn(); this._turnOn();
@ -519,6 +524,7 @@ class BoostMotor {
* @param {number} direction - rotate in this direction * @param {number} direction - rotate in this direction
*/ */
turnOnForDegrees (degrees, direction) { turnOnForDegrees (degrees, direction) {
console.log('turnOnForDegrees');
degrees = Math.max(0, degrees); degrees = Math.max(0, degrees);
const cmd = this._parent.generateOutputCommand( const cmd = this._parent.generateOutputCommand(
@ -545,7 +551,8 @@ class BoostMotor {
* Turn this motor off. * Turn this motor off.
* @param {boolean} [useLimiter=true] - if true, use the rate limiter * @param {boolean} [useLimiter=true] - if true, use the rate limiter
*/ */
turnOff (useLimiter = true) { turnOff(useLimiter = true) {
console.log('turnOff');
const cmd = this._parent.generateOutputCommand( const cmd = this._parent.generateOutputCommand(
this._index, this._index,
BoostOutputExecution.EXECUTE_IMMEDIATELY ^ BoostOutputExecution.COMMAND_FEEDBACK, BoostOutputExecution.EXECUTE_IMMEDIATELY ^ BoostOutputExecution.COMMAND_FEEDBACK,
@ -1727,7 +1734,9 @@ class Scratch3BoostBlocks {
* Make sure all promises are resolved, i.e. all motor-commands have completed. * Make sure all promises are resolved, i.e. all motor-commands have completed.
* To prevent the block from returning a value, an empty function is added to the .then * To prevent the block from returning a value, an empty function is added to the .then
*/ */
return Promise.all(promises).then(() => {}); return Promise.all(promises).then(() => {
console.log('motorOnForRotation resolved');
});
} }
/** /**