Merge pull request #10 from cyotek/ScottSWu-fix_getkerning

Scottswu fix getkerning

CHANGELOG.md

@@ -1,6 +1,12 @@
 Change Log
 ==========
 
+1.3.3
+-----
+
+### Fixed
+* `BitmapFont.GetKerning` always returned zero
+
 1.3.2
 
 ### Changed

CONTRIBUTORS.md

@@ -1,2 +1,5 @@
+### Version 1.3.3
+@ScottSWu
+
 ### Version 1.3.1
 @rds1983

build.cmd

@@ -6,13 +6,14 @@ CALL ..\..\..\build\set35vars.bat
 
 REM Build and sign the file
 %msbuildexe% Cyotek.Drawing.BitmapFont.sln /p:Configuration=Release /verbosity:minimal /nologo /t:Clean,Build
-CALL signcmd src\Cyotek.Drawing.BitmapFont\bin\Release\Cyotek.Drawing.BitmapFont.dll
+CALL dualsigncmd src\Cyotek.Drawing.BitmapFont\bin\Release\Cyotek.Drawing.BitmapFont.dll
 
 REM Create the package
 PUSHD %CD%
 IF NOT EXIST releases MKDIR releases
 CD releases
-NUGET pack ..\src\Cyotek.Drawing.BitmapFont\Cyotek.Drawing.BitmapFont.csproj -Prop Configuration=Release
+%NUGETexe% pack ..\src\Cyotek.Drawing.BitmapFont\Cyotek.Drawing.BitmapFont.csproj -Prop Configuration=Release
+%zipexe% a -bd -tZip Cyotek.Drawing.BitmapFont.x.x.x.x.zip ..\src\Cyotek.Drawing.BitmapFont\bin\Release\Cyotek.Drawing.BitmapFont.dll
 POPD
 
 ENDLOCAL

src/Cyotek.Drawing.BitmapFont/Kerning.cs

@@ -6,12 +6,14 @@
  * Licensed under the MIT License. See license.txt for the full text.
  */
 
+using System;
+
 namespace Cyotek.Drawing.BitmapFont
 {
   /// <summary>
   /// Represents the font kerning between two characters.
   /// </summary>
-  public struct Kerning
+  public struct Kerning : IEquatable<Kerning>
   {
     #region Constructors
 
@@ -73,6 +75,47 @@ public override string ToString()
     {
       return string.Format("{0} to {1} = {2}", this.FirstCharacter, this.SecondCharacter, this.Amount);
     }
+
+    /// <summary>
+    /// Check if the object represents kerning between the same two characters.
+    /// </summary>
+    /// <param name="obj"></param>
+    /// <returns>
+    /// Whether or not the object represents kerning between the same two characters.
+    /// </returns>
+    public override bool Equals(object obj)
+    {
+      if (obj == null) return false;
+      if (obj.GetType() != typeof(Kerning)) return false;
+
+      return this.Equals((Kerning)obj);
+    }
+
+    /// <summary>
+    /// Check if the other kerning is between the same two characters.
+    /// </summary>
+    /// <param name="other"></param>
+    /// <returns>
+    /// Whether or not the other kerning is between the same two characters.
+    /// </returns>
+    public bool Equals(Kerning other)
+    {
+      return FirstCharacter == other.FirstCharacter && SecondCharacter == other.SecondCharacter;
+    }
+
+    /// <summary>
+    /// Return the hash code of the kerning between the two characters.
+    /// </summary>
+    /// <returns>
+    /// A unique hash code of the kerning between the two characters.
+    /// </returns>
+    public override int GetHashCode()
+    {
+      unchecked
+      {
+        return (FirstCharacter << 16) | SecondCharacter;
+      }
+    }
 
     #endregion
   }

src/Cyotek.Drawing.BitmapFont/Properties/AssemblyInfo.cs

@@ -14,5 +14,5 @@
 [assembly: CLSCompliant(true)]
 [assembly: Guid("d0f2bfc9-ee27-4fbc-9d0c-c61423b51594")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.3.2.0")]
-[assembly: AssemblyInformationalVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyInformationalVersion("1.3.3")]