From a3ea04d1d7e524d2b6a67dd3219166002317c313 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 27 Sep 2024 20:32:41 -0500 Subject: [PATCH] Update to Java 3D 1.7.2 And adjust for backwards-incompatible API changes. And bump the major version from 2 to 3 due to API signature breakages in this component -- e.g. VectorString3D#transform(Transform3D) because Transform3D changed package prefix. --- pom.xml | 14 +++++++------- src/main/java/ini/trakem2/vector/SkinMaker.java | 2 +- .../java/ini/trakem2/vector/VectorString3D.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index e18ce88b..fdd6727e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.scijava pom-scijava - 33.2.0 + 38.0.1 sc.fiji VectorString - 2.0.4-SNAPSHOT + 3.0.0-SNAPSHOT VectorString VectorString component of TrakEM2 suite. @@ -122,15 +122,15 @@ - org.scijava - j3dcore + org.jogamp.java3d + java3d-core - org.scijava - j3dutils + org.jogamp.java3d + java3d-utils - org.scijava + org.jogamp.java3d vecmath diff --git a/src/main/java/ini/trakem2/vector/SkinMaker.java b/src/main/java/ini/trakem2/vector/SkinMaker.java index f6296f5f..2e36d007 100644 --- a/src/main/java/ini/trakem2/vector/SkinMaker.java +++ b/src/main/java/ini/trakem2/vector/SkinMaker.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.List; -import org.scijava.vecmath.Point3f; +import org.jogamp.vecmath.Point3f; public class SkinMaker { diff --git a/src/main/java/ini/trakem2/vector/VectorString3D.java b/src/main/java/ini/trakem2/vector/VectorString3D.java index 6bd1b889..ad5f6539 100644 --- a/src/main/java/ini/trakem2/vector/VectorString3D.java +++ b/src/main/java/ini/trakem2/vector/VectorString3D.java @@ -26,9 +26,9 @@ import java.util.Collections; import java.util.Random; -import org.scijava.java3d.Transform3D; -import org.scijava.vecmath.Point3d; -import org.scijava.vecmath.Vector3d; +import org.jogamp.java3d.Transform3D; +import org.jogamp.vecmath.Point3d; +import org.jogamp.vecmath.Vector3d; import Jama.Matrix; import ij.measure.Calibration;