From 527fb1936433d7911a18011f8093a5de8fd6e42a Mon Sep 17 00:00:00 2001
From: the_fiddler <the_fiddler@ebc5dd9b-fb1d-0410-b6f8-d24c324e9604>
Date: Fri, 13 Feb 2009 19:53:46 +0000
Subject: [PATCH] Implemented IEquatable interface. Fixed ToAxisAngle
 implementation at 0-degree angles. Added ToAxisAngle overload that returns a
 Vector4 struct.

---
 Source/OpenTK/Math/Quaternion.cs  | 100 +++++++++++++++++++++++-------
 Source/OpenTK/Math/Quaterniond.cs | Bin 77476 -> 82592 bytes
 2 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/Source/OpenTK/Math/Quaternion.cs b/Source/OpenTK/Math/Quaternion.cs
index 15a9da10..eb1e31c4 100644
--- a/Source/OpenTK/Math/Quaternion.cs
+++ b/Source/OpenTK/Math/Quaternion.cs
@@ -32,7 +32,7 @@ namespace OpenTK.Math
     /// </summary>
     [Serializable]
     [StructLayout(LayoutKind.Sequential)]
-    public struct Quaternion
+    public struct Quaternion : IEquatable<Quaternion>
     {
         #region Fields
 
@@ -111,7 +111,7 @@ namespace OpenTK.Math
 
         #region Instance
 
-        #region pubilc void ToAxisAngle(out Vector3 axis, out float angle)
+        #region ToAxisAngle
 
         /// <summary>
 		/// Convert the current quaternion to axis angle representation
@@ -120,19 +120,39 @@ namespace OpenTK.Math
 		/// <param name="angle">The resultant angle</param>
 		public void ToAxisAngle(out Vector3 axis, out float angle)
 		{
-			Quaternion q = this;
-			if (q.W > 1.0f)
-				q.Normalize();
-
-			angle = 2.0f * (float)System.Math.Acos(q.W);
-			float den = (float)System.Math.Sqrt(1.0 - q.W * q.W);
-			axis = q.XYZ;
-			if (den > 0.0001f)
-			{
-				axis = q.XYZ / den;
-			}
+            Vector4 result = ToAxisAngle();
+            axis = result.Xyz;
+            angle = result.W;
 		}
 
+        /// <summary>
+        /// Convert this instance to an axis-angle representation.
+        /// </summary>
+        /// <returns>A Vector4 that is the axis-angle representation of this quaternion.</returns>
+        public Vector4 ToAxisAngle()
+        {
+            Quaternion q = this;
+            if (q.W > 1.0f)
+                q.Normalize();
+
+            Vector4 result = new Vector4();
+
+            result.W = 2.0f * (float)System.Math.Acos(q.W); // angle
+            float den = (float)System.Math.Sqrt(1.0 - q.W * q.W);
+            if (den > 0.0001f)
+            {
+                result.Xyz = q.XYZ / den;
+            }
+            else
+            {
+                // This occurs when the angle is zero. 
+                // Not a problem: just set an arbitrary normalized axis.
+                result.Xyz = Vector3.UnitX;
+            }
+
+            return result;
+        }
+
 		#endregion
 
 		#region public float Length
@@ -483,18 +503,14 @@ namespace OpenTK.Math
 			return left;
 		}
 
-		[CLSCompliant(false)]
-		unsafe public static explicit operator float*(Quaternion q)
+        public static bool operator ==(Quaternion left, Quaternion right)
         {
-            return &q.XYZ.X;
+            return left.Equals(right);
         }
 
-		public static explicit operator IntPtr(Quaternion q)
+        public static bool operator !=(Quaternion left, Quaternion right)
         {
-			unsafe
-			{
-				return (IntPtr)(&q.XYZ.X);
-			}
+            return !left.Equals(right);
         }
 
         #endregion
@@ -514,8 +530,50 @@ namespace OpenTK.Math
 
         #endregion
 
+        #region public override bool Equals (object o)
+
+        /// <summary>
+        /// Compares this object instance to another object for equality. 
+        /// </summary>
+        /// <param name="other">The other object to be used in the comparison.</param>
+        /// <returns>True if both objects are Quaternions of equal value. Otherwise it returns false.</returns>
+        public override bool Equals(object o)
+        {
+               if (o is Quaternion == false) return false;
+               return this == (Quaternion)o;
+        }
+
         #endregion
 
+        #region public override int GetHashCode ()
+
+        /// <summary>
+        /// Provides the hash code for this object. 
+        /// </summary>
+        /// <returns>A hash code formed from the bitwise XOR of this objects members.</returns>
+        public override int GetHashCode()
+        {
+               return XYZ.GetHashCode() ^ W.GetHashCode();
+        }
+
+        #endregion
+
+        #endregion
+
+        #endregion
+
+        #region IEquatable<Quaternion> Members
+
+        /// <summary>
+        /// Compares this Quaternion instance to another Quaternion for equality. 
+        /// </summary>
+        /// <param name="other">The other Quaternion to be used in the comparison.</param>
+        /// <returns>True if both instances are equal; false otherwise.</returns>
+        public bool Equals(Quaternion other)
+        {
+            return XYZ == other.XYZ && W == other.W;
+        }
+
         #endregion
     }
 }
diff --git a/Source/OpenTK/Math/Quaterniond.cs b/Source/OpenTK/Math/Quaterniond.cs
index 596ff2b1c6959a295be0ad6bed550fb72041a634..0fec25d8f9ac4f28d676deafcf7ee6b76d0c55c0 100644
GIT binary patch
delta 2091
zcmb7FT})eL82&yBwA510Xz359hn~ZLwgU<outl*Xb%BBGr)4lvqe(j`6v|&=o158E
zjC!Rvye4PS8(h3xkOeO^i_1vV3oj;k<&9CiFww+Fyf*6ley6njxx_SW`hDm9eV*ri
z&&NNMth`;icFroR>{+I=e%8b0*;STci}+2l3>#z5LA1$T+RZAM72*y*Y`UfO+tv>%
zpv~g~SNsBe=LteC-~`Fr4c|YMAQl>g=0PXi^R_MbO3SzEVQtU_t6nFBYkbSSweaY;
z6`e=*6%!9bEN83kV568ki^&!+c?OfKECMYaS$8R1g>%Ce6I~=)9i|)XCTukM^@k-~
zf-hSoc&EJ$)W9jM!U-cTms>^eS@ch^8S(o%OJmd)(7YjdKhTS|R*(jy&L}>;j2W*8
z`z-6g^CFuNt*gSvIFB8SQmJD6RNfk6!>xc<f8^(<p!;bX?|?*&0?E@I`ePIKz@IfP
zc;PG0a?%1Wxd!gN;(^UB8zgg1h{-niYsf<Ypx1}vemz#kZKZ@oQ2(T!cX>~;Fl!U3
zPGGtq{>xx$<VN3eav7u_t(Eg=@*)edE;MLmt?+qV!vvP&1yj5q#V!ep$l)Lgtbzrq
ze2tLFO5{j|PWn_B!NNBG=_nmx1UT<=z-K-QzF87RAidfM;Z)z*A;gQ&B}A^^=PGhY
zr|Woc<RnB51ZUW|kkc-<H}O7;eqpA<{fP#cOO*{=z%y~5!0()RYDjQeh;tI-FNo(0
z=xf*+9A{CgX}rmzXBI0~*$jNN<S3^|f`8bqazpHl1Un}sGj@a)5#TvTd6*3&Hs}l5
zT@7--Ho{MuwY;E2IQEMd)~4)`X{-Z#gAZ=k)~-LV^bLa4>oX^@+*y`^Kc=cp5e&F7
zAcLAog4*nIhYORG!J>m$RvH1A0G^g%<$e%$PT2SPYy14|nkK+XVN*|v6sx<u{`KtN
zPr;nkzC5Rf@)cowyK_w0NjtL$(Imn~a!0ygt1ccmgSXQNG=WB=X9#|m(1N|bBy&e}
z?_3c}#A}v9?F*d3Gu@8m*GNY2azn7Z(LCN?^sHmujPyh5DBd27XUuX^SP}bUVpF7%
zU;eJcOoh_~M&4-3&vjK(7F9wq(_(N45UO>5Txu14VMFl_(|=>0i#4n48a~g6NT^SC
zvC!{z%9oE%KoW3^LiaNQz?AS?&>#5u`M}X^9Oh#CQp8Lvi(1)klbcXWc*=*u1fc_o
z_B;dL+)_ym8mtLV)S=fDLXM+%rco67ijUXg7X7yFQbi04p2g<Uv=sEX%-bvX@<+3{
z(R`8iBaiBek1M8WHU`l*-95&D726*{PzJHCeXCHM3%U`2pg(Gi2*lN(f8pl?RL>C3
zh#hL(7X4F&*Whx0O^+&E(;q9mZ+$iU^8-lr*H{1N+lY6=@5e&4_A3u)7~X4W(BG1|
zRDGmgVLq;SpQuoOQHw_^6to`A@jvufeWV`6NOk6Ah}i5M7+U2;?g`=DVH4<+w7ReY
zv3k(7FzB%Ln+!WsCFZ<2Bu+m=+YDhY>!j^ZqACUpvk~?Zdl~N<@uT8f<d6+4wV#LF
LHH&^H%x(Vyqp|C`

delta 361
zcmZ3`%DUt(%LX5=$$ZW{n|rtp@J{yAW@FA|$eElhRXjOO!f0{=H_Ie`zR5Z=e3Oqz
zh)hnX6r0?j$uaqhgxO>^9*s%-9Fs5bOHGc85ShF{(qM9ffZF5-5fYOVOt>bmk>r}J
zCnW<EW0`En$2Ym*B-i93sT6)r22O@*23`g(APt0*6+NUUtH_D4LU{gi%IshkP-dc>
zDp)lqLn1>SLpnnaL+WIEdGX25qSYqX{pR8<WYA*>XV7G@o-9}*$(h2C3RI=QU_1F?
zwC>~y^Ef86D5z;d%t~aaV8~=B2FU_3NM8g)BtsN~HIh3V6*Q+WlVcQNhbo@DTS0kx
zh&-df<Ow<klO42WCT~!Yn|zH=ZL)!w(&9bJL6aN&Z8qyw{9~HD!BuCng0|FVf#$Z|
PA__noK(H2UHiQHK<kwo`