fix: minor preview fixes when removing objects from graph or switching camera

Author: julien-moreau

editor/src/editor/layout/graph/remove.ts

@@ -144,7 +144,7 @@ export function removeNodes(editor: Editor) {
 		},
 		redo: () => {
 			nodes.forEach((d) => {
-				removeNodeData(d, scene);
+				removeNodeData(editor, d, scene);
 			});
 
 			sounds.forEach((d) => {
@@ -214,7 +214,7 @@ function restoreNodeData(data: _RemoveNodeData, scene: Scene) {
 	}
 }
 
-function removeNodeData(data: _RemoveNodeData, scene: Scene) {
+function removeNodeData(editor: Editor, data: _RemoveNodeData, scene: Scene) {
 	const node = data.node;
 
 	if (isAbstractMesh(node)) {
@@ -243,5 +243,9 @@ function removeNodeData(data: _RemoveNodeData, scene: Scene) {
 
 	if (isCamera(node)) {
 		scene.removeCamera(node);
+
+		if (node === editor.layout.preview._previewCamera) {
+			editor.layout.preview.setCameraPreviewActive(null);
+		}
 	}
 }

editor/src/editor/layout/preview.tsx

@@ -173,7 +173,8 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 	private _mainCanvas: HTMLCanvasElement | null = null;
 	private _mainView: EngineView | null = null;
 
-	private _previewCamera: Camera | null = null;
+	/** @internal */
+	public _previewCamera: Camera | null = null;
 
 	public constructor(props: IEditorPreviewProps) {
 		super(props);
@@ -246,7 +247,7 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 					<EditorPreviewIcons ref={(r) => this._onGotIconsRef(r!)} editor={this.props.editor} />
 				</EditorGraphContextMenu>
 
-				{this._previewCamera && (
+				{this._previewCamera && this.scene?.cameras.includes(this._previewCamera) && (
 					<EditorPreviewCamera hidden={this.play?.state.playing} key={this._previewCamera.id} editor={this.props.editor} camera={this._previewCamera} />
 				)}
 
@@ -451,7 +452,7 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 	 * @param camera the camera to activate the preview
 	 */
 	public setCameraPreviewActive(camera: Camera | null): void {
-		if (this._previewCamera === camera) {
+		if (this._previewCamera === camera || camera === this.scene.activeCamera) {
 			return;
 		}
 
@@ -1116,6 +1117,10 @@ export class EditorPreview extends Component<IEditorPreviewProps, IEditorPreview
 		});
 
 		this.props.editor.layout.inspector.forceUpdate();
+
+		if (this._previewCamera === camera) {
+			this.setCameraPreviewActive(null);
+		}
 	}
 
 	/**

editor/src/editor/layout/preview/gizmo.ts

@@ -145,15 +145,15 @@ export class EditorPreviewGizmo {
 				this._spriteTransformNode.scaling.set(object.width, object.height, 1);
 				this._spriteTransformNode.rotation.set(0, 0, object.angle);
 			}
+		}
 
-			if (isCamera(object)) {
-				this._cameraGizmo ??= new CameraGizmo(this._gizmosLayer);
-				this._cameraGizmo.camera = object;
-				this._cameraGizmo.attachedNode = object;
-			} else {
-				this._cameraGizmo?.dispose();
-				this._cameraGizmo = null;
-			}
+		if (object && isCamera(object) && this._gizmosLayer.originalScene.cameras.includes(object)) {
+			this._cameraGizmo ??= new CameraGizmo(this._gizmosLayer);
+			this._cameraGizmo.camera = object;
+			this._cameraGizmo.attachedNode = object;
+		} else {
+			this._cameraGizmo?.dispose();
+			this._cameraGizmo = null;
 		}
 
 		if (this.currentGizmo) {