fix: don't save animation groups from scene links

add node in workers when editing scene in separate window

Author: julien-moreau

editor/src/editor/nodes/scene-link.ts

@@ -1,6 +1,6 @@
 import { join, dirname } from "path/posix";
 
-import { GetClass, Matrix, Node, Scene, SerializationHelper, serialize, Tools, TransformNode } from "babylonjs";
+import { GetClass, Matrix, Node, Scene, SerializationHelper, serialize, Tools, TransformNode, Tags } from "babylonjs";
 
 import { UniqueNumber } from "../../tools/tools";
 
@@ -64,6 +64,10 @@ export class SceneLinkNode extends TransformNode {
 		this._lastLoadResult?.cameras.forEach((camera) => !camera.parent && (camera.parent = this));
 		this._lastLoadResult?.transformNodes.forEach((transformNode) => !transformNode.parent && (transformNode.parent = this));
 
+		this._lastLoadResult.animationGroups.forEach((animationGroup) => {
+			Tags.AddTagsTo(animationGroup, "from-scene-link");
+		});
+
 		return this._lastLoadResult;
 	}
 

editor/src/editor/window.ts

@@ -138,6 +138,7 @@ export async function createCustomWindow(indexPath: string, options: any): Promi
 		height: 800,
 		webPreferences: {
 			nodeIntegration: true,
+			nodeIntegrationInWorker: true,
 			contextIsolation: process.env.DEBUG !== "true",
 			preload: join(app.getAppPath(), "build/src/editor/windows/preload.js"),
 		},

editor/src/project/save/scene.ts

@@ -9,14 +9,14 @@ import { Editor } from "../../editor/main";
 
 import { isSceneLinkNode } from "../../tools/guards/scene";
 import { applyAssetsCache } from "../../tools/assets/cache";
-import { isFromSceneLink } from "../../tools/scene/scene-link";
 import { isNodeVisibleInGraph } from "../../tools/node/metadata";
 import { getBufferSceneScreenshot } from "../../tools/scene/screenshot";
 import { createDirectoryIfNotExist, normalizedGlob } from "../../tools/fs";
 import { isSpriteManagerNode, isSpriteMapNode } from "../../tools/guards/sprites";
 import { isGPUParticleSystem, isParticleSystem } from "../../tools/guards/particles";
 import { serializePhysicsAggregate } from "../../tools/physics/serialization/aggregate";
-import { isCollisionMesh, isEditorCamera, isMesh, isTransformNode } from "../../tools/guards/nodes";
+import { isAnimationGroupFromSceneLink, isFromSceneLink } from "../../tools/scene/scene-link";
+import { isAnyTransformNode, isCollisionMesh, isEditorCamera, isMesh, isTransformNode } from "../../tools/guards/nodes";
 
 import { vlsPostProcessCameraConfigurations } from "../../editor/rendering/vls";
 import { saveRenderingConfigurationForCamera } from "../../editor/rendering/tools";
@@ -308,7 +308,7 @@ export async function saveScene(editor: Editor, projectPath: string, scenePath:
 	// Write transform nodes
 	await Promise.all(
 		scene.transformNodes.map(async (transformNode) => {
-			if (!isTransformNode(transformNode)) {
+			if (!isTransformNode(transformNode) || isFromSceneLink(transformNode)) {
 				return;
 			}
 
@@ -513,6 +513,11 @@ export async function saveScene(editor: Editor, projectPath: string, scenePath:
 		scene.particleSystems.map(async (particleSystem) => {
 			const particleSystemPath = join(scenePath, "particleSystems", `${particleSystem.id}.json`);
 
+			const emitter = particleSystem.emitter;
+			if (emitter && isAnyTransformNode(emitter) && isFromSceneLink(emitter)) {
+				return;
+			}
+
 			try {
 				const data = particleSystem.serialize(true);
 
@@ -537,6 +542,10 @@ export async function saveScene(editor: Editor, projectPath: string, scenePath:
 	// Write animation groups
 	await Promise.all(
 		scene.animationGroups?.map(async (animationGroup) => {
+			if (isAnimationGroupFromSceneLink(animationGroup)) {
+				return;
+			}
+
 			const animationGroupPath = join(scenePath, "animationGroups", `${filenamify(animationGroup.name)}_${animationGroup.uniqueId}.json`);
 
 			try {
@@ -555,7 +564,7 @@ export async function saveScene(editor: Editor, projectPath: string, scenePath:
 	// Write sprite maps
 	await Promise.all(
 		scene.transformNodes.map(async (transformNode) => {
-			if (!isSpriteMapNode(transformNode)) {
+			if (!isSpriteMapNode(transformNode) || isFromSceneLink(transformNode)) {
 				return;
 			}
 
@@ -583,7 +592,7 @@ export async function saveScene(editor: Editor, projectPath: string, scenePath:
 	// Write sprite managers
 	await Promise.all(
 		scene.transformNodes.map(async (transformNode) => {
-			if (!isSpriteManagerNode(transformNode)) {
+			if (!isSpriteManagerNode(transformNode) || isFromSceneLink(transformNode)) {
 				return;
 			}
 

editor/src/tools/scene/scene-link.ts

@@ -1,6 +1,6 @@
 import { join, dirname, basename } from "path/posix";
 
-import { Node } from "babylonjs";
+import { Node, AnimationGroup, Tags } from "babylonjs";
 
 import { Editor } from "../../editor/main";
 import { SceneLinkNode } from "../../editor/nodes/scene-link";
@@ -41,6 +41,13 @@ export function isFromSceneLink(node: Node) {
 	return false;
 }
 
+/**
+ * Returns whether or not the given animation group comes from a SceneLinkNode instance.
+ */
+export function isAnimationGroupFromSceneLink(animationGroup: AnimationGroup) {
+	return Tags.MatchesQuery(animationGroup, "from-scene-link");
+}
+
 /**
  * Returns the firt root SceneLinkNode found for the given node.
  * In case the node is not from a scene link, "null" is returned.