alphard/Comfyui-LayerForge
1
0
Fork 0
mirror of https://github.com/Azornes/Comfyui-LayerForge.git synced 2026-03-22 13:12:10 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add addMask method to MaskTool for overlaying masks

Browse Source 
Introduces the addMask method to MaskTool in both JS and TS implementations, allowing new masks to be overlaid without clearing existing ones. Updates CanvasView to use addMask instead of setMask when applying SAM detector results.
This commit is contained in:
Dariusz L
2025-07-22 23:39:56 +02:00
parent 1d520eca01
commit 472f8768a5
4 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/CanvasView.js
View File

@@ -1056,9 +1056,9 @@ async function handleSAMDetectorResult(node, resultImage) {
});
throw new Error("Mask tool not available or not initialized");
}
log.debug("Applying SAM mask to canvas using setMask method");
// Use the setMask method which handles positioning automatically
canvas.maskTool.setMask(maskAsImage);
log.debug("Applying SAM mask to canvas using addMask method");
// Use the addMask method which overlays on existing mask without clearing it
canvas.maskTool.addMask(maskAsImage);
// Update canvas and save state (same as CanvasMask)
canvas.render();
canvas.saveState();

12
js/MaskTool.js
View File

@@ -258,4 +258,16 @@ export class MaskTool {
this.canvasInstance.render();
log.info(`MaskTool updated with a new mask image at correct canvas position (${destX}, ${destY}).`);
}
addMask(image) {
const destX = -this.x;
const destY = -this.y;
// Don't clear existing mask - just add to it
this.maskCtx.globalCompositeOperation = 'source-over';
this.maskCtx.drawImage(image, destX, destY);
if (this.onStateChange) {
this.onStateChange();
}
this.canvasInstance.render();
log.info(`MaskTool added mask overlay at correct canvas position (${destX}, ${destY}) without clearing existing mask.`);
}
}

6
src/CanvasView.ts
View File

@@ -1170,10 +1170,10 @@ async function handleSAMDetectorResult(node: ComfyNode, resultImage: HTMLImageEl
throw new Error("Mask tool not available or not initialized");
}
log.debug("Applying SAM mask to canvas using setMask method");
log.debug("Applying SAM mask to canvas using addMask method");
// Use the setMask method which handles positioning automatically
canvas.maskTool.setMask(maskAsImage);
// Use the addMask method which overlays on existing mask without clearing it
canvas.maskTool.addMask(maskAsImage);
// Update canvas and save state (same as CanvasMask)
canvas.render();

15
src/MaskTool.ts
View File

@@ -336,4 +336,19 @@ export class MaskTool {
this.canvasInstance.render();
log.info(`MaskTool updated with a new mask image at correct canvas position (${destX}, ${destY}).`);
}
addMask(image: HTMLImageElement): void {
const destX = -this.x;
const destY = -this.y;
// Don't clear existing mask - just add to it
this.maskCtx.globalCompositeOperation = 'source-over';
this.maskCtx.drawImage(image, destX, destY);
if (this.onStateChange) {
this.onStateChange();
}
this.canvasInstance.render();
log.info(`MaskTool added mask overlay at correct canvas position (${destX}, ${destY}) without clearing existing mask.`);
}
}