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 #1040 from paulkaplan/filter-dragging-touching

Browse source 
Filter out dragging targets from touching sprite check.
This commit is contained in:
Paul Kaplan 2018-04-11 09:17:52 -04:00 committed by GitHub
commit 2478f2ff8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -734,7 +734,11 @@ class RenderedTarget extends Target {
if (!firstClone || !this.renderer) { if (!firstClone || !this.renderer) {
return false; return false;
} }
const drawableCandidates = firstClone.sprite.clones.map(clone => clone.drawableID); // Filter out dragging targets. This means a sprite that is being dragged
// can detect other sprites using touching <sprite>, but cannot be detected
// by other sprites while it is being dragged. This matches Scratch 2.0 behavior.
const drawableCandidates = firstClone.sprite.clones.filter(clone => !clone.dragging)
.map(clone => clone.drawableID);
return this.renderer.isTouchingDrawables( return this.renderer.isTouchingDrawables(
this.drawableID, drawableCandidates); this.drawableID, drawableCandidates);
} }