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

Merge pull request #881 from sjhuang26/issue-gui1127-pen-trails

Browse source 
No pen trails when dragging
This commit is contained in:
Paul Kaplan 2017-12-29 10:22:18 -05:00 committed by GitHub
commit 4fd7ba896a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/extensions/scratch3_pen/index.js
View file

@ -181,9 +181,12 @@ class Scratch3PenBlocks {
* @param {RenderedTarget} target - the target which has moved.
* @param {number} oldX - the previous X position.
* @param {number} oldY - the previous Y position.
* @param {boolean} isForce - whether the movement was forced.
* @private
*/
_onTargetMoved (target, oldX, oldY) {
_onTargetMoved (target, oldX, oldY, isForce) {
// Only move the pen if the movement isn't forced (ie. dragged).
if (!isForce) {
const penSkinId = this._getPenLayerID();
if (penSkinId >= 0) {
const penState = this._getPenState(target);
@ -191,6 +194,7 @@ class Scratch3PenBlocks {
this.runtime.requestRedraw();
}
}
}
/**
* Wrap a color input into the range (0,100).

11
src/sprites/rendered-target.js
View file

@ -203,7 +203,7 @@ class RenderedTarget extends Target {
this.x = x;
this.y = y;
}
this.emit(RenderedTarget.EVENT_TARGET_MOVED, this, oldX, oldY);
this.emit(RenderedTarget.EVENT_TARGET_MOVED, this, oldX, oldY, force);
this.runtime.requestTargetsUpdate(this);
}
@ -864,11 +864,10 @@ class RenderedTarget extends Target {
*/
postSpriteInfo (data) {
const force = data.hasOwnProperty('force') ? data.force : null;
if (data.hasOwnProperty('x')) {
this.setXY(data.x, this.y, force);
}
if (data.hasOwnProperty('y')) {
this.setXY(this.x, data.y, force);
const isXChanged = data.hasOwnProperty('x');
const isYChanged = data.hasOwnProperty('y');
if (isXChanged || isYChanged) {
this.setXY(isXChanged ? data.x : this.x, isYChanged ? data.y : this.y, force);
}
if (data.hasOwnProperty('direction')) {
this.setDirection(data.direction);