Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy(ui): CanvasRegion

Browse Source
This commit is contained in:
psychedelicious 2024-07-17 14:37:57 +10:00
parent 0dc38bd684
commit e329cb45cd
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
invokeai/frontend/web/src/features/controlLayers/konva/CanvasRegion.ts
View File

@ -19,7 +19,7 @@ export class CanvasRegion {
static COMPOSITING_RECT_NAME = `${CanvasRegion.NAME_PREFIX}_compositing-rect`; static COMPOSITING_RECT_NAME = `${CanvasRegion.NAME_PREFIX}_compositing-rect`;
private drawingBuffer: BrushLine | EraserLine | RectShape | null; private drawingBuffer: BrushLine | EraserLine | RectShape | null;
private regionState: RegionEntity; private state: RegionEntity;
id: string; id: string;
manager: CanvasManager; manager: CanvasManager;
@ -34,8 +34,8 @@ export class CanvasRegion {
objects: Map<string, CanvasBrushLine | CanvasEraserLine | CanvasRect>; objects: Map<string, CanvasBrushLine | CanvasEraserLine | CanvasRect>;
constructor(entity: RegionEntity, manager: CanvasManager) { constructor(state: RegionEntity, manager: CanvasManager) {
this.id = entity.id; this.id = state.id;
this.manager = manager; this.manager = manager;
this.konva = { this.konva = {
@ -75,7 +75,7 @@ export class CanvasRegion {
this.konva.group.add(this.konva.compositingRect); this.konva.group.add(this.konva.compositingRect);
this.objects = new Map(); this.objects = new Map();
this.drawingBuffer = null; this.drawingBuffer = null;
this.regionState = entity; this.state = state;
} }
destroy(): void { destroy(): void {
@ -114,20 +114,20 @@ export class CanvasRegion {
this.setDrawingBuffer(null); this.setDrawingBuffer(null);
} }
async render(regionState: RegionEntity) { async render(state: RegionEntity) {
this.regionState = regionState; this.state = state;
// Update the layer's position and listening state // Update the layer's position and listening state
this.konva.group.setAttrs({ this.konva.group.setAttrs({
x: regionState.position.x, x: state.position.x,
y: regionState.position.y, y: state.position.y,
scaleX: 1, scaleX: 1,
scaleY: 1, scaleY: 1,
}); });
let didDraw = false; let didDraw = false;
const objectIds = regionState.objects.map(mapId); const objectIds = state.objects.map(mapId);
// Destroy any objects that are no longer in state // Destroy any objects that are no longer in state
for (const object of this.objects.values()) { for (const object of this.objects.values()) {
if (!objectIds.includes(object.id)) { if (!objectIds.includes(object.id)) {
@ -137,7 +137,7 @@ export class CanvasRegion {
} }
} }
for (const obj of regionState.objects) { for (const obj of state.objects) {
if (await this.renderObject(obj)) { if (await this.renderObject(obj)) {
didDraw = true; didDraw = true;
} }
@ -201,14 +201,14 @@ export class CanvasRegion {
} }
updateGroup(didDraw: boolean) { updateGroup(didDraw: boolean) {
this.konva.layer.visible(this.regionState.isEnabled); this.konva.layer.visible(this.state.isEnabled);
// The user is allowed to reduce mask opacity to 0, but we need the opacity for the compositing rect to work // The user is allowed to reduce mask opacity to 0, but we need the opacity for the compositing rect to work
this.konva.group.opacity(1); this.konva.group.opacity(1);
if (didDraw) { if (didDraw) {
// Convert the color to a string, stripping the alpha - the object group will handle opacity. // Convert the color to a string, stripping the alpha - the object group will handle opacity.
const rgbColor = rgbColorToString(this.regionState.fill); const rgbColor = rgbColorToString(this.state.fill);
const maskOpacity = this.manager.stateApi.getMaskOpacity(); const maskOpacity = this.manager.stateApi.getMaskOpacity();
this.konva.compositingRect.setAttrs({ this.konva.compositingRect.setAttrs({
// The rect should be the size of the layer - use the fast method if we don't have a pixel-perfect bbox already // The rect should be the size of the layer - use the fast method if we don't have a pixel-perfect bbox already