Skip to content

Commit

Permalink
Update to Java 3D 1.7.2
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ctrueden committed Sep 28, 2024
1 parent e6b95d3 commit a3ea04d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<version>33.2.0</version>
<version>38.0.1</version>
<relativePath />
</parent>

<groupId>sc.fiji</groupId>
<artifactId>VectorString</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>

<name>VectorString</name>
<description>VectorString component of TrakEM2 suite.</description>
Expand Down Expand Up @@ -122,15 +122,15 @@

<!-- Java 3D dependencies -->
<dependency>
<groupId>org.scijava</groupId>
<artifactId>j3dcore</artifactId>
<groupId>org.jogamp.java3d</groupId>
<artifactId>java3d-core</artifactId>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<artifactId>j3dutils</artifactId>
<groupId>org.jogamp.java3d</groupId>
<artifactId>java3d-utils</artifactId>
</dependency>
<dependency>
<groupId>org.scijava</groupId>
<groupId>org.jogamp.java3d</groupId>
<artifactId>vecmath</artifactId>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ini/trakem2/vector/SkinMaker.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ini/trakem2/vector/VectorString3D.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit a3ea04d

Please sign in to comment.