Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix circular dependency #14612

Merged
merged 1 commit into from Dec 14, 2023
Merged

fix circular dependency #14612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 1 addition & 19 deletions packages/dev/core/src/FlowGraph/flowGraphBlock.ts
View file
Open in desktop
Expand Up @@ -5,7 +5,6 @@ import { FlowGraphDataConnection } from "./flowGraphDataConnection";
import type { RichType } from "./flowGraphRichTypes";
import { Tools } from "core/Misc/tools";
import type { ISerializedFlowGraphBlock } from "./typeDefinitions";
import { FlowGraphExecutionBlock } from "./flowGraphExecutionBlock";
import { defaultValueParseFunction, defaultValueSerializationFunction } from "./serialization";
import type { Scene } from "../scene";

Expand Down Expand Up @@ -135,24 +134,7 @@ export class FlowGraphBlock {
}
}
obj.metadata = serializationObject.metadata;
if (obj instanceof FlowGraphExecutionBlock) {
for (let i = 0; i < serializationObject.signalInputs.length; i++) {
const signalInput = obj.getSignalInput(serializationObject.signalInputs[i].name);
if (signalInput) {
signalInput.deserialize(serializationObject.signalInputs[i]);
} else {
throw new Error("Could not find signal input with name " + serializationObject.signalInputs[i].name + " in block " + serializationObject.className);
}
}
for (let i = 0; i < serializationObject.signalOutputs.length; i++) {
const signalOutput = obj.getSignalOutput(serializationObject.signalOutputs[i].name);
if (signalOutput) {
signalOutput.deserialize(serializationObject.signalOutputs[i]);
} else {
throw new Error("Could not find signal output with name " + serializationObject.signalOutputs[i].name + " in block " + serializationObject.className);
}
}
}
obj.deserialize && obj.deserialize(serializationObject);
return obj;
}
}
19 changes: 19 additions & 0 deletions packages/dev/core/src/FlowGraph/flowGraphExecutionBlock.ts
View file
Open in desktop
Expand Up @@ -71,6 +71,25 @@ export abstract class FlowGraphExecutionBlock extends FlowGraphBlock {
}
}

public deserialize(serializationObject: any) {
for (let i = 0; i < serializationObject.signalInputs.length; i++) {
const signalInput = this.getSignalInput(serializationObject.signalInputs[i].name);
if (signalInput) {
signalInput.deserialize(serializationObject.signalInputs[i]);
} else {
throw new Error("Could not find signal input with name " + serializationObject.signalInputs[i].name + " in block " + serializationObject.className);
}
}
for (let i = 0; i < serializationObject.signalOutputs.length; i++) {
const signalOutput = this.getSignalOutput(serializationObject.signalOutputs[i].name);
if (signalOutput) {
signalOutput.deserialize(serializationObject.signalOutputs[i]);
} else {
throw new Error("Could not find signal output with name " + serializationObject.signalOutputs[i].name + " in block " + serializationObject.className);
}
}
}

public getClassName(): string {
return "FGExecutionBlock";
}
Expand Down