From 0edb45f11cd034c4937e6941b7a3e5d9f7edbd2f Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 11 Nov 2012 02:49:48 +0100
Subject: Merge MathFloat into FloatUtil
---
.../classes/jogamp/graph/math/plane/Crossing.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'src/jogl/classes/jogamp/graph/math/plane/Crossing.java')
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;
}
--
cgit v1.2.3