fix circular dependency (#14612)

BabylonJS · Dec 14, 2023 · 053cd99 · 053cd99
1 parent ccd8ac8
commit 053cd99
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/packages/dev/core/src/FlowGraph/flowGraphBlock.ts b/packages/dev/core/src/FlowGraph/flowGraphBlock.ts
@@ -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";
 
@@ -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;
     }
 }
diff --git a/packages/dev/core/src/FlowGraph/flowGraphExecutionBlock.ts b/packages/dev/core/src/FlowGraph/flowGraphExecutionBlock.ts
@@ -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";
     }