From 3d2b65bd43d5abb1acf59754ee325c25b8c299ff Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 17 Feb 2023 22:40:47 +0100 Subject: Rename VectorUtil.ccw(..) -> isCCW(..) --- src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java | 5 +++-- src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java | 2 +- src/jogl/classes/jogamp/graph/curve/tess/Loop.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java b/src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java index d7e72e245..a07153155 100644 --- a/src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java +++ b/src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java @@ -878,13 +878,14 @@ public final class VectorUtil { return false; } - /** Check if points are in ccw order + /** + * Check if points are in ccw order * @param a first vertex * @param b second vertex * @param c third vertex * @return true if the points a,b,c are in a ccw order */ - public static boolean ccw(final Vert2fImmutable a, final Vert2fImmutable b, final Vert2fImmutable c){ + public static boolean isCCW(final Vert2fImmutable a, final Vert2fImmutable b, final Vert2fImmutable c){ return triAreaVec2(a,b,c) > 0; } diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java index 331116f7e..defb26e77 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java @@ -182,7 +182,7 @@ public class CDTriangulator2D implements Triangulator { final Triangle t; final boolean holeLike; - if(VectorUtil.ccw(v0,v1,v2)) { + if(VectorUtil.isCCW(v0,v1,v2)) { holeLike = false; t = new Triangle(v0, v1, v2, boundaryVertices); } else { diff --git a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java index 1d8264607..155fbd18d 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java @@ -253,7 +253,7 @@ public class Loop { private HEdge findClosestValidNeighbor(final HEdge edge, final boolean delaunay) { final HEdge next = root.getNext(); - if(!VectorUtil.ccw(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(), + if(!VectorUtil.isCCW(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(), edge.getGraphPoint().getPoint())){ return null; } -- cgit v1.2.3