From 42f8040c90feb534d3c32a14821d80c5235f71c8 Mon Sep 17 00:00:00 2001 From: adroitwhiz Date: Sun, 14 Mar 2021 23:01:01 -0400 Subject: [PATCH] Use _skin instead of getter in "touching" methods This provides a slight but noticeable performance improvement, and gains back some of what was lost in the previous commit. --- src/Drawable.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Drawable.js b/src/Drawable.js index c2efc40ae..6f496daf7 100644 --- a/src/Drawable.js +++ b/src/Drawable.js @@ -494,16 +494,16 @@ class Drawable { _isTouchingNearest (vec) { const localPosition = getLocalPosition(this, vec); - if (!this.skin.pointInsideLogicalBounds(localPosition)) return false; + if (!this._skin.pointInsideLogicalBounds(localPosition)) return false; if (this.enabledEffects !== 0) EffectTransform.transformPoint(this, localPosition, localPosition); - return this.skin._silhouette.isTouchingNearest(localPosition); + return this._skin._silhouette.isTouchingNearest(localPosition); } _isTouchingLinear (vec) { const localPosition = getLocalPosition(this, vec); - if (!this.skin.pointInsideLogicalBounds(localPosition)) return false; + if (!this._skin.pointInsideLogicalBounds(localPosition)) return false; if (this.enabledEffects !== 0) EffectTransform.transformPoint(this, localPosition, localPosition); - return this.skin._silhouette.isTouchingLinear(localPosition); + return this._skin._silhouette.isTouchingLinear(localPosition); } /** @@ -767,7 +767,7 @@ class Drawable { */ static sampleColor4b (vec, drawable, dst, effectMask) { const localPosition = getLocalPosition(drawable, vec); - if (!this.skin.pointInsideLogicalBounds(localPosition)) { + if (!this._skin.pointInsideLogicalBounds(localPosition)) { dst[0] = 0; dst[1] = 0; dst[2] = 0; @@ -780,9 +780,9 @@ class Drawable { const textColor = // commenting out to only use nearest for now - // drawable.skin.useNearest(drawable._scale, drawable) ? - drawable.skin._silhouette.colorAtNearest(localPosition, dst); - // : drawable.skin._silhouette.colorAtLinear(localPosition, dst); + // drawable._skin.useNearest(drawable._scale, drawable) ? + drawable._skin._silhouette.colorAtNearest(localPosition, dst); + // : drawable._skin._silhouette.colorAtLinear(localPosition, dst); if (drawable.enabledEffects === 0) return textColor; return EffectTransform.transformColor(drawable, textColor, effectMask);