[Editor] FetchEntity command

Author: Kryptos-FR

sources/editor/Stride.Assets.Editor.Avalonia/Views/EntityPropertyTemplateProviders.axaml

@@ -89,7 +89,7 @@
         <UniformGrid Rows="1" DockPanel.Dock="Right">
           <Button IsVisible="{Binding [HasCommand_PickupEntity]}"
                   Command="{Binding [PickupEntity]}"
-                  CommandParameter="{sd:MultiBinding {Binding [OwnerAsset]}, {Binding Source={x:Null}},
+                  CommandParameter="{sd:MultiBinding {Binding [OwnerAsset]}, {Binding Source={x:Static AvaloniaProperty.UnsetValue}},
                                                      Converter={sd:MultiToTuple}}"
                   ToolTip.Tip="{sd:LocalizeString Select an asset, Context=ToolTip}">
             <Image Source="{StaticResource ImagePickup}" Width="16" Height="16"/>

sources/editor/Stride.Assets.Editor/Quantum/NodePresenters/Commands/FetchEntityCommand.cs

@@ -0,0 +1,59 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Stride.Assets.Editor.ViewModels;
+using Stride.Assets.Presentation.ViewModels;
+using Stride.Core;
+using Stride.Core.Assets.Editor.Services;
+using Stride.Core.Presentation.Quantum.Presenters;
+using Stride.Engine;
+
+namespace Stride.Assets.Editor.Quantum.NodePresenters.Commands;
+
+internal sealed class FetchEntityCommand : SyncNodePresenterCommandBase
+{
+    /// <summary>
+    /// The name of this command.
+    /// </summary>
+    public const string CommandName = "FetchEntity";
+
+    /// <inheritdoc/>
+    public override string Name => CommandName;
+
+    public override bool CanAttach(INodePresenter nodePresenter)
+    {
+        return typeof(Entity).IsAssignableFrom(nodePresenter.Type) || typeof(EntityComponent).IsAssignableFrom(nodePresenter.Type);
+    }
+
+    protected override void ExecuteSync(INodePresenter nodePresenter, object? parameter, object? preExecuteResult)
+    {
+        if (parameter is EntityHierarchyViewModel hierarchy)
+        {
+            Fetch(hierarchy, nodePresenter.Value);
+        }
+    }
+
+    /// <summary>
+    /// Fetches the entity corresponding to the given content.
+    /// </summary>
+    /// <param name="hierarchy">The hierarchy owning the entity to fetch.</param>
+    /// <param name="content">The entity to fetch, or one of its components.</param>
+    public static void Fetch(EntityHierarchyViewModel hierarchy, object content)
+    {
+        var entity = content is EntityComponent component ? component.Entity : content as Entity;
+        if (entity is null)
+            return;
+
+        if (!hierarchy.ServiceProvider.Get<IAssetEditorsManager>().TryGetAssetEditor<EntityHierarchyEditorViewModel>(hierarchy, out var editor))
+            return;
+
+        var partId = new AbsoluteId(hierarchy.Id, entity.Id);
+        if (editor.FindPartViewModel(partId) is not EntityViewModel viewModel)
+            return;
+
+        editor.SelectedItems.Clear();
+        editor.SelectedItems.Add(viewModel);
+        // FIXME xplat-editor
+        //editor.Controller.GetService<IEditorGameEntityCameraViewModelService>().CenterOnEntity(viewModel);
+    }
+}

sources/editor/Stride.Assets.Editor/StrideEditorPlugin.cs

@@ -63,6 +63,7 @@ public override void InitializeSession(ISessionViewModel session)
         if (session is SessionViewModel sessionVm)
         {
             // commands
+            sessionVm.ActiveProperties.RegisterNodePresenterCommand(new FetchEntityCommand());
             sessionVm.ActiveProperties.RegisterNodePresenterCommand(new SetComponentReferenceCommand());
             sessionVm.ActiveProperties.RegisterNodePresenterCommand(new SetEntityReferenceCommand());
 

sources/editor/Stride.Core.Assets.Editor/Services/IAssetEditorsManager.cs

@@ -0,0 +1,20 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using Stride.Core.Assets.Editor.ViewModels;
+using Stride.Core.Assets.Presentation.ViewModels;
+
+namespace Stride.Core.Assets.Editor.Services;
+
+public interface IAssetEditorsManager
+{
+    /// <summary>
+    /// Try to find an opened editor for the given asset.
+    /// </summary>
+    /// <typeparam name="TEditor"></typeparam>
+    /// <param name="asset"></param>
+    /// <param name="assetEditor"></param>
+    /// <returns></returns>
+    bool TryGetAssetEditor<TEditor>(AssetViewModel asset, [MaybeNullWhen(false)] out TEditor assetEditor) where TEditor : AssetEditorViewModel;
+}

sources/editor/Stride.Core.Assets.Editor/ViewModels/AssetCompositeHierarchyEditorViewModel.cs

@@ -103,7 +103,7 @@ protected virtual void SelectedItemsCollectionChanged(NotifyCollectionChangedAct
         SelectedContent.AddRange(SelectedItems);
     }
 
-    private async void SelectedContentCollectionChanged(object? sender, NotifyCollectionChangedEventArgs args)
+    private void SelectedContentCollectionChanged(object? sender, NotifyCollectionChangedEventArgs args)
     {
         if (updateSelectionGuard)
             return;
@@ -112,16 +112,16 @@ private async void SelectedContentCollectionChanged(object? sender, NotifyCollec
         {
             updateSelectionGuard = true;
             SelectedContentCollectionChanged(args.Action);
-            // Refresh the property grid
-            await RefreshEditorProperties();
+            // Refresh the property grid asynchronously
+            RefreshEditorProperties().Forget();
         }
         finally
         {
             updateSelectionGuard = false;
         }
     }
 
-    private async void SelectedItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs args)
+    private void SelectedItemsCollectionChanged(object? sender, NotifyCollectionChangedEventArgs args)
     {
         if (updateSelectionGuard)
             return;
@@ -130,8 +130,8 @@ private async void SelectedItemsCollectionChanged(object? sender, NotifyCollecti
         {
             updateSelectionGuard = true;
             SelectedItemsCollectionChanged(args.Action);
-            // Refresh the property grid
-            await RefreshEditorProperties();
+            // Refresh the property grid asynchronously
+            RefreshEditorProperties().Forget();
         }
         finally
         {

sources/editor/Stride.Core.Assets.Editor/ViewModels/EditorCollectionViewModel.cs

@@ -1,15 +1,15 @@
 // Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using Stride.Core.Assets.Editor.Services;
 using Stride.Core.Assets.Presentation.ViewModels;
 using Stride.Core.Presentation.Collections;
 using Stride.Core.Presentation.ViewModels;
 
 namespace Stride.Core.Assets.Editor.ViewModels;
 
-// TODO might not be needed, we can have an OpenedAssets collection in AssetCollectionViewModel
-public sealed class EditorCollectionViewModel : DispatcherViewModel
+public sealed class EditorCollectionViewModel : DispatcherViewModel, IAssetEditorsManager
 {
     private AssetEditorViewModel? activeEditor;
     private readonly ObservableList<AssetEditorViewModel> editors = [];
@@ -19,6 +19,14 @@ public EditorCollectionViewModel(SessionViewModel session)
         : base(session.ServiceProvider)
     {
         Session = session;
+        ServiceProvider.RegisterService(this);
+    }
+
+    public override void Destroy()
+    {
+        EnsureNotDestroyed(nameof(EditorCollectionViewModel));
+        ServiceProvider.UnregisterService(this);
+        base.Destroy();
     }
 
     public AssetEditorViewModel? ActiveEditor
@@ -48,4 +56,16 @@ public void OpenAssetEditor(AssetViewModel asset)
             ActiveEditor = editor;
         }
     }
+
+    public bool TryGetAssetEditor<TEditor>(AssetViewModel asset, [MaybeNullWhen(false)] out TEditor assetEditor) where TEditor : AssetEditorViewModel
+    {
+        if (openedAssets.TryGetValue(asset, out var found) && found is TEditor editor)
+        {
+            assetEditor = editor;
+            return true;
+        }
+
+        assetEditor = null;
+        return false;
+    }
 }