diff options
Diffstat (limited to 'src/jogl/classes/jogamp')
3 files changed, 18 insertions, 62 deletions
diff --git a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java index fc086ebe4..123883b2f 100644 --- a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java +++ b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java @@ -22,11 +22,11 @@ package jogamp.graph.geom.plane; import java.io.IOException; import java.io.Serializable; -import jogamp.graph.math.MathFloat; // import jogamp.opengl.util.HashCode; import com.jogamp.graph.geom.Vertex; import com.jogamp.graph.geom.Vertex.Factory; +import com.jogamp.opengl.FloatUtil; public class AffineTransform implements Cloneable, Serializable { @@ -285,13 +285,13 @@ public class AffineTransform implements Cloneable, Serializable { } public void setToRotation(float angle) { - float sin = MathFloat.sin(angle); - float cos = MathFloat.cos(angle); - if (MathFloat.abs(cos) < ZERO) { + float sin = FloatUtil.sin(angle); + float cos = FloatUtil.cos(angle); + if (FloatUtil.abs(cos) < ZERO) { cos = 0.0f; sin = sin > 0.0f ? 1.0f : -1.0f; } else - if (MathFloat.abs(sin) < ZERO) { + if (FloatUtil.abs(sin) < ZERO) { sin = 0.0f; cos = cos > 0.0f ? 1.0f : -1.0f; } @@ -387,7 +387,7 @@ public class AffineTransform implements Cloneable, Serializable { public AffineTransform createInverse() throws NoninvertibleTransformException { float det = getDeterminant(); - if (MathFloat.abs(det) < ZERO) { + if (FloatUtil.abs(det) < ZERO) { throw new NoninvertibleTransformException(determinantIsZero); } return new AffineTransform( @@ -467,7 +467,7 @@ public class AffineTransform implements Cloneable, Serializable { public Vertex inverseTransform(Vertex src, Vertex dst) throws NoninvertibleTransformException { float det = getDeterminant(); - if (MathFloat.abs(det) < ZERO) { + if (FloatUtil.abs(det) < ZERO) { throw new NoninvertibleTransformException(determinantIsZero); } if (dst == null) { @@ -485,7 +485,7 @@ public class AffineTransform implements Cloneable, Serializable { throws NoninvertibleTransformException { float det = getDeterminant(); - if (MathFloat.abs(det) < ZERO) { + if (FloatUtil.abs(det) < ZERO) { throw new NoninvertibleTransformException(determinantIsZero); } diff --git a/src/jogl/classes/jogamp/graph/math/MathFloat.java b/src/jogl/classes/jogamp/graph/math/MathFloat.java deleted file mode 100644 index 82e7823a6..000000000 --- a/src/jogl/classes/jogamp/graph/math/MathFloat.java +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Copyright 2011 JogAmp Community. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, are - * permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * The views and conclusions contained in the software and documentation are those of the - * authors and should not be interpreted as representing official policies, either expressed - * or implied, of JogAmp Community. - */ -package jogamp.graph.math; - -public class MathFloat { - - public static final float E = 2.7182818284590452354f; - - public static final float PI = 3.14159265358979323846f; - - public static float abs(float a) { return (float) java.lang.Math.abs(a); } - public static float pow(float a, float b) { return (float) java.lang.Math.pow(a, b); } - - public static float sin(float a) { return (float) java.lang.Math.sin(a); } - public static float cos(float a) { return (float) java.lang.Math.cos(a); } - public static float acos(float a) { return (float) java.lang.Math.acos(a); } - - public static float sqrt(float a) { return (float) java.lang.Math.sqrt(a); } - -} diff --git a/src/jogl/classes/jogamp/graph/math/plane/Crossing.java b/src/jogl/classes/jogamp/graph/math/plane/Crossing.java index 9be5978cc..51d81da54 100644 --- a/src/jogl/classes/jogamp/graph/math/plane/Crossing.java +++ b/src/jogl/classes/jogamp/graph/math/plane/Crossing.java @@ -19,9 +19,10 @@ */ package jogamp.graph.math.plane; +import com.jogamp.opengl.FloatUtil; + import jogamp.graph.geom.plane.Path2D; import jogamp.graph.geom.plane.PathIterator; -import jogamp.graph.math.MathFloat; public class Crossing { @@ -68,7 +69,7 @@ public class Crossing { if (d < 0.0) { return 0; } - d = MathFloat.sqrt(d); + d = FloatUtil.sqrt(d); res[rc++] = (- b + d) / (a * 2.0f); // d != 0.0 if (d != 0.0) { @@ -101,15 +102,15 @@ public class Crossing { float n = - a / 3.0f; if (R2 < Q3) { - float t = MathFloat.acos(R / MathFloat.sqrt(Q3)) / 3.0f; - float p = 2.0f * MathFloat.PI / 3.0f; - float m = -2.0f * MathFloat.sqrt(Q); - res[rc++] = m * MathFloat.cos(t) + n; - res[rc++] = m * MathFloat.cos(t + p) + n; - res[rc++] = m * MathFloat.cos(t - p) + n; + float t = FloatUtil.acos(R / FloatUtil.sqrt(Q3)) / 3.0f; + float p = 2.0f * FloatUtil.PI / 3.0f; + float m = -2.0f * FloatUtil.sqrt(Q); + res[rc++] = m * FloatUtil.cos(t) + n; + res[rc++] = m * FloatUtil.cos(t + p) + n; + res[rc++] = m * FloatUtil.cos(t - p) + n; } else { // Debug.println("R2 >= Q3 (" + R2 + "/" + Q3 + ")"); - float A = MathFloat.pow(MathFloat.abs(R) + MathFloat.sqrt(R2 - Q3), 1.0f / 3.0f); + float A = FloatUtil.pow(FloatUtil.abs(R) + FloatUtil.sqrt(R2 - Q3), 1.0f / 3.0f); if (R > 0.0) { A = -A; } |