fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 23:08:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Imaginate node from crashing (#1512)

Browse Source 
* Allow generic node input for type inference

* Make imaginate resolution picking depend on the image resolution instead of the transform

* Remove dead code

* Fix console spam after crash

* Fix crash when disconnecting Imaginate node input

* Update Imaginate tool tooltip

---------

Co-authored-by: Dennis Kobert <dennis@kobert.dev>
This commit is contained in:
Keavon Chambers
2023-12-12 22:39:33 -08:00
committed by GitHub
parent f58aa73edc
commit 83af879a7c
15 changed files with 98 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/state-providers/portfolio.ts
View File

@@ -4,7 +4,7 @@ import { writable } from "svelte/store";
import { copyToClipboardFileURL } from "@graphite/io-managers/clipboard";
import { downloadFileText, downloadFileBlob, upload } from "@graphite/utility-functions/files";
import { extractPixelData, imageToPNG, rasterizeSVG, rasterizeSVGCanvas } from "@graphite/utility-functions/rasterization";
import { extractPixelData, imageToPNG, rasterizeSVG } from "@graphite/utility-functions/rasterization";
import { type Editor } from "@graphite/wasm-communication/editor";
import {
type FrontendDocumentDetails,
@@ -15,7 +15,6 @@ import {
TriggerDownloadTextFile,
TriggerImport,
TriggerOpenDocument,
TriggerRasterizeRegionBelowLayer,
TriggerRevokeBlobUrl,
UpdateActiveDocument,
UpdateImageData,
@@ -116,23 +115,6 @@ export function createPortfolioState(editor: Editor) {
editor.instance.setImageBlobURL(updateImageData.documentId, element.path, element.nodeId, blobURL, image.naturalWidth, image.naturalHeight, element.transform);
});
});
editor.subscriptions.subscribeJsMessage(TriggerRasterizeRegionBelowLayer, async (triggerRasterizeRegionBelowLayer) => {
const { documentId, layerPath, svg, size } = triggerRasterizeRegionBelowLayer;
// Rasterize the SVG to an image file
try {
if (size[0] >= 1 && size[1] >= 1) {
const imageData = (await rasterizeSVGCanvas(svg, size[0], size[1])).getContext("2d")?.getImageData(0, 0, size[0], size[1]);
if (!imageData) return;
editor.instance.renderGraphUsingRasterizedRegionBelowLayer(documentId, layerPath, new Uint8Array(imageData.data), imageData.width, imageData.height);
}
} catch (e) {
// getImageData may throw an exception if the resolution is too high
// eslint-disable-next-line no-console
console.error("Failed to rasterize the SVG canvas in JS to be sent back to Rust:", e);
}
});
editor.subscriptions.subscribeJsMessage(TriggerRevokeBlobUrl, async (triggerRevokeBlobUrl) => {
URL.revokeObjectURL(triggerRevokeBlobUrl.url);
});

17
frontend/src/wasm-communication/messages.ts
View File

@@ -560,16 +560,6 @@ export class TriggerDownloadTextFile extends JsMessage {
readonly name!: string;
}
export class TriggerRasterizeRegionBelowLayer extends JsMessage {
readonly documentId!: bigint;
readonly layerPath!: BigUint64Array;
readonly svg!: string;
readonly size!: [number, number];
}
export class TriggerRefreshBoundsOfViewports extends JsMessage {}
export class TriggerRevokeBlobUrl extends JsMessage {
@@ -672,8 +662,8 @@ export class DisplayEditableTextboxTransform extends JsMessage {
export class UpdateImageData extends JsMessage {
readonly documentId!: bigint;
@Type(() => ImaginateImageData)
readonly imageData!: ImaginateImageData[];
@Type(() => RenderedImageData)
readonly imageData!: RenderedImageData[];
}
export class DisplayRemoveEditableTextbox extends JsMessage {}
@@ -710,7 +700,7 @@ export class LayerMetadata {
export type LayerType = "Folder" | "Layer" | "Artboard";
export class ImaginateImageData {
export class RenderedImageData {
readonly path!: BigUint64Array;
readonly nodeId!: bigint;
@@ -1415,7 +1405,6 @@ export const messageMakers: Record<string, MessageMaker> = {
TriggerLoadPreferences,
TriggerOpenDocument,
TriggerPaste,
TriggerRasterizeRegionBelowLayer,
TriggerRefreshBoundsOfViewports,
TriggerRevokeBlobUrl,
TriggerSavePreferences,