Skip to content
Permalink
Browse files

Use the SciJava fork of Java 3D 1.6

This means we no longer need users to install a Java 3D into
their Java runtimes -- we can just ship Java 3D with Fiji!

See:
* https://github.com/scijava/java3d-core
* https://github.com/scijava/java3d-utils
* https://github.com/scijava/vecmath

Note that this version of Java 3D requires Java 7.
So this plugin now requires Java 7 by extension.
  • Loading branch information...
ctrueden committed Nov 18, 2015
1 parent 3afbf55 commit 13ed8101c2cc9b93bf25cad5de8e88c65be7b6af
23 pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>sc.fiji</groupId>
<artifactId>pom-fiji</artifactId>
<version>6.1.3</version>
<version>18.1.0</version>
<relativePath />
</parent>

<artifactId>VIB_</artifactId>
<version>2.0.4-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>

<name>plugins/VIB_.jar</name>
<description />
@@ -26,6 +26,11 @@
<url>http://jenkins.imagej.net/job/VIB/</url>
</ciManagement>

<properties>
<scijava.jvm.version>1.7</scijava.jvm.version>
<ImageJ_3D_Viewer.version>4.0.1</ImageJ_3D_Viewer.version>
</properties>

<repositories>
<!-- NB: for project parent -->
<repository>
@@ -59,20 +64,18 @@
<artifactId>ij</artifactId>
</dependency>

<!-- Java 3D dependencies -->
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core</artifactId>
<scope>provided</scope>
<groupId>org.scijava</groupId>
<artifactId>j3dcore</artifactId>
</dependency>
<dependency>
<groupId>java3d</groupId>
<artifactId>j3d-core-utils</artifactId>
<scope>provided</scope>
<groupId>org.scijava</groupId>
<artifactId>j3dutils</artifactId>
</dependency>
<dependency>
<groupId>java3d</groupId>
<groupId>org.scijava</groupId>
<artifactId>vecmath</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

@@ -1,4 +1,4 @@
import com.sun.j3d.utils.geometry.Sphere;
import org.scijava.java3d.utils.geometry.Sphere;

import ij.ImagePlus;
import ij.ImageStack;
@@ -14,17 +14,17 @@
import java.awt.event.AdjustmentListener;
import java.util.List;

import javax.media.j3d.Appearance;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.PolygonAttributes;
import javax.media.j3d.QuadArray;
import javax.media.j3d.Shape3D;
import javax.media.j3d.Transform3D;
import javax.media.j3d.TransformGroup;
import javax.vecmath.Color3f;
import javax.vecmath.Point3f;
import javax.vecmath.Vector3f;
import org.scijava.java3d.Appearance;
import org.scijava.java3d.BranchGroup;
import org.scijava.java3d.ColoringAttributes;
import org.scijava.java3d.PolygonAttributes;
import org.scijava.java3d.QuadArray;
import org.scijava.java3d.Shape3D;
import org.scijava.java3d.Transform3D;
import org.scijava.java3d.TransformGroup;
import org.scijava.vecmath.Color3f;
import org.scijava.vecmath.Point3f;
import org.scijava.vecmath.Vector3f;

import marchingcubes.MCCube;

@@ -1,5 +1,5 @@
import com.sun.j3d.utils.geometry.ColorCube;
import com.sun.j3d.utils.universe.SimpleUniverse;
import org.scijava.java3d.utils.geometry.ColorCube;
import org.scijava.java3d.utils.universe.SimpleUniverse;

import ij.gui.GenericDialog;
import ij.plugin.PlugIn;
@@ -8,13 +8,13 @@
import java.awt.Dimension;
import java.awt.Panel;

import javax.media.j3d.Alpha;
import javax.media.j3d.BoundingSphere;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.Canvas3D;
import javax.media.j3d.RotationInterpolator;
import javax.media.j3d.Transform3D;
import javax.media.j3d.TransformGroup;
import org.scijava.java3d.Alpha;
import org.scijava.java3d.BoundingSphere;
import org.scijava.java3d.BranchGroup;
import org.scijava.java3d.Canvas3D;
import org.scijava.java3d.RotationInterpolator;
import org.scijava.java3d.Transform3D;
import org.scijava.java3d.TransformGroup;


public class Test_Java3D implements PlugIn {
@@ -24,8 +24,8 @@
import java.util.Iterator;
import java.util.List;

import javax.vecmath.Point3f;
import javax.vecmath.Vector3f;
import org.scijava.vecmath.Point3f;
import org.scijava.vecmath.Vector3f;

public class ExportMesh_ implements PlugIn {

@@ -1,6 +1,6 @@
package textureByRef;

import com.sun.j3d.utils.pickfast.PickCanvas;
import org.scijava.java3d.utils.pickfast.PickCanvas;

import ij.IJ;
import ij.ImageListener;
@@ -23,27 +23,27 @@
import java.awt.image.SampleModel;
import java.awt.image.WritableRaster;

import javax.media.j3d.Appearance;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.GeometryArray;
import javax.media.j3d.ImageComponent;
import javax.media.j3d.ImageComponent2D;
import javax.media.j3d.Material;
import javax.media.j3d.PickInfo;
import javax.media.j3d.PolygonAttributes;
import javax.media.j3d.QuadArray;
import javax.media.j3d.RenderingAttributes;
import javax.media.j3d.Shape3D;
import javax.media.j3d.TexCoordGeneration;
import javax.media.j3d.Texture;
import javax.media.j3d.Texture2D;
import javax.media.j3d.TextureAttributes;
import javax.media.j3d.TransparencyAttributes;
import javax.vecmath.Color3f;
import javax.vecmath.Point3d;
import javax.vecmath.Point3f;
import javax.vecmath.Vector4f;
import org.scijava.java3d.Appearance;
import org.scijava.java3d.BranchGroup;
import org.scijava.java3d.ColoringAttributes;
import org.scijava.java3d.GeometryArray;
import org.scijava.java3d.ImageComponent;
import org.scijava.java3d.ImageComponent2D;
import org.scijava.java3d.Material;
import org.scijava.java3d.PickInfo;
import org.scijava.java3d.PolygonAttributes;
import org.scijava.java3d.QuadArray;
import org.scijava.java3d.RenderingAttributes;
import org.scijava.java3d.Shape3D;
import org.scijava.java3d.TexCoordGeneration;
import org.scijava.java3d.Texture;
import org.scijava.java3d.Texture2D;
import org.scijava.java3d.TextureAttributes;
import org.scijava.java3d.TransparencyAttributes;
import org.scijava.vecmath.Color3f;
import org.scijava.vecmath.Point3d;
import org.scijava.vecmath.Point3f;
import org.scijava.vecmath.Vector4f;

public class Texture_By_Ref implements PlugInFilter,
ImageListener,
@@ -1,6 +1,6 @@
package textureByRef;

import com.sun.j3d.utils.pickfast.PickCanvas;
import org.scijava.java3d.utils.pickfast.PickCanvas;

import ij.IJ;
import ij.ImageListener;
@@ -25,27 +25,27 @@
import java.awt.image.Raster;
import java.awt.image.WritableRaster;

import javax.media.j3d.Appearance;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.ColoringAttributes;
import javax.media.j3d.GeometryArray;
import javax.media.j3d.ImageComponent;
import javax.media.j3d.ImageComponent2D;
import javax.media.j3d.Material;
import javax.media.j3d.PickInfo;
import javax.media.j3d.PolygonAttributes;
import javax.media.j3d.QuadArray;
import javax.media.j3d.RenderingAttributes;
import javax.media.j3d.Shape3D;
import javax.media.j3d.TexCoordGeneration;
import javax.media.j3d.Texture;
import javax.media.j3d.Texture2D;
import javax.media.j3d.TextureAttributes;
import javax.media.j3d.TransparencyAttributes;
import javax.vecmath.Color3f;
import javax.vecmath.Point3d;
import javax.vecmath.Point3f;
import javax.vecmath.Vector4f;
import org.scijava.java3d.Appearance;
import org.scijava.java3d.BranchGroup;
import org.scijava.java3d.ColoringAttributes;
import org.scijava.java3d.GeometryArray;
import org.scijava.java3d.ImageComponent;
import org.scijava.java3d.ImageComponent2D;
import org.scijava.java3d.Material;
import org.scijava.java3d.PickInfo;
import org.scijava.java3d.PolygonAttributes;
import org.scijava.java3d.QuadArray;
import org.scijava.java3d.RenderingAttributes;
import org.scijava.java3d.Shape3D;
import org.scijava.java3d.TexCoordGeneration;
import org.scijava.java3d.Texture;
import org.scijava.java3d.Texture2D;
import org.scijava.java3d.TextureAttributes;
import org.scijava.java3d.TransparencyAttributes;
import org.scijava.vecmath.Color3f;
import org.scijava.vecmath.Point3d;
import org.scijava.vecmath.Point3f;
import org.scijava.vecmath.Vector4f;

public class Texture_By_Ref_col implements PlugInFilter,
ImageListener,
@@ -24,8 +24,8 @@
import java.util.TreeSet;
import java.util.Vector;

import javax.vecmath.Color3f;
import javax.vecmath.Point3f;
import org.scijava.vecmath.Color3f;
import org.scijava.vecmath.Point3f;

import math3d.NormalEstimator;
import math3d.Point3d;

0 comments on commit 13ed810

Please sign in to comment.
You can’t perform that action at this time.