From 38365e14977714df3f19fb6b5880dd6f4d4d5743 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 9 Apr 2014 09:25:55 +0200
Subject: VectorUtil: Fix method names, i.e. use type-suffix in end of function
for clarity and unique method naming
---
.../classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java | 4 ++--
src/jogl/classes/jogamp/graph/curve/tess/Loop.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/jogl/classes/jogamp/graph/curve/tess')
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java
index 2ada436f8..a836e2023 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java
@@ -266,8 +266,8 @@ public class CDTriangulator2DExpAddOn {
final float texZTag = 2f;
final float[] vOACoords = vOA.getCoord();
- final float dOC0A = VectorUtil.vec3Distance(vOACoords, vC0A.getCoord());
- final float dOC1A = VectorUtil.vec3Distance(vOACoords, vC1A.getCoord());
+ final float dOC0A = VectorUtil.distVec3(vOACoords, vC0A.getCoord());
+ final float dOC1A = VectorUtil.distVec3(vOACoords, vC1A.getCoord());
if( false ) {
final float[] vec3Z = { 0f, 0f, -1f };
final float[] vecLongSide, vecLineHeight;
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
index f91c2e77f..1f038a930 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
@@ -198,12 +198,12 @@ public class Loop {
final GraphVertex nextV = initVertices.get(i+1);
for(int pos=0; pos<vertices.size(); pos++) {
final GraphVertex cand = vertices.get(pos);
- final float distance = VectorUtil.vec3Distance(v.getCoord(), cand.getCoord());
+ final float distance = VectorUtil.distVec3(v.getCoord(), cand.getCoord());
if(distance < minDistance){
for (GraphVertex vert:vertices){
if(vert == v || vert == nextV || vert == cand)
continue;
- inValid = VectorUtil.isInCircle(v.getPoint(), nextV.getPoint(),
+ inValid = VectorUtil.isInCircleVec2(v.getPoint(), nextV.getPoint(),
cand.getPoint(), vert.getPoint());
if(inValid){
break;
@@ -247,7 +247,7 @@ public class Loop {
e = e.getNext();
continue;
}
- inValid = VectorUtil.isInCircle(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(),
+ inValid = VectorUtil.isInCircleVec2(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(),
cand, e.getGraphPoint().getPoint());
if(inValid){
break;
--
cgit v1.2.3