Fix on animation opening for some Sonic Mania animations

Xeeynamo · Sep 3, 2017 · db23dd6 · db23dd6
1 parent 7df5330
commit db23dd6
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 182 deletions.
diff --git a/AnimationEditor/MainWindow.xaml b/AnimationEditor/MainWindow.xaml
@@ -225,27 +225,27 @@
 
                                 <TextBlock Grid.Column="0" Grid.Row="1" Text="Left"/>
                                 <xc:NumericUpDown Grid.Column="1" Grid.Row="1"
-                                    MinimumValue="0" MaximumValue="255"
+                                    MinimumValue="0" MaximumValue="32767"
                                     Value="{Binding SelectedFrameLeft, Mode=TwoWay}"/>
                                 <TextBlock Grid.Column="3" Grid.Row="1" Text="Top"/>
                                 <xc:NumericUpDown Grid.Column="4" Grid.Row="1"
-                                    MinimumValue="0" MaximumValue="255"
+                                    MinimumValue="0" MaximumValue="32767"
                                     Value="{Binding SelectedFrameTop, Mode=TwoWay}"/>
                                 <TextBlock Grid.Column="0" Grid.Row="3" Text="Width"/>
                                 <xc:NumericUpDown Grid.Column="1" Grid.Row="3"
-                                    MinimumValue="0" MaximumValue="255"
+                                    MinimumValue="0" MaximumValue="32767"
                                     Value="{Binding SelectedFrameWidth, Mode=TwoWay}"/>
                                 <TextBlock Grid.Column="3" Grid.Row="3" Text="Height"/>
                                 <xc:NumericUpDown Grid.Column="4" Grid.Row="3"
-                                    MinimumValue="0" MaximumValue="255"
+                                    MinimumValue="0" MaximumValue="32767"
                                     Value="{Binding SelectedFrameHeight, Mode=TwoWay}"/>
                                 <TextBlock Grid.Column="0" Grid.Row="5" Text="PivotX"/>
                                 <xc:NumericUpDown Grid.Column="1" Grid.Row="5"
-                                    MinimumValue="-128" MaximumValue="127"
+                                    MinimumValue="-32768" MaximumValue="32767"
                                     Value="{Binding SelectedFramePivotX, Mode=TwoWay}"/>
                                 <TextBlock Grid.Column="3" Grid.Row="5" Text="PivotY"/>
                                 <xc:NumericUpDown Grid.Column="4" Grid.Row="5"
-                                    MinimumValue="-128" MaximumValue="127"
+                                    MinimumValue="-32768" MaximumValue="32767"
                                     Value="{Binding SelectedFramePivotY, Mode=TwoWay}"/>
                             </Grid>
                         </StackPanel>

diff --git a/AnimationEditor/ViewModels/HitboxViewModel.cs b/AnimationEditor/ViewModels/HitboxViewModel.cs
@@ -31,7 +31,7 @@ namespace AnimationEditor.ViewModels
 {
     public class HitboxViewModel
     {
-        public Hitbox Hitbox { get; set; }
+        public IHitbox Hitbox { get; set; }
 
         public override string ToString()
         {

diff --git a/AnimationEditor/ViewModels/MainViewModel.cs b/AnimationEditor/ViewModels/MainViewModel.cs
@@ -53,7 +53,7 @@ public IAnimation AnimationData
 
                 Textures = new ObservableCollection<string>(_animationData.SpriteSheets);
                 Animations = new ObservableCollection<IAnimationEntry>(_animationData.GetAnimations());
-                Hitboxes = _animationData.GetHitboxes().Select(x => new HitboxViewModel() { Hitbox = x.Floor }).ToList() ?? new List<HitboxViewModel>();
+                Hitboxes = _animationData.GetHitboxes()?.Select(x => new HitboxViewModel() { Hitbox = x.Floor }).ToList() ?? new List<HitboxViewModel>();
                 _animService = new AnimationService(_animationData);
                 _animService.OnFrameChanged += OnFrameChanged;
                 _spriteService = new SpriteService(_animationData, basePath);

diff --git a/RSDK/IAnimation.cs b/RSDK/IAnimation.cs
@@ -29,35 +29,6 @@
 
 namespace RSDK
 {
-    public class Hitbox
-    {
-        public int Left { get; set; }
-
-        public int Top { get; set; }
-
-        public int Right { get; set; }
-
-        public int Bottom { get; set; }
-
-        public Hitbox() { }
-
-        public Hitbox(BinaryReader reader)
-        {
-            Left = reader.ReadSByte();
-            Top = reader.ReadSByte();
-            Right = reader.ReadSByte();
-            Bottom = reader.ReadSByte();
-        }
-
-        public void SaveChanges(BinaryWriter writer)
-        {
-            writer.Write((sbyte)Left);
-            writer.Write((sbyte)Top);
-            writer.Write((sbyte)Right);
-            writer.Write((sbyte)Bottom);
-        }
-    }
-
     public interface IFrame
     {
         int SpriteSheet { get; set; }
@@ -94,14 +65,14 @@ public interface IAnimationEntry
 
     public interface IHitboxEntry
     {
-        Hitbox Floor { get; set; }
-        Hitbox Ceiling { get; set; }
-        Hitbox WallLeft { get; set; }
-        Hitbox WallRight { get; set; }
-        Hitbox Unk04 { get; set; }
-        Hitbox Unk05 { get; set; }
-        Hitbox Unk06 { get; set; }
-        Hitbox Unk07 { get; set; }
+        IHitbox Floor { get; set; }
+        IHitbox Ceiling { get; set; }
+        IHitbox WallLeft { get; set; }
+        IHitbox WallRight { get; set; }
+        IHitbox Unk04 { get; set; }
+        IHitbox Unk05 { get; set; }
+        IHitbox Unk06 { get; set; }
+        IHitbox Unk07 { get; set; }
     }
 
     public interface IAnimation

diff --git a/RSDK/IHitbox.cs b/RSDK/IHitbox.cs
@@ -0,0 +1,17 @@
+using System.IO;
+
+namespace RSDK
+{
+    public interface IHitbox
+    {
+        int Left { get; set; }
+
+        int Top { get; set; }
+
+        int Right { get; set; }
+
+        int Bottom { get; set; }
+
+        void SaveChanges(BinaryWriter writer);
+    }
+}
diff --git a/RSDK/RSDK.csproj b/RSDK/RSDK.csproj
@@ -31,6 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="IAnimation.cs" />
+    <Compile Include="IHitbox.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StringEncoding.cs" />
   </ItemGroup>

diff --git a/RSDK/StringEncoding.cs b/RSDK/StringEncoding.cs
@@ -52,6 +52,8 @@ public static string GetString(BinaryReader reader)
         public static string GetString(byte[] data)
         {
             int length = data.Length;
+            if (length == 0)
+                return string.Empty;
             if (data[length - 1] == '\0')
                 length--;
             return Encoding.UTF8.GetString(data, 0, length);

diff --git a/RSDK3/Animation.HitboxEntry.cs b/RSDK3/Animation.HitboxEntry.cs
@@ -27,14 +27,14 @@ namespace RSDK3
 {
     public class HitboxEntry : IHitboxEntry
     {
-        public Hitbox Floor { get; set; }
-        public Hitbox Ceiling { get; set; }
-        public Hitbox WallLeft { get; set; }
-        public Hitbox WallRight { get; set; }
-        public Hitbox Unk04 { get; set; }
-        public Hitbox Unk05 { get; set; }
-        public Hitbox Unk06 { get; set; }
-        public Hitbox Unk07 { get; set; }
+        public IHitbox Floor { get; set; }
+        public IHitbox Ceiling { get; set; }
+        public IHitbox WallLeft { get; set; }
+        public IHitbox WallRight { get; set; }
+        public IHitbox Unk04 { get; set; }
+        public IHitbox Unk05 { get; set; }
+        public IHitbox Unk06 { get; set; }
+        public IHitbox Unk07 { get; set; }
 
         public HitboxEntry()
         {

diff --git a/RSDK3/Hitbox.cs b/RSDK3/Hitbox.cs
@@ -0,0 +1,34 @@
+using RSDK;
+using System.IO;
+
+namespace RSDK3
+{
+    public class Hitbox : IHitbox
+    {
+        public int Left { get; set; }
+
+        public int Top { get; set; }
+
+        public int Right { get; set; }
+
+        public int Bottom { get; set; }
+
+        public Hitbox() { }
+
+        public Hitbox(BinaryReader reader)
+        {
+            Left = reader.ReadSByte();
+            Top = reader.ReadSByte();
+            Right = reader.ReadSByte();
+            Bottom = reader.ReadSByte();
+        }
+
+        public void SaveChanges(BinaryWriter writer)
+        {
+            writer.Write((sbyte)Left);
+            writer.Write((sbyte)Top);
+            writer.Write((sbyte)Right);
+            writer.Write((sbyte)Bottom);
+        }
+    }
+}
diff --git a/RSDK3/RSDK3.csproj b/RSDK3/RSDK3.csproj
@@ -33,6 +33,7 @@
     <Compile Include="Animation.AnimationEntry.cs" />
     <Compile Include="Animation.cs" />
     <Compile Include="Animation.Frame.cs" />
+    <Compile Include="Hitbox.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

diff --git a/RSDK5/Animation.AnimationEntry.cs b/RSDK5/Animation.AnimationEntry.cs
@@ -43,7 +43,7 @@ public AnimationEntry()
         {
         }
 
-        public AnimationEntry(BinaryReader reader)
+        public AnimationEntry(BinaryReader reader, int collisionBoxesCount)
         {
             Name = StringEncoding.GetString(reader);
 
@@ -53,7 +53,7 @@ public AnimationEntry(BinaryReader reader)
             Flags = 0;
             for (int i = 0; i < framesCount; i++)
             {
-                Frames.Add(new Frame()
+                var frame = new Frame(collisionBoxesCount)
                 {
                     SpriteSheet = reader.ReadByte(),
                     CollisionBox = 0,
@@ -65,15 +65,10 @@ public AnimationEntry(BinaryReader reader)
                     Height = reader.ReadInt16(),
                     CenterX = reader.ReadInt16(),
                     CenterY = reader.ReadInt16(),
-                    HitboxLeft = reader.ReadInt16(),
-                    HitboxTop = reader.ReadInt16(),
-                    HitboxRight = reader.ReadInt16(),
-                    HitboxBottom = reader.ReadInt16(),
-                    Hitbox2Left = reader.ReadInt16(),
-                    Hitbox2Top = reader.ReadInt16(),
-                    Hitbox2Right = reader.ReadInt16(),
-                    Hitbox2Bottom = reader.ReadInt16(),
-                });
+                };
+                for (int j = 0; j < collisionBoxesCount; j++)
+                    frame.Hitboxes[j] = new Hitbox(reader);
+                Frames.Add(frame);
             }
         }
 

diff --git a/RSDK5/Animation.Frame.cs b/RSDK5/Animation.Frame.cs
@@ -46,20 +46,11 @@ public class Frame : IFrame
 
         public int CenterY { get; set; }
 
-        public int HitboxLeft { get; set; }
-
-        public int HitboxTop { get; set; }
-
-        public int HitboxRight { get; set; }
-
-        public int HitboxBottom { get; set; }
-
-        public int Hitbox2Left { get; set; }
-
-        public int Hitbox2Top { get; set; }
-
-        public int Hitbox2Right { get; set; }
-
-        public int Hitbox2Bottom { get; set; }
+        public Hitbox[] Hitboxes { get; set; }
+
+        public Frame(int hitboxesCount = 0)
+        {
+            Hitboxes = new Hitbox[hitboxesCount];
+        }
     }
 }
diff --git a/RSDK5/Animation.HitboxEntry.cs b/RSDK5/Animation.HitboxEntry.cs