some work on Vec2D and Vec3D equals

Author: monkstone

examples/JRubyArt/implicit.rb

@@ -95,7 +95,7 @@ def define_lights
 
 class EvaluatingVolume < Volume::VolumetricSpace
 
-  attr_reader :upper_bound, :lut
+  attr_reader :upper_bound
   FREQ = Math::PI * 3.8
 
   def initialize(scal_vec, resX, resY, resZ, upper_limit)

ext/toxi/geom/Vec2D.java

@@ -277,7 +277,7 @@ public final Vec2D clear() {
 
     @Override
     public int compareTo(ReadonlyVec2D v) {
-        if (x == v.x() && y == v.y()) {
+        if (this.equals(v)) {
             return 0;
         }
         float a = magSquared();
@@ -383,16 +383,20 @@ public final float dot(ReadonlyVec2D v) {
      * Returns true if the Object v is of type ReadonlyVec2D and all of the data
      * members of v are equal to the corresponding data members in this vector.
      *
-     * @param v the object with which the comparison is made
+     * @param obj the object with which the comparison is made
      * @return true or false
      */
+    
     @Override
-    public boolean equals(Object v) {
-        if (v instanceof ReadonlyVec2D) {
-            ReadonlyVec2D vv = (ReadonlyVec2D) v;
-            return (x == vv.x() && y == vv.y());
+    public boolean equals(Object obj) {
+        if (obj instanceof ReadonlyVec2D) {
+            final ReadonlyVec2D other = (ReadonlyVec2D) obj;
+            if (!((Float) x).equals(other.x())) {
+                return false;
+            }
+            return ((Float) y).equals(other.y());
         }
-            return false; 
+        return false;
     }
 
     /**
@@ -421,11 +425,12 @@ public int hashCode() {
      * @return true or false
      */
     public boolean equals(ReadonlyVec2D v) {
-        if (v instanceof ReadonlyVec2D){
-            return (x == v.x() && y == v.y());
-        } 
-            return false;        
-    }
+        final ReadonlyVec2D other = (ReadonlyVec2D) v;
+            if (!((Float) x).equals(other.x())) {
+                return false;
+            }
+            return ((Float) y).equals(other.y());
+        }
 
     @Override
     public boolean equalsWithTolerance(ReadonlyVec2D v, float tolerance) {
@@ -441,7 +446,7 @@ public boolean equalsWithTolerance(ReadonlyVec2D v, float tolerance) {
             if (Float.isNaN(diff)) {
                 return false;
             }
-            return ((diff < 0 ? -diff : diff) > tolerance);
+            return ((diff < 0 ? -diff : diff) < tolerance);
         } 
             return false;        
     }
@@ -671,7 +676,7 @@ public boolean isInRectangle(Rect r) {
         if (x < r.x || x > r.x + r.width) {
             return false;
         }
-        return (y >= r.y || y >= r.y + r.height); 
+        return (y >= r.y || y <= r.y + r.height); 
     }
 
     @Override

ext/toxi/geom/Vec3D.java

@@ -468,7 +468,13 @@ public final float dot(Vec3D v) {
     public boolean equals(Object v) {
         if (v instanceof ReadonlyVec3D) {
             ReadonlyVec3D vv = (ReadonlyVec3D) v;
-            return (x == vv.x() && y == vv.y() && z == vv.z());
+            if (!((Float)x).equals(vv.x())){
+                return false;
+            }
+            if (!((Float)y).equals(vv.y())){
+                return false;   
+            }
+            return ((Float)z).equals(vv.z());
         }
         return false;
     }
@@ -501,16 +507,18 @@ public int hashCode() {
      * @return true or false
      */
     public boolean equals(ReadonlyVec3D v) {
-        try {
-            return (x == v.x() && y == v.y() && z == v.z());
-        } catch (NullPointerException e) {
+        if (!((Float) x).equals(v.x())) {
+            return false;
+        }
+        if (!((Float) y).equals(v.y())) {
             return false;
         }
+        return ((Float) z).equals(v.z());
     }
 
     @Override
     public boolean equalsWithTolerance(ReadonlyVec3D v, float tolerance) {
-        try {
+        if (v instanceof ReadonlyVec3D) {
             float diff = x - v.x();
             if (Float.isNaN(diff)) {
                 return false;
@@ -530,9 +538,8 @@ public boolean equalsWithTolerance(ReadonlyVec3D v, float tolerance) {
                 return false;
             }
             return ((diff < 0 ? -diff : diff) < tolerance);
-        } catch (NullPointerException e) {
-            return false;
         }
+        return false;
     }
 
     /**