Skeleton viewer: animations list: add offset column and filter text box

Author: Dragorn421

Z64Utils/ViewModels/ObjectAnalyzerWindowViewModel.cs

@@ -638,6 +638,7 @@ private void OpenSkeletonViewerObjectHolderEntryCommandExecute(ObjectHolderEntry
         var skeletonHolder = (Z64Object.SkeletonHolder)ohe.ObjectHolder;
         skelvVM.SetSkeleton(skeletonHolder);
         skelvVM.SetAnimations(
+            _object,
             _object
                 .Entries.FindAll(oh => oh.GetEntryType() == Z64Object.EntryType.AnimationHeader)
                 .Cast<Z64Object.AnimationHolder>()

Z64Utils/ViewModels/SkeletonViewerWindowViewModel.cs

@@ -58,6 +58,7 @@ public partial class SkeletonViewerWindowViewModel : ObservableObject
     public interface IAnimationEntry
     {
         string Name { get; }
+        string Offset { get; }
         void OnSelected();
     }
 
@@ -70,16 +71,19 @@ public class RegularAnimationEntry : IAnimationEntry
     {
         private SkeletonViewerWindowViewModel _parentVM;
         public string Name { get; }
+        public string Offset { get; }
         public Z64Object.AnimationHolder AnimationHolder { get; }
 
         public RegularAnimationEntry(
             SkeletonViewerWindowViewModel parentVM,
             string name,
+            uint offset,
             Z64Object.AnimationHolder animationHolder
         )
         {
             _parentVM = parentVM;
             Name = name;
+            Offset = $"0x{offset:X6}";
             AnimationHolder = animationHolder;
         }
 
@@ -96,10 +100,11 @@ public class ExternalRegularAnimationEntry : RegularAnimationEntry, IExternalAni
         public ExternalRegularAnimationEntry(
             SkeletonViewerWindowViewModel parentVM,
             string name,
+            uint offset,
             Z64Object.AnimationHolder animationHolder,
             Dictionary<int, F3DZEX.Memory.Segment> externalData
         )
-            : base(parentVM, name, animationHolder)
+            : base(parentVM, name, offset, animationHolder)
         {
             ExternalData = externalData;
         }
@@ -109,16 +114,19 @@ public class PlayerAnimationEntry : IAnimationEntry
     {
         private SkeletonViewerWindowViewModel _parentVM;
         public string Name { get; }
+        public string Offset { get; }
         public Z64Object.PlayerAnimationHolder PlayerAnimationHolder { get; }
 
         public PlayerAnimationEntry(
             SkeletonViewerWindowViewModel parentVM,
             string name,
+            uint offset,
             Z64Object.PlayerAnimationHolder playerAnimationHolder
         )
         {
             _parentVM = parentVM;
             Name = name;
+            Offset = $"0x{offset:X6}";
             PlayerAnimationHolder = playerAnimationHolder;
         }
 
@@ -135,17 +143,23 @@ public class ExternalPlayerAnimationEntry : PlayerAnimationEntry, IExternalAnima
         public ExternalPlayerAnimationEntry(
             SkeletonViewerWindowViewModel parentVM,
             string name,
+            uint offset,
             Z64Object.PlayerAnimationHolder playerAnimationHolder,
             Dictionary<int, F3DZEX.Memory.Segment> externalData
         )
-            : base(parentVM, name, playerAnimationHolder)
+            : base(parentVM, name, offset, playerAnimationHolder)
         {
             ExternalData = externalData;
         }
     }
 
+    public ObservableCollection<IAnimationEntry> AnimationEntries { get; } = new();
+
+    [ObservableProperty]
+    string _animationFilterText = "";
+
     [ObservableProperty]
-    private ObservableCollection<IAnimationEntry> _animationEntries = new();
+    private IEnumerable<IAnimationEntry> _filteredAnimationEntries = new List<IAnimationEntry>();
 
     [ObservableProperty]
     private double _playAnimTickPeriodMs;
@@ -255,8 +269,16 @@ public SkeletonViewerWindowViewModel(Z64Game? game)
                         PlayAnimTickPeriodMs = 1;
                     _playAnimTimer.Interval = TimeSpan.FromMilliseconds(PlayAnimTickPeriodMs);
                     break;
+                case nameof(AnimationFilterText):
+                    UpdateFilteredAnimationEntries();
+                    break;
             }
         };
+        AnimationEntries.CollectionChanged += (sender, e) =>
+        {
+            Logger.Debug("AnimationEntries.CollectionChanged");
+            UpdateFilteredAnimationEntries();
+        };
         SelectedLimbNodes.CollectionChanged += (sender, e) =>
         {
             Logger.Debug("SelectedLimbNodes.CollectionChanged");
@@ -395,6 +417,7 @@ public async Task LoadExternalFileAnimationsImpl(byte[] data)
                     new ExternalRegularAnimationEntry(
                         this,
                         "ext_" + eAnim.Name,
+                        (uint)extObj.OffsetOf(eAnim),
                         eAnim,
                         externalData
                     )
@@ -477,6 +500,7 @@ private async void LoadPlayerAnimationsImpl(Func<byte[], Task<Z64Object?>> gKeep
                     new ExternalPlayerAnimationEntry(
                         this,
                         "ext_" + ePlayerAnim.Name,
+                        (uint)gKeepObj.OffsetOf(ePlayerAnim),
                         ePlayerAnim,
                         externalData
                     )
@@ -558,16 +582,23 @@ private void UpdateLimbsDLists()
             LimbsDLists = null;
     }
 
-    public void SetAnimations(IEnumerable<Z64Object.AnimationHolder> animationHolders)
+    public void SetAnimations(
+        Z64Object obj,
+        IEnumerable<Z64Object.AnimationHolder> animationHolders
+    )
     {
-        ObservableCollection<IAnimationEntry> newAnimations = new(
-            animationHolders.Select(animationHolder => new RegularAnimationEntry(
-                this,
-                animationHolder.Name,
-                animationHolder
-            ))
-        );
-        AnimationEntries = newAnimations;
+        AnimationEntries.Clear();
+        foreach (var animationHolder in animationHolders)
+        {
+            AnimationEntries.Add(
+                new RegularAnimationEntry(
+                    this,
+                    animationHolder.Name,
+                    (uint)obj.OffsetOf(animationHolder),
+                    animationHolder
+                )
+            );
+        }
     }
 
     [MemberNotNull(nameof(CurPose))]
@@ -673,6 +704,17 @@ public void StopPlayingAnim()
         _playAnimTimer.IsEnabled = false;
     }
 
+    private void UpdateFilteredAnimationEntries()
+    {
+        var filter = AnimationFilterText.ToLower();
+        if (filter == "")
+            FilteredAnimationEntries = new List<IAnimationEntry>(AnimationEntries);
+        else
+            FilteredAnimationEntries = AnimationEntries.Where(a =>
+                a.Name.ToLower().Contains(filter) || a.Offset.ToLower().Contains(filter)
+            );
+    }
+
     public void OnAnimationEntrySelected(IAnimationEntry animationEntry)
     {
         Utils.Assert(Renderer != null);

Z64Utils/Views/SkeletonViewerWindow.axaml

@@ -104,9 +104,10 @@
                 <GridSplitter Grid.Row="1" ResizeDirection="Rows" />
                 <DockPanel Grid.Row="2">
                     <TextBlock DockPanel.Dock="Top">Animations</TextBlock>
+                    <TextBox DockPanel.Dock="Top" Text="{Binding AnimationFilterText}" />
                     <DataGrid
                         Name="AnimationEntriesDataGrid"
-                        ItemsSource="{Binding AnimationEntries}"
+                        ItemsSource="{Binding FilteredAnimationEntries}"
                         IsReadOnly="True"
                         CanUserResizeColumns="True"
                         GridLinesVisibility="All"
@@ -115,6 +116,7 @@
                     >
                         <DataGrid.Columns>
                             <DataGridTextColumn Header="Name" Binding="{Binding Name}" />
+                            <DataGridTextColumn Header="Offset" Binding="{Binding Offset}" />
                         </DataGrid.Columns>
                     </DataGrid>
                 </DockPanel>