mirror/pixel-editor
1
0
Fork 0
mirror of https://github.com/lospec/pixel-editor.git synced 2023-08-10 21:12:51 +03:00
Code Issues Projects Releases Wiki Activity

Committing right algorithm before optimizing it

Browse Source
This commit is contained in:
Nicola 2022-01-05 12:02:35 +01:00
parent bb657976e8
commit e139a6cc41
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/tools/LassoSelectionTool.js
View File

@ -14,6 +14,7 @@ class LassoSelectionTool extends SelectionTool {
// Putting the vfx layer on top of everything // Putting the vfx layer on top of everything
currFile.VFXLayer.canvas.style.zIndex = MAX_Z_INDEX; currFile.VFXLayer.canvas.style.zIndex = MAX_Z_INDEX;
// clearSelection(); // clearSelection();
this.boundingBox = {minX: 9999999, maxX: -1, minY: 9999999, maxY: -1};
this.currentPixels = []; this.currentPixels = [];
this.drawSelection(); this.drawSelection();
this.currentPixels.push([mousePos[0] / currFile.zoom, mousePos[1] / currFile.zoom]); this.currentPixels.push([mousePos[0] / currFile.zoom, mousePos[1] / currFile.zoom]);
@ -105,15 +106,20 @@ class LassoSelectionTool extends SelectionTool {
visit(pixel, visited) { visit(pixel, visited) {
let toVisit = [pixel]; let toVisit = [pixel];
let selected = []; let selected = [];
let currVisited = {};
while (toVisit.length > 0) { while (toVisit.length > 0) {
pixel = toVisit.pop(); pixel = toVisit.pop();
selected.push(pixel); selected.push(pixel);
visited.push(pixel);
visited[pixel] = true;
currVisited[pixel] = true;
let col = currFile.VFXLayer.context.getImageData(pixel[0], pixel[1], 1, 1).data; let col = currFile.VFXLayer.context.getImageData(pixel[0], pixel[1], 1, 1).data;
if (col[3] == 255) if (col[3] == 255)
continue; continue;
if (this.isBorderOfBox(pixel))
return [];
let top, bottom, left, right; let top, bottom, left, right;
if (pixel[1] > 0) if (pixel[1] > 0)
@ -136,18 +142,14 @@ class LassoSelectionTool extends SelectionTool {
else else
right = undefined; right = undefined;
if ((right != undefined && this.isBorderOfBox(right)) || (left != undefined && this.isBorderOfBox(left))
|| (top != undefined && this.isBorderOfBox(top)) || (bottom != undefined && this.isBorderOfBox(bottom)))
return [];
// The include problem: https://stackoverflow.com/questions/19543514/check-whether-an-array-exists-in-an-array-of-arrays // The include problem: https://stackoverflow.com/questions/19543514/check-whether-an-array-exists-in-an-array-of-arrays
if (right != undefined && !visited.includes(right)) if (right != undefined && currVisited[right] == undefined)
toVisit.push(right); toVisit.push(right);
if (left != undefined && !visited.includes(left)) if (left != undefined && currVisited[left] == undefined)
toVisit.push(left); toVisit.push(left);
if (top != undefined && !visited.includes(top)) if (top != undefined && currVisited[top] == undefined)
toVisit.push(top); toVisit.push(top);
if (bottom != undefined && !visited.includes(bottom)) if (bottom != undefined && currVisited[bottom] == undefined)
toVisit.push(bottom); toVisit.push(bottom);
} }
@ -156,7 +158,7 @@ class LassoSelectionTool extends SelectionTool {
getSelection() { getSelection() {
let selected = []; let selected = [];
let visited = []; let visited = {};
if (this.currentPixels.length <= 1){ if (this.currentPixels.length <= 1){
return; return;
} }
@ -170,12 +172,12 @@ class LassoSelectionTool extends SelectionTool {
* are inside the selection * are inside the selection
*/ */
for (let x=this.boundingBox.minX; x<this.boundingBox.maxX; x++) { for (let x=this.boundingBox.minX; x<=this.boundingBox.maxX; x++) {
for (let y=this.boundingBox.minY; y<this.boundingBox.maxY; y++) { for (let y=this.boundingBox.minY; y<=this.boundingBox.maxY; y++) {
if (!visited.includes([x, y])) { if (visited[x, y] == undefined) {
let insidePixels = this.visit([x,y], visited); let insidePixels = this.visit([x,y], visited);
for (let i=0; i<insidePixels; i++) { for (let i=0; i<insidePixels.length; i++) {
selected.push(insidePixels[i]); selected.push(insidePixels[i]);
} }
} }