Switched texture previews to convert images to Avalonia bitmaps async…

…hronously.
MeltyPlayer · Nov 29, 2024 · 794582a · 794582a
1 parent de195ae
commit 794582a
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 25 deletions.
diff --git a/...ity/UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/common/progress/AsyncPanel.axaml.cs b/...ity/UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/common/progress/AsyncPanel.axaml.cs
@@ -14,23 +14,8 @@ namespace uni.ui.avalonia.common.progress;
 public class AsyncPanelViewModelForDesigner
     : AsyncPanelViewModel {
   public AsyncPanelViewModelForDesigner() {
-    this.Progress = new AsyncProgress();
-
-    var secondsToWait = 3;
-    var start = DateTime.Now;
-
-    Task.Run(
-        async () => {
-          DateTime current;
-          double elapsedSeconds;
-          do {
-            current = DateTime.Now;
-            elapsedSeconds = (current - start).TotalSeconds;
-            await Task.Delay(50);
-          } while (elapsedSeconds < secondsToWait);
-
-          this.Progress.ReportCompletion("Hello world!");
-        });
+    this.Progress = AsyncProgress.FromTask(
+        Task.Delay(3000).ContinueWith(_ => Task.FromResult("Hello world!")));
   }
 }
 

diff --git a/...tility/UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/common/progress/AsyncProgress.cs b/...tility/UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/common/progress/AsyncProgress.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Threading.Tasks;
 
 using fin.util.progress;
 
@@ -12,6 +13,21 @@ public class AsyncProgress
     : ViewModelBase, IMutableIndeterminateProgressValue<object> {
   private bool isComplete_;
 
+  public static AsyncProgress FromResult<T>(T t) {
+    var progress = new AsyncProgress();
+    progress.ReportCompletion(t!);
+    return progress;
+  }
+
+  public static AsyncProgress FromTask<T>(Task<T> t) {
+    var progress = new AsyncProgress();
+    Task.Run(() => {
+      t.Wait();
+      progress.ReportCompletion(t.Result!);
+    });
+    return progress;
+  }
+
   public object? Value { get; private set; }
 
   public void ReportCompletion(object value) {

diff --git a/.../UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/resources/texture/TexturePreview.axaml b/.../UniversalAssetTool/UniversalAssetTool.Ui.Avalonia/resources/texture/TexturePreview.axaml
@@ -3,6 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:textures="clr-namespace:uni.ui.avalonia.resources.texture"
+             xmlns:progress="clr-namespace:uni.ui.avalonia.common.progress"
              mc:Ignorable="d" d:DesignWidth="100" d:DesignHeight="100"
              x:Class="uni.ui.avalonia.resources.texture.TexturePreview"
              x:DataType="textures:TexturePreviewViewModel">
@@ -23,11 +24,16 @@
             BorderBrush="{StaticResource BorderBrush}"
             Background="{StaticResource ColorControlCheckeredBackgroundBrush}" />
 
-    <Image x:Name="image_"
-           Margin="{Binding ImageMargin}"
-           VerticalAlignment="Stretch"
-           HorizontalAlignment="Stretch"
-           Source="{Binding Image}"
-           RenderOptions.BitmapInterpolationMode="None" />
+    <progress:AsyncPanel DataContext="{Binding ImageAsyncPanelViewModel}">
+      <progress:AsyncPanel.DataTemplate>
+        <DataTemplate x:DataType="progress:AsyncProgress">
+          <Image Margin="{Binding Value.Margin}"
+                 VerticalAlignment="Stretch"
+                 HorizontalAlignment="Stretch"
+                 Source="{Binding Value.Image}"
+                 RenderOptions.BitmapInterpolationMode="None" />
+        </DataTemplate>
+      </progress:AsyncPanel.DataTemplate>
+    </progress:AsyncPanel>
   </Grid>
 </UserControl>
diff --git a/...iversalAssetTool/UniversalAssetTool.Ui.Avalonia/resources/texture/TexturePreview.axaml.cs b/...iversalAssetTool/UniversalAssetTool.Ui.Avalonia/resources/texture/TexturePreview.axaml.cs
@@ -1,5 +1,6 @@
 using System.Drawing;
 using System.IO;
+using System.Threading.Tasks;
 
 using Avalonia;
 using Avalonia.Controls;
@@ -15,6 +16,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
+using uni.ui.avalonia.common.progress;
 using uni.ui.avalonia.icons;
 using uni.ui.avalonia.resources.model;
 using uni.ui.avalonia.ViewModels;
@@ -30,6 +32,18 @@ public TexturePreviewViewModelForDesigner() {
   }
 }
 
+public class AsyncImageViewModel : ViewModelBase {
+  public Bitmap Image {
+    get;
+    set => this.RaiseAndSetIfChanged(ref field, value);
+  }
+
+  public Thickness Margin {
+    get;
+    set => this.RaiseAndSetIfChanged(ref field, value);
+  }
+}
+
 public class TexturePreviewViewModel : ViewModelBase {
   private static readonly Bitmap missingImage_
       = FinImage.Create1x1FromColor(Color.Magenta).AsAvaloniaImage();
@@ -38,11 +52,18 @@ public required IReadOnlyTexture? Texture {
     get;
     set {
       this.RaiseAndSetIfChanged(ref field, value);
-      this.Image = value?.AsMergedMipmapAvaloniaImage() ?? missingImage_;
+      this.ImageAsyncPanelViewModel = new AsyncPanelViewModel {
+          Progress = AsyncProgress.FromTask(
+              Task.Run(() => new AsyncImageViewModel {
+                  Image = value?.AsMergedMipmapAvaloniaImage() ??
+                          missingImage_, 
+                  Margin = this.ImageMargin
+              }))
+      };
     }
   }
 
-  public Bitmap Image {
+  public AsyncPanelViewModel ImageAsyncPanelViewModel {
     get;
     private set => this.RaiseAndSetIfChanged(ref field, value);
   }