scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-06-13 05:31:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from yueyuzhao/issue/504-dots-to-sharp-corner

Browse source 
add precise guess first when adding points to paths
This commit is contained in:
Deep Malhan 2022-04-08 08:50:11 -04:00 • committed by GitHub
commit ff15b0f5f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions

34
src/painteditor/Path.js
View file

@ -851,20 +851,30 @@ export default class Path {
}
static getHitIndex (ctx, commands, pt) {
ctx.save();
ctx.beginPath();
for (var i = 0; i < commands.length; i++) {
SVG2Canvas.drawCommand(ctx, commands[i]);
ctx.stroke();
pt = Vector.floor(pt);
var pixel = ctx.getImageData(pt.x, pt.y, 1, 1).data;
if (pixel[3] != 0) {
return i;
var drawWithLineMask = function (lineWidth) {
ctx.save();
ctx.lineWidth = lineWidth;
ctx.beginPath();
for (var i = 0; i < commands.length; i++) {
SVG2Canvas.drawCommand(ctx, commands[i]);
ctx.stroke();
pt = Vector.floor(pt);
var pixel = ctx.getImageData(pt.x, pt.y, 1, 1).data;
if (pixel[3] != 0) {
return i;
}
}
ctx.stroke();
ctx.restore();
};
// When using a mouse to add dragging points to paths,
// we need to try a precise guess first.
// For more detail see #504
var index = drawWithLineMask(2);
if (index > -1) {
return index;
}
ctx.stroke();
ctx.restore();
return -1;
return drawWithLineMask(Ghost.linemask);
}
static getHitPointIndex (list, pt) {