spritesheets to cover up to 5x zoom

Author: hunter2actual

DalamudMinesweeper.json

@@ -3,7 +3,7 @@
     "Author": "hunter2_",
     "Name": "Minesweeper",
     "InternalName": "DalamudMinesweeper",
-    "AssemblyVersion": "0.0.0.13",
+    "AssemblyVersion": "0.0.0.14",
     "Description": "Logic puzzle in which you find and flag hidden mines. \nLeft click to uncover a square, right click to place a flag. \nClick a number that has the right amount of adjacent flags to reveal adjacent tiles. \nThe game ends when all mines are flagged and all safe squares have been uncovered. \nClick the smiley face to start a new game.",
     "ApplicableVersion": "any",
     "Tags": [
@@ -18,9 +18,9 @@
     "LoadPriority": 0,
     "Punchline": "Classic puzzle game.",
     "AcceptsFeedback": true,
-    "DownloadLinkInstall": "https://github.com/hunter2actual/DalamudMinesweeper/releases/download/0.0.0.13/latest.zip",
-    "DownloadLinkUpdate": "https://github.com/hunter2actual/DalamudMinesweeper/releases/download/0.0.0.13/latest.zip",
+    "DownloadLinkInstall": "https://github.com/hunter2actual/DalamudMinesweeper/releases/download/0.0.0.14/latest.zip",
+    "DownloadLinkUpdate": "https://github.com/hunter2actual/DalamudMinesweeper/releases/download/0.0.0.14/latest.zip",
     "IconUrl": "https://raw.githubusercontent.com/hunter2actual/DalamudMinesweeper/master/images/icon.png",
-    "Changelog": "Spritesheet rendering to prevent image bleed"
+    "Changelog": "Improved tile rendering"
   }
 ]

DalamudMinesweeper/ClassicSpritesSheet.cs renamed to DalamudMinesweeper/ClassicSprites.cs

@@ -11,14 +11,22 @@ namespace DalamudMinesweeper;
 
 public class ClassicSprites : IDisposable {
     private DalamudPluginInterface _pluginInterface { get; set; }
-    private IDalamudTextureWrap Sheet { get; init; }
+    private IDalamudTextureWrap[] Sheets { get; init; }
     private record SpriteData(Vector2 topLeftCoord, Vector2 sizePx);
     private readonly Dictionary<string, SpriteData> _spriteDict;
 
     public ClassicSprites(DalamudPluginInterface pluginInterface)
     {
         _pluginInterface = pluginInterface;
-        Sheet = LoadImage("spritesheet.png");
+
+        Sheets =
+        [
+            LoadImage("spritesheet_1x.png"),
+            LoadImage("spritesheet_2x.png"),
+            LoadImage("spritesheet_3x.png"),
+            LoadImage("spritesheet_4x.png"),
+            LoadImage("spritesheet_5x.png"),
+        ];
 
         _spriteDict = new Dictionary<string, SpriteData>
         {
@@ -54,11 +62,13 @@ public void DrawSmiley(ImDrawListPtr drawList, string smileyName, Vector2 cursor
 
     private void Draw(ImDrawListPtr drawList, SpriteData sprite, Vector2 cursorPos, int zoom)
     {
-        var uvMin = sprite.topLeftCoord / Sheet.Size;
-        var uvMax = (sprite.topLeftCoord + sprite.sizePx) / Sheet.Size;
+        var sheet = Sheets[zoom - 1];
+
+        var uvMin = sprite.topLeftCoord * zoom / sheet.Size;
+        var uvMax = (sprite.topLeftCoord + sprite.sizePx) * zoom / sheet.Size;
 
         drawList.AddImage(
-            Sheet.ImGuiHandle,
+            sheet.ImGuiHandle,
             cursorPos,
             cursorPos + sprite.sizePx * zoom,
             uvMin,
@@ -90,7 +100,10 @@ private static string CellToSpriteName(Cell cell)
 
     public void Dispose()
     {
-        Sheet.Dispose();
+        foreach (var sheet in Sheets)
+        {
+            sheet.Dispose();
+        }
     }
 
     private IDalamudTextureWrap LoadImage(string path)

DalamudMinesweeper/Components/Footer.cs

@@ -28,7 +28,7 @@ public void Draw(Vector2 start)
             _drawConfigAction();
         }        
         ImGui.SameLine();
-        if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus))
+        if (ImGuiComponents.IconButton(FontAwesomeIcon.Plus) && _configuration.Zoom <= 5)
         {
             _configuration.Zoom++;
         }

DalamudMinesweeper/DalamudMinesweeper.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <Authors></Authors>
     <Company></Company>
-    <Version>0.0.0.13</Version>
+    <Version>0.0.0.14</Version>
     <Description>A logic puzzle featuring hidden mines.</Description>
     <Copyright></Copyright>
     <PackageProjectUrl>https://github.com/hunter2actual/DalamudMinesweeper</PackageProjectUrl>
@@ -14,7 +14,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\Data\Classic\spritesheet.png">
+    <Content Include="..\Data\Classic\spritesheet_1x.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="..\Data\Classic\spritesheet_2x.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="..\Data\Classic\spritesheet_3x.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="..\Data\Classic\spritesheet_4x.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+    <Content Include="..\Data\Classic\spritesheet_5x.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>false</Visible>
     </Content>

Data/Classic/spritesheet.png renamed to Data/Classic/spritesheet_1x.png

@@ -10,6 +10,5 @@ Dalamud plugin for FFXIV
 - UI borders
 - Active click logic
 - High scores screen
-- Spritesheet zoom levels
 - [Stretch] Implement solver to reduce guessing
 - [Stretch] Skins