From aa39750aa27fc4c65f34fbd599186b30e5005f59 Mon Sep 17 00:00:00 2001 From: Sven Göthel Date: Fri, 2 Feb 2024 10:24:51 +0100 Subject: Remove Clonable and clone() in favor of explicit determined copy() and copy-ctor in com.jogamp.graph.* and com.jogamp.math.* --- .../jogamp/graph/curve/tess/CDTriangulator2D.java | 6 +++--- .../graph/curve/tess/CDTriangulator2DExpAddOn.java | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/jogl/classes/jogamp') diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java index b7fee25e5..fe1aad169 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java @@ -204,9 +204,9 @@ public class CDTriangulator2D implements Triangulator { final GraphVertex gv2 = outVertices.get((i+1)%size); // +1 if( !gv1.getPoint().isOnCurve() ) { - final Vertex v0 = gv0.getPoint().clone(); - final Vertex v2 = gv2.getPoint().clone(); - final Vertex v1 = gv1.getPoint().clone(); + final Vertex v0 = gv0.getPoint().copy(); + final Vertex v2 = gv2.getPoint().copy(); + final Vertex v1 = gv1.getPoint().copy(); addedVerticeCount += 3; final boolean[] boundaryVertices = { true, true, true }; diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java index 32f526f3b..5429192cd 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2DExpAddOn.java @@ -95,17 +95,17 @@ public class CDTriangulator2DExpAddOn { } } else { if( v0IsLS ) { - final Vertex v = v0.clone(); + final Vertex v = v0.copy(); v.setTexCoord(0f, 0f, texZTag); triVs[0] = v; } if( v1IsLS ) { - final Vertex v = v1.clone(); + final Vertex v = v1.copy(); v.setTexCoord(0f, 0f, texZTag); triVs[1] = v; } if( v2IsLS ) { - final Vertex v = v2.clone(); + final Vertex v = v2.copy(); v.setTexCoord(0f, 0f, texZTag); triVs[2] = v; } @@ -252,16 +252,16 @@ public class CDTriangulator2DExpAddOn { vOA = verts1[otherIdxA]; vOB = verts2[otherIdxB]; } else { - // Fetch and clone, write-back to triangles - vC0A = verts1[commonIdxA[0]].clone(); + // Fetch and copy, write-back to triangles + vC0A = verts1[commonIdxA[0]].copy(); verts1[commonIdxA[0]] = vC0A; verts2[commonIdxB[0]] = vC0A; - vC1A = verts1[commonIdxA[1]].clone(); + vC1A = verts1[commonIdxA[1]].copy(); verts1[commonIdxA[1]] = vC1A; verts2[commonIdxB[1]] = vC1A; - vOA = verts1[otherIdxA].clone(); + vOA = verts1[otherIdxA].copy(); verts1[otherIdxA] = vOA; - vOB = verts2[otherIdxB].clone(); + vOB = verts2[otherIdxB].copy(); verts2[otherIdxB] = vOB; } -- cgit v1.2.3