Skip to content

Commit 7df9a01

Browse files
committed
undo animations meant to be on branch
1 parent 5bd7409 commit 7df9a01

File tree

2 files changed

+0
-54
lines changed

2 files changed

+0
-54
lines changed

AvaGui/ViewModels/DatTypes/DatObjectEditorViewModel.cs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using AvaGui.Models;
2-
using Avalonia.Media.Imaging;
32
using OpenLoco.Common.Logging;
43
using OpenLoco.Dat;
54
using OpenLoco.Dat.FileParsing;
@@ -32,27 +31,6 @@ public class DatObjectEditorViewModel : ReactiveObject, ILocoFileViewModel
3231
[Reactive]
3332
public IExtraContentViewModel? ExtraContentViewModel { get; set; }
3433

35-
[Reactive]
36-
public ObservableCollection<AnimationSequence> CurrentAnimations { get; set; }
37-
38-
public AnimationSequence CurrentAnimation => CurrentAnimations[0];
39-
40-
[Reactive]
41-
public int CurrentFrame { get; set; }
42-
43-
[Reactive]
44-
public Bitmap? CurrentAnimationFrame
45-
{
46-
get
47-
{
48-
if (ExtraContentViewModel is ImageTableViewModel itvm)
49-
{
50-
return itvm.Images[CurrentFrame];
51-
}
52-
return null;
53-
}
54-
}
55-
5634
ObjectEditorModel Model { get; init; }
5735

5836
[Reactive]

AvaGui/Views/MainWindow.axaml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -336,38 +336,6 @@
336336
</ItemsRepeater>
337337
</DockPanel>
338338
</TabItem>
339-
<TabItem Header="Animations">
340-
<StackPanel>
341-
<Slider Value="{Binding CurrentFrame}" Minimum="0" Maximum="63"/>
342-
<Image Source="{Binding CurrentAnimationFrame}" Stretch="None" />
343-
<TextBlock Text="{Binding CurrentFrame}"/>
344-
</StackPanel>
345-
<!--<ItemsRepeater ItemsSource="{Binding CurrentAnimations}" Background="{DynamicResource ButtonBackground}">
346-
<ItemsRepeater.ItemTemplate>
347-
<DataTemplate>
348-
<StackPanel>
349-
<Slider Value="{Binding CurrentFrame}" Minimum="{Binding StartIndex}" Maximum="{Binding EndIndex}"/>
350-
<Image Source="{Binding CurrentAnimationFrame}" />
351-
<TextBlock Text="{Binding CurrentFrame}"/>
352-
</StackPanel>
353-
-->
354-
<!--<Grid DockPanel.Dock="Left" Margin="4" x:DataType="vm:AnimationSequence">
355-
<Grid.ColumnDefinitions>
356-
<ColumnDefinition Width="Auto"/>
357-
<ColumnDefinition Width="*"/>
358-
</Grid.ColumnDefinitions>
359-
<Border Grid.Column="0" Grid.ColumnSpan="1" Background="{DynamicResource ButtonBackgroundPointerOver}">
360-
<TextBlock Text="{Binding Address}" VerticalAlignment="Center" Margin="4" FontFamily="Courier New" FontWeight="Bold" />
361-
362-
</Border>
363-
<SelectableTextBlock Grid.Column="1" Margin="4" Text="{Binding Data}" VerticalAlignment="Center" FontFamily="Courier New" SelectionStart="{Binding SelectionStart}" SelectionEnd="{Binding SelectionEnd}" />
364-
</Grid>-->
365-
<!--
366-
</DataTemplate>
367-
</ItemsRepeater.ItemTemplate>
368-
</ItemsRepeater>-->
369-
370-
</TabItem>
371339
</TabControl>
372340
</StackPanel>
373341
</DataTemplate>

0 commit comments

Comments
 (0)