klein

Normand Briere

2019-10-01 e8908d5b90d44e43b9da885bc0202fb665a912d0

 cVector.java
..
..
@@ -63,6 +63,15 @@
63
63
         }
64
64
     }
65
65
 
66
+    cVector ToFloat()
67
+    {
68
+        x = (float)x;
69
+        y = (float)y;
70
+        z = (float)z;
71
+        
72
+        return this;
73
+    }
74
+    
66
75
     void set(cVector v)
67
76
     {
68
77
         x = v.x;
..
..
@@ -247,18 +256,21 @@
247
256
         return "[" + x0 + ", " + y0 + ", " + z0 + "]";
248
257
     }
249
258
 
250
-    /*
251
259
     public boolean equals(Object o)
252
260
     {
253
261
         //if (true) return false;
254
262
 
255
263
         cVector vert = (cVector) o;
256
264
         
265
+        double tolerance = 0.00001;
266
+        
267
+        if (!Grafreed.epsequal)
268
+            tolerance = 0;
269
+
257
270
         return Math.abs(x - vert.x) +
258
271
                 Math.abs(y - vert.y) +
259
-                Math.abs(z - vert.z) < 0.01;
272
+                Math.abs(z - vert.z) <= tolerance;
260
273
     }
261
-     */
262
274
     
263
275
     public int hashCode()
264
276
     {
..
..
@@ -266,7 +278,7 @@
266
278
         long ly = Double.doubleToRawLongBits(y);
267
279
         long lz = Double.doubleToRawLongBits(z);
268
280
 
269
-        if (GraphreeD.epsequal)
281
+        if (Grafreed.epsequal)
270
282
         {
271
283
             return 0;
272
284
         } else