Bump HaruhiChokuretsuLib version, add BackgroundItem test

haroohie-club · Jan 31, 2023 · da9359e · da9359e
1 parent f62bac4
commit da9359e
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 23 deletions.
diff --git a/src/SerialLoops.Lib/Items/BackgroundItem.cs b/src/SerialLoops.Lib/Items/BackgroundItem.cs
@@ -55,7 +55,7 @@ public SKBitmap GetBackground()
 
                 return bitmap;
             }
-            else if (BackgroundType == BgType.KINETIC_VECTOR)
+            else if (BackgroundType == BgType.KINETIC_SCREEN)
             {
                 return Graphic2.GetScreenImage(Graphic1);
             }

diff --git a/src/SerialLoops.Lib/SerialLoops.Lib.csproj b/src/SerialLoops.Lib/SerialLoops.Lib.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HaruhiChokuretsuLib" Version="0.10.0" />
+    <PackageReference Include="HaruhiChokuretsuLib" Version="0.11.0" />
     <PackageReference Include="NitroPacker.Core" Version="2.0.1" />
   </ItemGroup>
 

diff --git a/src/SerialLoops/Editors/BackgroundEditor.cs b/src/SerialLoops/Editors/BackgroundEditor.cs
@@ -22,7 +22,7 @@ public override Panel GetEditorPanel()
                 Orientation = Orientation.Vertical,
                 Items =
                 {
-                    new ImageView() { Image = new SKImage(((BackgroundItem)Description).GetBackground()) },
+                    new ImageView() { Image = new SKGuiImage(((BackgroundItem)Description).GetBackground()) },
                 }
             };
         }

diff --git a/src/SerialLoops/SKGuiImage.cs b/src/SerialLoops/SKGuiImage.cs
@@ -0,0 +1,14 @@
+using Eto.Drawing;
+using SkiaSharp;
+
+namespace SerialLoops
+{
+    public class SKGuiImage : Bitmap
+    {
+        public SKBitmap skBitmap { get; set; }
+
+        public SKGuiImage(SKBitmap skBitmap) : base(skBitmap.Encode(SKEncodedImageFormat.Png, 1).AsStream())
+        {
+        }
+    }
+}
diff --git a/src/SerialLoops/SKImage.cs b/src/SerialLoops/SKImage.cs
diff --git a/src/SerialLoops/SerialLoops.csproj b/src/SerialLoops/SerialLoops.csproj
@@ -13,7 +13,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HaruhiChokuretsuLib" Version="0.10.0" />
     <PackageReference Include="System.Text.Json" Version="7.0.1" />
   </ItemGroup>
 

diff --git a/test/SerialLoops.Tests/ItemTests.cs b/test/SerialLoops.Tests/ItemTests.cs
@@ -1,5 +1,6 @@
 using HaruhiChokuretsuLib.Archive.Data;
 using HaruhiChokuretsuLib.Archive.Event;
+using HaruhiChokuretsuLib.Archive.Graphics;
 using HaruhiChokuretsuLib.Util;
 using NUnit.Framework;
 using SerialLoops.Lib.Items;
@@ -37,5 +38,18 @@ public void EventItemCreationTest(string evtFile)
 
             Assert.That(evt.Name[0..^1], Is.EqualTo(eventItem.Name));
         }
+
+        [Test]
+        public void BackgroundItemCreationTest()
+        {
+            GraphicsFile grp1 = new();
+            GraphicsFile grp2 = new();
+            grp1.Name = "KBG00_128DNX";
+            grp2.Name = "KBG00BNS";
+            grp1.Initialize(File.ReadAllBytes(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inputs", "graphics", "KBG00_128.bin")), 0, _log);
+            grp2.Initialize(File.ReadAllBytes(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "inputs", "graphics", "KBG00.bin")), 0, _log);
+            BackgroundItem item = new($"BG_{grp2.Name}") { Graphic1 = grp1, Graphic2 = grp2, BackgroundType = BgType.KINETIC_SCREEN };
+            item.GetBackground();
+        }
     }
 }
diff --git a/test/SerialLoops.Tests/SerialLoops.Tests.csproj b/test/SerialLoops.Tests/SerialLoops.Tests.csproj
@@ -25,8 +25,4 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="inputs\graphics\" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/SerialLoops.Tests/inputs/graphics/KBG00.bin b/test/SerialLoops.Tests/inputs/graphics/KBG00.bin
diff --git a/test/SerialLoops.Tests/inputs/graphics/KBG00_128.bin b/test/SerialLoops.Tests/inputs/graphics/KBG00_128.bin