refactored. GetHashCode

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tdcgexplorer/trunk/tso2mqo@2031 72ae2088-5f33-de11-a17b-0000e250a282

diff --git a/General.cs b/General.cs
index ef94d70..4901185 100644 (file)
--- a/General.cs
+++ b/General.cs
@@ -36,6 +36,11 @@ namespace Tso2MqoGui
             cmp = y.CompareTo(obj.y);\r
             return cmp;\r
         }\r
+\r
+        public override int GetHashCode()\r
+        {\r
+            return x.GetHashCode() ^ y.GetHashCode();\r
+        }\r
     }\r
 \r
     public partial struct Point3 : IComparable<Point3>\r
@@ -103,6 +108,11 @@ namespace Tso2MqoGui
             cmp = z.CompareTo(obj.z);\r
             return cmp;\r
         }\r
+\r
+        public override int GetHashCode()\r
+        {\r
+            return x.GetHashCode() ^ y.GetHashCode() ^ z.GetHashCode();\r
+        }\r
     }\r
 \r
     public partial struct Point4 : IComparable<Point4>\r
@@ -136,6 +146,11 @@ namespace Tso2MqoGui
             cmp = w.CompareTo(obj.w);\r
             return cmp;\r
         }\r
+\r
+        public override int GetHashCode()\r
+        {\r
+            return x.GetHashCode() ^ y.GetHashCode() ^ z.GetHashCode() ^ w.GetHashCode();\r
+        }\r
     }\r
 \r
     public partial struct Color3\r

diff --git a/MqoWriter.cs b/MqoWriter.cs
index 10a362c..9873c60 100644 (file)
--- a/MqoWriter.cs
+++ b/MqoWriter.cs
@@ -340,8 +340,7 @@ namespace Tso2MqoGui
 \r
         public override int GetHashCode()\r
         {\r
-            return Pos.x.GetHashCode() ^ Pos.y.GetHashCode() ^ Pos.z.GetHashCode()\r
-                 ^ Nrm.x.GetHashCode() ^ Nrm.y.GetHashCode() ^ Nrm.z.GetHashCode();\r
+            return Pos.GetHashCode() ^ Nrm.GetHashCode();\r
         }\r
 \r
         public override bool Equals(object obj)\r

diff --git a/TSOFile.cs b/TSOFile.cs
index ea0ad62..f0ec1cc 100644 (file)
--- a/TSOFile.cs
+++ b/TSOFile.cs
@@ -640,11 +640,8 @@ namespace Tso2MqoGui
 \r
         public override int GetHashCode()\r
         {\r
-            return Pos.x.GetHashCode() ^ Pos.y.GetHashCode() ^ Pos.z.GetHashCode()\r
-                 ^ Nrm.x.GetHashCode() ^ Nrm.y.GetHashCode() ^ Nrm.z.GetHashCode()\r
-                 ^ Tex.x.GetHashCode() ^ Tex.y.GetHashCode() ^ Wgt.w.GetHashCode()\r
-                 ^ Wgt.x.GetHashCode() ^ Wgt.y.GetHashCode() ^ Wgt.z.GetHashCode()\r
-                 ^ Idx.GetHashCode();\r
+            return Pos.GetHashCode() ^ Nrm.GetHashCode() ^ Tex.GetHashCode()\r
+                 ^ Wgt.GetHashCode() ^ Idx.GetHashCode();\r
         }\r
 \r
         public override bool Equals(object obj)\r