Skip to content

Commit

Permalink
Update 3D Viewer to 5.0.0
Browse files Browse the repository at this point in the history
And consequently, Java 3D to 1.7.2.

And consequently, bump major version digit from 3 to 4, due to
vecmath package prefix change causing binary incompatibilities.
  • Loading branch information
ctrueden committed Sep 28, 2024
1 parent b8c8fb0 commit 405eb05
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
11 changes: 8 additions & 3 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>3D_Blob_Segmentation</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>

<name>3D Blob Segmentation</name>
<description>3D Blob Segmentation plugin for Fiji.</description>
Expand Down Expand Up @@ -88,6 +88,10 @@

<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>

<_3D_Viewer.version>5.0.0</_3D_Viewer.version>
<jogamp-java3d.version>1.7.2</jogamp-java3d.version>
<org.jogamp.java3d.vecmath.version>${jogamp-java3d.version}</org.jogamp.java3d.vecmath.version>
</properties>

<repositories>
Expand Down Expand Up @@ -116,8 +120,9 @@

<!-- Java3D dependencies -->
<dependency>
<groupId>org.scijava</groupId>
<groupId>org.jogamp.java3d</groupId>
<artifactId>vecmath</artifactId>
<version>${org.jogamp.java3d.vecmath.version}</version>
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions src/main/java/ij3d/segmentation/Blob_Segmentation_in_3D.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
import java.util.List;
import java.util.Map;

import org.scijava.vecmath.Color3f;
import org.scijava.vecmath.Point3d;
import org.scijava.vecmath.Point3f;
import org.scijava.vecmath.Vector3d;
import org.jogamp.vecmath.Color3f;
import org.jogamp.vecmath.Point3d;
import org.jogamp.vecmath.Point3f;
import org.jogamp.vecmath.Vector3d;

import levelsets.ij.LevelSet;
import marchingcubes.MCTriangulator;
Expand Down

0 comments on commit 405eb05

Please sign in to comment.