Merge branch 'develop' of https://github.com/llk/scratch-vm into develop

This commit is contained in:
Thomas Weber committed 2020-08-20 20:23:29 -05:00
commit 39f8b2dfd3
2 files changed
+2 -3

No files matched your search

@@ -291,8 +291,7 @@ class VideoMotion {
// The public APIs for Renderer#isTouching manage keeping the matrix and
// silhouette up-to-date, which is needed for drawable#isTouching to work (used below)
drawable.updateMatrix();
if (drawable.skin) drawable.skin.updateSilhouette();
drawable.updateCPURenderAttributes();
// Restrict the region the amount and direction are built from to
// the area of the current frame overlapped by the given drawable's
+1 -1
View File
@@ -87,7 +87,7 @@ const isNearAngle = (actual, expect, optMargin = 10) => (
// A fake scratch-render drawable that will be used by VideoMotion to restrain
// the area considered for motion detection in VideoMotion.getLocalMotion
const fakeDrawable = {
updateMatrix () {}, // no-op, since isTouching always returns true
updateCPURenderAttributes () {}, // no-op, since isTouching always returns true
getFastBounds () {
return {