Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

isTargetTransparent() now samples the cache directly. #4955

Merged
merged 2 commits into from
May 19, 2018
Merged

isTargetTransparent() now samples the cache directly. #4955

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3665449
isTargetTransparent() now samples the cache directly.
AndrewJDR May 7, 2018
c30e5b4
remove cacheDirty that should not be needed.
asturur May 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/canvas.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,17 @@
* @return {Boolean}
*/
isTargetTransparent: function (target, x, y) {
if (target.shouldCache() && target._cacheCanvas && !target.isCacheDirty()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldCache() returns the result of this.objectCaching && (!this.group || this.needsItsOwnCache() || !this.group.isOnACache()). Does this seem sufficient?

var normalizedPointer = this._normalizePointer(target, {x: x, y: y}),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to use _normalizePointer() here, which uses the xform matrix so it handles rotation etc.

targetRelativeX = target.cacheTranslationX + (normalizedPointer.x * target.zoomX),
targetRelativeY = target.cacheTranslationY + (normalizedPointer.y * target.zoomY);

var isTransparent = fabric.util.isTransparent(
target._cacheContext, targetRelativeX, targetRelativeY, this.targetFindTolerance);

return isTransparent;
}

var ctx = this.contextCache,
originalColor = target.selectionBackgroundColor, v = this.viewportTransform;

Expand Down