mirror of
https://github.com/Azornes/Comfyui-LayerForge.git
synced 2026-03-24 22:12:17 -03:00
Refactor file names and clean up imports
Renamed Mask_tool.js to MaskTool.js and Canvas_view.js to CanvasView.js for consistency. Removed unused imports and redundant properties/methods from Canvas.js and CanvasState.js to streamline the codebase.
This commit is contained in:
40
js/Canvas.js
40
js/Canvas.js
@@ -1,13 +1,11 @@
|
|||||||
import {saveImage, getImage, removeImage} from "./db.js";
|
import {removeImage} from "./db.js";
|
||||||
import {MaskTool} from "./Mask_tool.js";
|
import {MaskTool} from "./MaskTool.js";
|
||||||
import {CanvasState} from "./CanvasState.js";
|
import {CanvasState} from "./CanvasState.js";
|
||||||
import {CanvasInteractions} from "./CanvasInteractions.js";
|
import {CanvasInteractions} from "./CanvasInteractions.js";
|
||||||
import {CanvasLayers} from "./CanvasLayers.js";
|
import {CanvasLayers} from "./CanvasLayers.js";
|
||||||
import {CanvasRenderer} from "./CanvasRenderer.js";
|
import {CanvasRenderer} from "./CanvasRenderer.js";
|
||||||
import {CanvasIO} from "./CanvasIO.js";
|
import {CanvasIO} from "./CanvasIO.js";
|
||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
import {generateUUID, snapToGrid, getSnapAdjustment, worldToLocal, localToWorld} from "./utils/CommonUtils.js";
|
|
||||||
import {withErrorHandling, safeExecute} from "./ErrorHandler.js";
|
|
||||||
const log = createModuleLogger('Canvas');
|
const log = createModuleLogger('Canvas');
|
||||||
|
|
||||||
export class Canvas {
|
export class Canvas {
|
||||||
@@ -34,12 +32,6 @@ export class Canvas {
|
|||||||
this.offscreenCtx = this.offscreenCanvas.getContext('2d', {
|
this.offscreenCtx = this.offscreenCanvas.getContext('2d', {
|
||||||
alpha: false
|
alpha: false
|
||||||
});
|
});
|
||||||
this.renderAnimationFrame = null;
|
|
||||||
this.lastRenderTime = 0;
|
|
||||||
this.internalClipboard = [];
|
|
||||||
this.isMouseOver = false;
|
|
||||||
this.renderInterval = 1000 / 60;
|
|
||||||
this.isDirty = false;
|
|
||||||
|
|
||||||
this.dataInitialized = false;
|
this.dataInitialized = false;
|
||||||
this.pendingDataCheck = null;
|
this.pendingDataCheck = null;
|
||||||
@@ -54,10 +46,6 @@ export class Canvas {
|
|||||||
|
|
||||||
this.setupEventListeners();
|
this.setupEventListeners();
|
||||||
this.initNodeData();
|
this.initNodeData();
|
||||||
this.blendModes = this.canvasLayers.blendModes;
|
|
||||||
this.selectedBlendMode = this.canvasLayers.selectedBlendMode;
|
|
||||||
this.blendOpacity = this.canvasLayers.blendOpacity;
|
|
||||||
this.isAdjustingOpacity = this.canvasLayers.isAdjustingOpacity;
|
|
||||||
|
|
||||||
this.layers = this.layers.map(layer => ({
|
this.layers = this.layers.map(layer => ({
|
||||||
...layer,
|
...layer,
|
||||||
@@ -317,30 +305,6 @@ export class Canvas {
|
|||||||
return this.canvasLayers.addMattedLayer(image, mask);
|
return this.canvasLayers.addMattedLayer(image, mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
processInputData(nodeData) {
|
|
||||||
if (nodeData.input_image) {
|
|
||||||
this.addInputImage(nodeData.input_image);
|
|
||||||
}
|
|
||||||
if (nodeData.input_mask) {
|
|
||||||
this.addInputMask(nodeData.input_mask);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
addInputImage(imageData) {
|
|
||||||
const layer = new ImageLayer(imageData);
|
|
||||||
this.layers.push(layer);
|
|
||||||
this.updateCanvas();
|
|
||||||
}
|
|
||||||
|
|
||||||
addInputMask(maskData) {
|
|
||||||
if (this.inputImage) {
|
|
||||||
const mask = new MaskLayer(maskData);
|
|
||||||
mask.linkToLayer(this.inputImage);
|
|
||||||
this.masks.push(mask);
|
|
||||||
this.updateCanvas();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async addInputToCanvas(inputImage, inputMask) {
|
async addInputToCanvas(inputImage, inputMask) {
|
||||||
return this.canvasIO.addInputToCanvas(inputImage, inputMask);
|
return this.canvasIO.addInputToCanvas(inputImage, inputMask);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import {getCanvasState, setCanvasState, removeCanvasState, saveImage, getImage, removeImage} from "./db.js";
|
import {getCanvasState, setCanvasState, saveImage, getImage} from "./db.js";
|
||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
|
import {generateUUID, cloneLayers, getStateSignature, debounce} from "./utils/CommonUtils.js";
|
||||||
import {withErrorHandling, safeExecute} from "./ErrorHandler.js";
|
import {withErrorHandling} from "./ErrorHandler.js";
|
||||||
const log = createModuleLogger('CanvasState');
|
const log = createModuleLogger('CanvasState');
|
||||||
|
|
||||||
export class CanvasState {
|
export class CanvasState {
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ import {$el} from "../../scripts/ui.js";
|
|||||||
import {Canvas} from "./Canvas.js";
|
import {Canvas} from "./Canvas.js";
|
||||||
import {clearAllCanvasStates} from "./db.js";
|
import {clearAllCanvasStates} from "./db.js";
|
||||||
import {ImageCache} from "./ImageCache.js";
|
import {ImageCache} from "./ImageCache.js";
|
||||||
import {validateImageData, convertImageData, applyMaskToImageData, prepareImageForCanvas, createImageFromSource} from "./utils/ImageUtils.js";
|
|
||||||
import {generateUniqueFileName} from "./utils/CommonUtils.js";
|
import {generateUniqueFileName} from "./utils/CommonUtils.js";
|
||||||
import {logger, LogLevel} from "./logger.js";
|
|
||||||
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
import {createModuleLogger} from "./utils/LoggerUtils.js";
|
||||||
|
|
||||||
const log = createModuleLogger('Canvas_view');
|
const log = createModuleLogger('Canvas_view');
|
||||||
Reference in New Issue
Block a user