Merged dev-1_5 branch back to MAIN trunk

git-svn-id: https://svn.java.net/svn/vecmath~svn/trunk@106 dd45e54d-f42e-c781-df72-dca083a658b1

1 files changed, 73 insertions, 0 deletions

diff --git a/src/javax/vecmath/Tuple3f.java b/src/javax/vecmath/Tuple3f.java
index f6cdbdb..0c2f827 100644
--- a/src/javax/vecmath/Tuple3f.java
+++ b/src/javax/vecmath/Tuple3f.java
@@ -363,12 +363,15 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable {
        float diff;
 
        diff = x - t1.x;
+       if(Float.isNaN(diff)) return false;
        if((diff<0?-diff:diff) > epsilon) return false;
 
        diff = y - t1.y;
+       if(Float.isNaN(diff)) return false;
        if((diff<0?-diff:diff) > epsilon) return false;
 
        diff = z - t1.z;
+       if(Float.isNaN(diff)) return false;
        if((diff<0?-diff:diff) > epsilon) return false;
 
        return true;
@@ -618,4 +621,74 @@ public abstract class Tuple3f implements java.io.Serializable, Cloneable {
 	}
     }
 
+
+    /**
+	 * Get the <i>x</i> coordinate.
+	 * 
+	 * @return the  <i>x</i> coordinate.
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final float getX() {
+		return x;
+	}
+
+
+	/**
+	 * Set the <i>x</i> coordinate.
+	 * 
+	 * @param x  value to <i>x</i> coordinate.
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final void setX(float x) {
+		this.x = x;
+	}
+
+
+	/**
+	 * Get the <i>y</i> coordinate.
+	 * 
+	 * @return the <i>y</i> coordinate.
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final float getY() {
+		return y;
+	}
+
+
+	/**
+	 * Set the <i>y</i> coordinate.
+	 * 
+	 * @param y value to <i>y</i> coordinate.
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final void setY(float y) {
+		this.y = y;
+	}
+
+	/**
+	 * Get the <i>z</i> coordinate.
+	 * 
+	 * @return the <i>z</i> coordinate
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final float getZ() {
+		return z;
+	}
+
+
+	/**
+	 * Set the <i>Z</i> coordinate.
+	 * 
+	 * @param z value to <i>z</i> coordinate.
+	 * 
+	 * @since vecmath 1.5
+	 */
+	public final void setZ(float z) {
+		this.z = z;
+	}
 }