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

fix(ui): commit drawing buffer on tool change, fixing bbox not calculating

Browse Source
This commit is contained in:
psychedelicious 2024-08-05 20:23:36 +10:00
parent 07e3529948
commit f63847a504
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
invokeai/frontend/web/src/features/controlLayers/konva/CanvasObjectRenderer.ts
View File

@ -37,6 +37,11 @@ export class CanvasObjectRenderer {
log: Logger; log: Logger;
getLoggingContext: (extra?: JSONObject) => JSONObject; getLoggingContext: (extra?: JSONObject) => JSONObject;
/**
* A set of subscriptions that should be cleaned up when the transformer is destroyed.
*/
subscriptions: Set<() => void> = new Set();
/** /**
* A buffer object state that is rendered separately from the other objects. This is used for objects that are being * A buffer object state that is rendered separately from the other objects. This is used for objects that are being
* drawn in real-time, such as brush lines. The buffer object state only exists in this renderer and is not part of * drawn in real-time, such as brush lines. The buffer object state only exists in this renderer and is not part of
@ -56,6 +61,14 @@ export class CanvasObjectRenderer {
this.getLoggingContext = this.manager.buildGetLoggingContext(this); this.getLoggingContext = this.manager.buildGetLoggingContext(this);
this.log = this.manager.buildLogger(this.getLoggingContext); this.log = this.manager.buildLogger(this.getLoggingContext);
this.log.trace('Creating object renderer'); this.log.trace('Creating object renderer');
this.subscriptions.add(
this.manager.toolState.subscribe((newVal, oldVal) => {
if (newVal.selected !== oldVal.selected) {
this.commitBuffer();
}
})
);
} }
/** /**
@ -160,6 +173,8 @@ export class CanvasObjectRenderer {
* @returns A promise that resolves to a boolean, indicating if the object was rendered. * @returns A promise that resolves to a boolean, indicating if the object was rendered.
*/ */
setBuffer = async (objectState: AnyObjectState): Promise<boolean> => { setBuffer = async (objectState: AnyObjectState): Promise<boolean> => {
this.log.trace('Setting buffer object');
this.buffer = objectState; this.buffer = objectState;
return await this.renderObject(this.buffer, true); return await this.renderObject(this.buffer, true);
}; };
@ -168,6 +183,8 @@ export class CanvasObjectRenderer {
* Clears the buffer object state. * Clears the buffer object state.
*/ */
clearBuffer = () => { clearBuffer = () => {
this.log.trace('Clearing buffer object');
this.buffer = null; this.buffer = null;
}; };
@ -176,10 +193,12 @@ export class CanvasObjectRenderer {
*/ */
commitBuffer = () => { commitBuffer = () => {
if (!this.buffer) { if (!this.buffer) {
this.log.warn('No buffer object to commit'); this.log.trace('No buffer object to commit');
return; return;
} }
this.log.trace('Committing buffer object');
// We need to give the objects a fresh ID else they will be considered the same object when they are re-rendered as // We need to give the objects a fresh ID else they will be considered the same object when they are re-rendered as
// a non-buffer object, and we won't trigger things like bbox calculation // a non-buffer object, and we won't trigger things like bbox calculation
this.buffer.id = getPrefixedId(this.buffer.type); this.buffer.id = getPrefixedId(this.buffer.type);
@ -234,6 +253,10 @@ export class CanvasObjectRenderer {
*/ */
destroy = () => { destroy = () => {
this.log.trace('Destroying object renderer'); this.log.trace('Destroying object renderer');
for (const cleanup of this.subscriptions) {
this.log.trace('Cleaning up listener');
cleanup();
}
for (const renderer of this.renderers.values()) { for (const renderer of this.renderers.values()) {
renderer.destroy(); renderer.destroy();
} }