OSDN Git Service

SkinWeightはGetHashCodeに入れない
authornomeu <nomeu@72ae2088-5f33-de11-a17b-0000e250a282>
Mon, 19 Sep 2011 13:21:22 +0000 (13:21 +0000)
committernomeu <nomeu@72ae2088-5f33-de11-a17b-0000e250a282>
Mon, 19 Sep 2011 13:21:22 +0000 (13:21 +0000)
git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tdcgexplorer/trunk/tso2mqo@2035 72ae2088-5f33-de11-a17b-0000e250a282

TSOFile.cs

index acb91d7..44d2367 100644 (file)
@@ -632,16 +632,13 @@ namespace Tso2MqoGui
             int cmp = 0;\r
             cmp = Pos.CompareTo(o.Pos); if (cmp != 0) return cmp;\r
             cmp = Nrm.CompareTo(o.Nrm); if (cmp != 0) return cmp;\r
-            cmp = Tex.CompareTo(o.Tex); if (cmp != 0) return cmp;\r
-            cmp = Wgt.CompareTo(o.Wgt); if (cmp != 0) return cmp;\r
-            cmp = Idx.CompareTo(o.Idx);\r
+            cmp = Tex.CompareTo(o.Tex);\r
             return cmp;\r
         }\r
 \r
         public override int GetHashCode()\r
         {\r
-            return Pos.GetHashCode() ^ Nrm.GetHashCode() ^ Tex.GetHashCode()\r
-                 ^ Wgt.GetHashCode() ^ Idx.GetHashCode();\r
+            return Pos.GetHashCode() ^ Nrm.GetHashCode() ^ Tex.GetHashCode();\r
         }\r
 \r
         public override bool Equals(object obj)\r
@@ -649,16 +646,14 @@ namespace Tso2MqoGui
             if (obj is Vertex)\r
             {\r
                 Vertex v = (Vertex)obj;\r
-                return Pos.Equals(v.Pos) && Nrm.Equals(v.Nrm) && Tex.Equals(v.Tex)\r
-                     ^ Wgt.Equals(v.Wgt) && Idx.Equals(v.Idx);\r
+                return Pos.Equals(v.Pos) && Nrm.Equals(v.Nrm) && Tex.Equals(v.Tex);\r
             }\r
             return false;\r
         }\r
 \r
         public bool Equals(Vertex v)\r
         {\r
-            return Pos.Equals(v.Pos) && Nrm.Equals(v.Nrm) && Tex.Equals(v.Tex)\r
-                 ^ Wgt.Equals(v.Wgt) && Idx.Equals(v.Idx);\r
+            return Pos.Equals(v.Pos) && Nrm.Equals(v.Nrm) && Tex.Equals(v.Tex);\r
         }\r
     }\r
 \r