Merge branch 'master' into production

This commit is contained in:
HF 2022-04-01 13:23:12 +02:00
commit c8c290d889

View File

@ -28,18 +28,19 @@ const METHODS = {
* of chunk area
*/
spare: (xc, yc, clrIgnore, canvasCleaner) => {
let pxl = canvasCleaner.getPixelInChunkArea(xc, yc);
if (pxl === null || pxl < clrIgnore) {
return null;
}
let rplPxl = null;
for (let u = -1; u <= 1; u += 1) {
for (let v = -1; v <= 1; v += 1) {
const pxl = canvasCleaner.getPixelInChunkArea(xc + u, yc + v);
if (pxl === null) {
pxl = canvasCleaner.getPixelInChunkArea(xc + u, yc + v);
if (pxl === null
|| (u === 0 && v === 0)
) {
continue;
}
if (u === 0 && v === 0) {
if (pxl < clrIgnore) {
return null;
}
} else {
if (pxl >= clrIgnore) {
return null;
}
@ -48,29 +49,31 @@ const METHODS = {
}
}
}
}
return rplPxl;
},
spareext: (xc, yc, clrIgnore, canvasCleaner) => {
let rplPxl = null;
let origPxl = null;
for (let u = -1; u <= 1; u += 1) {
for (let v = -1; v <= 1; v += 1) {
const pxl = canvasCleaner.getPixelInChunkArea(xc + u, yc + v);
if (pxl === null) {
continue;
}
if (u === 0 && v === 0) {
if (pxl < clrIgnore || pxl === rplPxl) {
let pxl = canvasCleaner.getPixelInChunkArea(xc, yc);
if (pxl === null || pxl < clrIgnore) {
return null;
}
origPxl = pxl;
} else {
let rplPxl = null;
const origPxl = pxl;
for (let u = -1; u <= 1; u += 1) {
for (let v = -1; v <= 1; v += 1) {
pxl = canvasCleaner.getPixelInChunkArea(xc + u, yc + v);
if (pxl === null
|| (u === 0 && v === 0)
) {
continue;
}
if (rplPxl === null) {
rplPxl = pxl;
continue;
}
if (pxl < clrIgnore) {
continue;
}
if (pxl >= clrIgnore) {
if (rplPxl < clrIgnore) {
rplPxl = pxl;
continue;
@ -80,8 +83,6 @@ const METHODS = {
}
}
}
}
}
if (rplPxl === origPxl) {
return null;
}