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

Merge pull request #2068 from ericrosenbaum/bugfix/vernier-stabilize-facing

Browse source 
Stabilize Vernier "turned faced up/down" hat events
This commit is contained in:
Eric Rosenbaum 2019-03-25 16:24:22 -04:00 committed by GitHub
commit fce555fc7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/extensions/scratch3_gdx_for/index.js
View file

@ -80,6 +80,12 @@ const SHAKEN_THRESHOLD = 30;
*/ */
const FACING_THRESHOLD = 9; const FACING_THRESHOLD = 9;
/**
* An offset for the facing threshold, used to check that we are no longer facing up.
* @type {number}
*/
const FACING_THRESHOLD_OFFSET = 5;
/** /**
* Threshold for acceleration magnitude, below which we are in freefall. * Threshold for acceleration magnitude, below which we are in freefall.
* @type {number} * @type {number}
@ -783,15 +789,44 @@ class Scratch3GdxForBlocks {
case GestureValues.STARTED_FALLING: case GestureValues.STARTED_FALLING:
return this.isFreeFalling(); return this.isFreeFalling();
case GestureValues.TURNED_FACE_UP: case GestureValues.TURNED_FACE_UP:
return this._peripheral.getAccelerationZ() > FACING_THRESHOLD; return this._isFacing(GestureValues.TURNED_FACE_UP);
case GestureValues.TURNED_FACE_DOWN: case GestureValues.TURNED_FACE_DOWN:
return this._peripheral.getAccelerationZ() < FACING_THRESHOLD * -1; return this._isFacing(GestureValues.TURNED_FACE_DOWN);
default: default:
log.warn(`unknown gesture value in whenGesture: ${args.GESTURE}`); log.warn(`unknown gesture value in whenGesture: ${args.GESTURE}`);
return false; return false;
} }
} }
_isFacing (direction) {
if (typeof this._facingUp === 'undefined') {
this._facingUp = false;
}
if (typeof this._facingDown === 'undefined') {
this._facingDown = false;
}
// If the sensor is already facing up or down, reduce the threshold.
// This prevents small fluctations in acceleration while it is being
// turned from causing the hat block to trigger multiple times.
let threshold = FACING_THRESHOLD;
if (this._facingUp || this._facingDown) {
threshold -= FACING_THRESHOLD_OFFSET;
}
this._facingUp = this._peripheral.getAccelerationZ() > threshold;
this._facingDown = this._peripheral.getAccelerationZ() < threshold * -1;
switch (direction) {
case GestureValues.TURNED_FACE_UP:
return this._facingUp;
case GestureValues.TURNED_FACE_DOWN:
return this._facingDown;
default:
return false;
}
}
whenTilted (args) { whenTilted (args) {
return this._isTilted(args.TILT); return this._isTilted(args.TILT);
} }