diff options
author | Harvey Harrison <[email protected]> | 2011-12-31 14:50:54 -0800 |
---|---|---|
committer | Harvey Harrison <[email protected]> | 2011-12-31 14:50:54 -0800 |
commit | 5800faa58d9dfe0244d40049cca7aa2a8ee4c395 (patch) | |
tree | 1d530dacfc9ffd4e96357ad209aba84e1a93362b /src/javax/vecmath/Tuple2d.java | |
parent | a51c424d5f6abc1a2450dc37e44bd7604f95d709 (diff) |
vecmath: remove trailing whitespace from all files
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/javax/vecmath/Tuple2d.java')
-rw-r--r-- | src/javax/vecmath/Tuple2d.java | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/src/javax/vecmath/Tuple2d.java b/src/javax/vecmath/Tuple2d.java index 5655aab..d97ef25 100644 --- a/src/javax/vecmath/Tuple2d.java +++ b/src/javax/vecmath/Tuple2d.java @@ -34,7 +34,7 @@ package javax.vecmath; import java.lang.Math; /** - * A generic 2-element tuple that is represented by double-precision + * A generic 2-element tuple that is represented by double-precision * floating point x,y coordinates. * */ @@ -120,7 +120,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** - * Sets the value of this tuple from the 2 values specified in + * Sets the value of this tuple from the 2 values specified in * the array. * @param t the array of length 2 containing xy in order */ @@ -140,7 +140,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { this.x = t1.x; this.y = t1.y; } - + /** * Sets the value of this tuple to the value of Tuple2f t1. @@ -178,7 +178,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Sets the value of this tuple to the vector sum of itself and tuple t1. * @param t1 the other tuple - */ + */ public final void add(Tuple2d t1) { this.x += t1.x; @@ -187,23 +187,23 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** - * Sets the value of this tuple to the vector difference of - * tuple t1 and t2 (this = t1 - t2). + * Sets the value of this tuple to the vector difference of + * tuple t1 and t2 (this = t1 - t2). * @param t1 the first tuple * @param t2 the second tuple - */ + */ public final void sub(Tuple2d t1, Tuple2d t2) { this.x = t1.x - t2.x; this.y = t1.y - t2.y; - } + } /** * Sets the value of this tuple to the vector difference of * itself and tuple t1 (this = this - t1). * @param t1 the other vector - */ + */ public final void sub(Tuple2d t1) { this.x -= t1.x; @@ -263,13 +263,13 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { * @param s the scalar value * @param t1 the tuple to be multipled * @param t2 the tuple to be added - */ + */ public final void scaleAdd(double s, Tuple2d t1, Tuple2d t2) { - this.x = s*t1.x + t2.x; - this.y = s*t1.y + t2.y; - } - + this.x = s*t1.x + t2.x; + this.y = s*t1.y + t2.y; + } + /** * Sets the value of this tuple to the scalar multiplication @@ -292,7 +292,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { * code value. Two objects with different data members may return the * same hash value, although this is not likely. * @return the integer hash code value - */ + */ public int hashCode() { long bits = 1L; bits = 31L * bits + VecMathUtil.doubleToLongBits(x); @@ -301,12 +301,12 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - /** + /** * Returns true if all of the data members of Tuple2d t1 are * equal to the corresponding data members in this Tuple2d. * @param t1 the vector with which the comparison is made * @return true or false - */ + */ public boolean equals(Tuple2d t1) { try { @@ -316,13 +316,13 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - /** + /** * Returns true if the Object t1 is of type Tuple2d and all of the * data members of t1 are equal to the corresponding data members in * this Tuple2d. * @param t1 the object with which the comparison is made * @return true or false - */ + */ public boolean equals(Object t1) { try { @@ -336,11 +336,11 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Returns true if the L-infinite distance between this tuple - * and tuple t1 is less than or equal to the epsilon parameter, + * and tuple t1 is less than or equal to the epsilon parameter, * otherwise returns false. The L-infinite - * distance is equal to MAX[abs(x1-x2), abs(y1-y2)]. + * distance is equal to MAX[abs(x1-x2), abs(y1-y2)]. * @param t1 the tuple to be compared to this tuple - * @param epsilon the threshold value + * @param epsilon the threshold value * @return true or false */ public boolean epsilonEquals(Tuple2d t1, double epsilon) @@ -362,7 +362,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { * Returns a string that contains the values of this Tuple2d. * The form is (x,y). * @return the String representation - */ + */ public String toString() { return("(" + this.x + ", " + this.y + ")"); @@ -370,15 +370,15 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** - * Clamps the tuple parameter to the range [low, high] and - * places the values into this tuple. + * Clamps the tuple parameter to the range [low, high] and + * places the values into this tuple. * @param min the lowest value in the tuple after clamping - * @param max the highest value in the tuple after clamping + * @param max the highest value in the tuple after clamping * @param t the source tuple, which will not be modified */ public final void clamp(double min, double max, Tuple2d t) { - if( t.x > max ) { + if( t.x > max ) { x = max; } else if( t.x < min ){ x = min; @@ -386,7 +386,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { x = t.x; } - if( t.y > max ) { + if( t.y > max ) { y = max; } else if( t.y < min ){ y = min; @@ -397,62 +397,62 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - /** - * Clamps the minimum value of the tuple parameter to the min + /** + * Clamps the minimum value of the tuple parameter to the min * parameter and places the values into this tuple. - * @param min the lowest value in the tuple after clamping + * @param min the lowest value in the tuple after clamping * @param t the source tuple, which will not be modified - */ - public final void clampMin(double min, Tuple2d t) - { - if( t.x < min ) { + */ + public final void clampMin(double min, Tuple2d t) + { + if( t.x < min ) { x = min; } else { x = t.x; } - if( t.y < min ) { + if( t.y < min ) { y = min; } else { y = t.y; } - } + } - /** - * Clamps the maximum value of the tuple parameter to the max + /** + * Clamps the maximum value of the tuple parameter to the max * parameter and places the values into this tuple. - * @param max the highest value in the tuple after clamping + * @param max the highest value in the tuple after clamping * @param t the source tuple, which will not be modified - */ - public final void clampMax(double max, Tuple2d t) - { - if( t.x > max ) { + */ + public final void clampMax(double max, Tuple2d t) + { + if( t.x > max ) { x = max; - } else { + } else { x = t.x; } - + if( t.y > max ) { y = max; } else { y = t.y; } - } + } - /** - * Sets each component of the tuple parameter to its absolute + /** + * Sets each component of the tuple parameter to its absolute * value and places the modified values into this tuple. * @param t the source tuple, which will not be modified - */ + */ public final void absolute(Tuple2d t) { x = Math.abs(t.x); y = Math.abs(t.y); - } + } @@ -468,7 +468,7 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } else if( x < min ){ x = min; } - + if( y > max ) { y = max; } else if( y < min ){ @@ -477,24 +477,24 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - + /** * Clamps the minimum value of this tuple to the min parameter. * @param min the lowest value in this tuple after clamping */ public final void clampMin(double min) - { + { if( x < min ) x=min; if( y < min ) y=min; - } - - + } + + /** * Clamps the maximum value of this tuple to the max parameter. * @param max the highest value in the tuple after clamping */ public final void clampMax(double max) - { + { if( x > max ) x=max; if( y > max ) y=max; } @@ -510,8 +510,8 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - /** - * Linearly interpolates between tuples t1 and t2 and places the + /** + * Linearly interpolates between tuples t1 and t2 and places the * result into this tuple: this = (1-alpha)*t1 + alpha*t2. * @param t1 the first tuple * @param t2 the second tuple @@ -524,18 +524,18 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { } - /** - * Linearly interpolates between this tuple and tuple t1 and + /** + * Linearly interpolates between this tuple and tuple t1 and * places the result into this tuple: this = (1-alpha)*this + alpha*t1. * @param t1 the first tuple - * @param alpha the alpha interpolation parameter - */ - public final void interpolate(Tuple2d t1, double alpha) - { + * @param alpha the alpha interpolation parameter + */ + public final void interpolate(Tuple2d t1, double alpha) + { this.x = (1-alpha)*this.x + alpha*t1.x; this.y = (1-alpha)*this.y + alpha*t1.y; - } + } /** * Creates a new object of the same class as this object. @@ -558,9 +558,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Get the <i>x</i> coordinate. - * + * * @return the <i>x</i> coordinate. - * + * * @since vecmath 1.5 */ public final double getX() { @@ -570,9 +570,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Set the <i>x</i> coordinate. - * + * * @param x value to <i>x</i> coordinate. - * + * * @since vecmath 1.5 */ public final void setX(double x) { @@ -582,9 +582,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Get the <i>y</i> coordinate. - * + * * @return the <i>y</i> coordinate. - * + * * @since vecmath 1.5 */ public final double getY() { @@ -594,9 +594,9 @@ public abstract class Tuple2d implements java.io.Serializable, Cloneable { /** * Set the <i>y</i> coordinate. - * + * * @param y value to <i>y</i> coordinate. - * + * * @since vecmath 1.5 */ public final void setY(double y) { |