Merge pull request #36 from AristurtleDev/scale-fix

Scale fix

Author: AristurtleDev

source/MonoGame.Aseprite.ContentPipeline/MonoGame.Aseprite.ContentPipeline.csproj

@@ -12,8 +12,8 @@
         <RepositoryUrl>https://github.com/AristurtleDev/monogame-aseprite/</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>monogame content importer processor reader aseprite animations</PackageTags>
-        <AssemblyVersion>3.1.0.0</AssemblyVersion>
-        <FileVersion>3.1.0.0</FileVersion>
+        <AssemblyVersion>3.1.1.0</AssemblyVersion>
+        <FileVersion>3.1.1.0</FileVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>
 

source/MonoGame.Aseprite/Graphics/AnimatedSprite.cs

@@ -114,7 +114,7 @@ public override int Width
         {
             get
             {
-                return CurrentFrame.Bounds.Width;
+                return CurrentFrame.Bounds.Width * (int)Scale.X;
             }
         }
 
@@ -125,7 +125,7 @@ public override int Height
         {
             get
             {
-                return CurrentFrame.Bounds.Height;
+                return CurrentFrame.Bounds.Height * (int)Scale.Y;
             }
         }
 
@@ -602,8 +602,15 @@ public bool TryGetCurrentFrameSlice(string sliceName, out SliceKey sliceKey)
                 {
                     //  Update the xy-coordinate of the slicekey bounds to match the positiona
                     //  data of this animated sprite.
-                    sliceKey.Bounds.X += (int)Position.X;
-                    sliceKey.Bounds.Y += (int)Position.Y;
+                    //  Hotfix, slice key needs to scale with sprite scale
+                    sliceKey.Bounds.X = (int)(Position.X + (sliceKey.Bounds.X * Scale.X));
+                    sliceKey.Bounds.Y = (int)(Position.Y + (sliceKey.Bounds.Y * Scale.Y));
+
+                    sliceKey.Bounds.Width = (int)(sliceKey.Bounds.Width * Scale.X);
+                    sliceKey.Bounds.Height = (int)(sliceKey.Bounds.Height * Scale.Y);
+
+
+
                     return true;
                 }
                 else

source/MonoGame.Aseprite/MonoGame.Aseprite.csproj

@@ -13,8 +13,8 @@
         <RepositoryUrl>https://github.com/AristurtleDev/monogame-aseprite/</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>monogame content importer processor reader aseprite animations</PackageTags>
-        <AssemblyVersion>3.1.0.0</AssemblyVersion>
-        <FileVersion>3.1.0.0</FileVersion>
+        <AssemblyVersion>3.1.1.0</AssemblyVersion>
+        <FileVersion>3.1.1.0</FileVersion>
         <NeutralLanguage>en</NeutralLanguage>
     </PropertyGroup>