Image importing refactor (#87)

* move images out of viewmodel

* fix many errors in image importing

* working image importing

* cleanup

Author: LeftofZen

AvaGui/Assets/palette.png

@@ -0,0 +1,28 @@
+using Avalonia.Media.Imaging;
+using SkiaSharp;
+using System.Collections.Generic;
+using System.IO;
+
+namespace AvaGui.Models
+{
+	public static class G1ImageConversion
+	{
+		public static IEnumerable<Bitmap> CreateAvaloniaImages(IEnumerable<SKBitmap> skBitmaps)
+		{
+			foreach (var bmp in skBitmaps)
+			{
+				yield return CreateAvaloniaImage(bmp);
+			}
+		}
+
+		public static Bitmap CreateAvaloniaImage(SKBitmap skBitmap)
+		{
+			using (var stream = new MemoryStream())
+			{
+				_ = skBitmap.Encode(stream, SKEncodedImageFormat.Png, 100);
+				stream.Position = 0;
+				return new Bitmap(stream);
+			}
+		}
+	}
+}

AvaGui/Models/G1ImageConversion.cs

@@ -9,6 +9,7 @@
 using OpenLoco.Dat.Types;
 using OpenLoco.Definitions.DTO;
 using OpenLoco.Definitions.Web;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -167,6 +168,7 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 			ILocoObject? locoObject = null;
 			MetadataModel? metadata = null;
 			uiLocoFile = null;
+			List<SKBitmap> images = [];
 
 			try
 			{
@@ -203,6 +205,11 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 						Logger.Debug($"Found object {filesystemItem.Name} with unique id {uniqueObjectId} in cache - reusing it");
 					}
 
+					if (locoObj.OriginalBytes == null)
+					{
+						Logger.Error($"Received no data for {filesystemItem.Name}");
+						return false;
+					}
 					var obj = SawyerStreamReader.LoadFullObjectFromStream(Convert.FromBase64String(locoObj.OriginalBytes), $"{filesystemItem.Filename}-{filesystemItem.Name}", true, Logger);
 					if (obj == null)
 					{
@@ -224,6 +231,11 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 						Availability = locoObj.Availability,
 						Licence = locoObj.Licence,
 					};
+
+					foreach (var i in locoObject?.G1Elements)
+					{
+						images.Add(PaletteMap.ConvertG1IndexedToRgb32Bitmap(i));
+					}
 				}
 				else
 				{
@@ -234,6 +246,11 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 						fileInfo = obj.Value.DatFileInfo;
 						locoObject = obj.Value.LocoObject;
 						metadata = null; // todo: look this up from internet anyways
+
+						foreach (var i in locoObject?.G1Elements)
+						{
+							images.Add(PaletteMap.ConvertG1IndexedToRgb32Bitmap(i));
+						}
 					}
 				}
 			}
@@ -251,7 +268,7 @@ public bool TryLoadObject(FileSystemItem filesystemItem, out UiLocoFile? uiLocoF
 				return false;
 			}
 
-			uiLocoFile = new UiLocoFile() { DatFileInfo = fileInfo, LocoObject = locoObject, Metadata = metadata };
+			uiLocoFile = new UiLocoFile() { DatFileInfo = fileInfo, LocoObject = locoObject, Metadata = metadata, Images = images };
 			return true;
 		}
 

AvaGui/Models/ObjectEditorModel.cs

@@ -1,5 +1,6 @@
-using OpenLoco.Common;
 using OpenLoco.Dat.Types;
+using SkiaSharp;
+using System.Collections.Generic;
 using System.ComponentModel;
 
 namespace AvaGui.Models
@@ -9,6 +10,7 @@ public class UiLocoFile : IUiObject
 	{
 		public required DatFileInfo DatFileInfo { get; set; }
 		public ILocoObject? LocoObject { get; set; }
+		public IList<SKBitmap> Images { get; set; } = [];
 		public MetadataModel? Metadata { get; set; }
 	}
 }

AvaGui/Models/UiLocoFile.cs

@@ -79,9 +79,6 @@ public DatObjectEditorViewModel(FileSystemItem currentFile, ObjectEditorModel mo
 
 			_ = this.WhenAnyValue(o => o.CurrentlySelectedHexAnnotation)
 				.Subscribe(_ => UpdateHexDumpView());
-
-			_ = this.WhenAnyValue(o => o.CurrentFrame)
-				.Subscribe(_ => this.RaisePropertyChanged(nameof(CurrentAnimationFrame)));
 		}
 
 		public void UpdateHexDumpView()
@@ -120,18 +117,16 @@ public void LoadObject()
 					StringTableViewModel = new(CurrentObject.LocoObject.StringTable);
 					ExtraContentViewModel = CurrentObject.LocoObject.Object is SoundObject
 						? new SoundViewModel(CurrentObject.LocoObject)
-						: new ImageTableViewModel(CurrentObject.LocoObject, Model.PaletteMap);
+						: new ImageTableViewModel(CurrentObject.LocoObject, Model.PaletteMap, CurrentObject.Images);
 
-					var (treeView, annotationIdentifiers) = AnnotateFile(cf.Filename, false, null);
+					var (treeView, annotationIdentifiers) = AnnotateFile(Path.Combine(Model.Settings.ObjDataDirectory, cf.Filename), false, null);
 					CurrentHexAnnotations = new(treeView);
 					DATDumpAnnotationIdentifiers = annotationIdentifiers;
-					CurrentAnimations = [new AnimationSequence("Normal", 0, 63)];
 				}
 				else
 				{
 					StringTableViewModel = null;
 					ExtraContentViewModel = null;
-					CurrentAnimations = [];
 				}
 			}
 			else

AvaGui/ViewModels/DatTypes/DatObjectEditorViewModel.cs

@@ -6,8 +6,7 @@
 using OpenLoco.Dat;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
+using SkiaSharp;
 using System;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -62,7 +61,7 @@ public class MainWindowViewModel : ViewModelBase
 		public MainWindowViewModel()
 		{
 			var paletteUri = new Uri("avares://ObjectEditor/Assets/palette.png");
-			var palette = Image.Load<Rgb24>(AssetLoader.Open(paletteUri));
+			var palette = SKBitmap.Decode(AssetLoader.Open(paletteUri));
 
 			Model = new()
 			{
@@ -93,14 +92,25 @@ public MainWindowViewModel()
 				.Subscribe(_ => this.RaisePropertyChanged(nameof(WindowTitle)));
 
 			var assembly = Assembly.GetExecutingAssembly();
+
 			ApplicationVersion = GetCurrentAppVersion(assembly);
 
-			// check for new version
-			var latestVersion = GetLatestAppVersion();
-			if (latestVersion > ApplicationVersion)
+#if !DEBUG
+
+			try
 			{
-				LatestVersionText = $"newer version exists: {latestVersion}";
+				var latestVersion = GetLatestAppVersion();
+				if (latestVersion > ApplicationVersion)
+				{
+					LatestVersionText = $"newer version exists: {latestVersion}";
+				}
 			}
+			catch (Exception ex)
+			{
+				Model.Logger.Error(ex);
+			}
+#endif
+
 			#endregion
 		}
 
@@ -170,7 +180,7 @@ Version GetLatestAppVersion()
 			}
 
 #pragma warning disable CA2201 // Do not raise reserved exception types
-			throw new Exception("Unable to get latest version");
+			throw new Exception($"Unable to get latest version. Error={response.StatusCode}");
 #pragma warning restore CA2201 // Do not raise reserved exception types
 		}