Skip to content

Commit 46bec9c

Browse files
Replace MeshConverter with Kotlin version, add option to flip vertex winding order
1 parent a69747b commit 46bec9c

File tree

10 files changed

+188
-197
lines changed

10 files changed

+188
-197
lines changed

src/main/java/sc/iview/commands/demo/BDVSlicingDemo.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,23 @@
2828
*/
2929
package sc.iview.commands.demo;
3030

31-
import bdv.BigDataViewer;
32-
import bdv.tools.brightness.ConverterSetup;
3331
import bdv.util.*;
3432
import bdv.viewer.SourceAndConverter;
35-
import graphics.scenery.Node;
3633
import graphics.scenery.volumes.Volume;
3734
import io.scif.services.DatasetIOService;
3835
import net.imagej.Dataset;
39-
import net.imagej.mesh.Mesh;
4036
import net.imagej.ops.OpService;
41-
import net.imagej.ops.geom.geom3d.mesh.BitTypeVertexInterpolator;
42-
import net.imglib2.display.ColorConverter;
43-
import net.imglib2.img.Img;
44-
import net.imglib2.type.logic.BitType;
4537
import net.imglib2.type.numeric.integer.UnsignedByteType;
46-
import org.joml.Vector3f;
4738
import org.scijava.command.Command;
4839
import org.scijava.command.CommandService;
4940
import org.scijava.log.LogService;
5041
import org.scijava.plugin.Menu;
5142
import org.scijava.plugin.Parameter;
5243
import org.scijava.plugin.Plugin;
5344
import sc.iview.SciView;
54-
import sc.iview.process.MeshConverter;
5545

5646
import java.io.File;
5747
import java.io.IOException;
58-
import java.util.ArrayList;
5948
import java.util.HashMap;
6049
import java.util.List;
6150

src/main/java/sc/iview/commands/demo/GameOfLife3D.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,17 @@ public class GameOfLife3D implements Command {
103103
// @Parameter(label = "Play speed", min = "1", max="100", style = NumberWidget.SCROLL_BAR_STYLE, persist = false)
104104
private int playSpeed = 10;
105105
//
106-
// @Parameter(callback = "iterate")
107-
// private Button iterate;
108-
//
109-
// @Parameter(callback = "randomize")
110-
// private Button randomize;
111-
//
112-
// @Parameter(callback = "play")
113-
// private Button play;
114-
//
115-
// @Parameter(callback = "pause")
116-
// private Button pause;
106+
@Parameter(callback = "iterate")
107+
private Button iterate;
108+
109+
@Parameter(callback = "randomize")
110+
private Button randomize;
111+
112+
@Parameter(callback = "play")
113+
private Button play;
114+
115+
@Parameter(callback = "pause")
116+
private Button pause;
117117

118118
private int w = 64, h = 64, d = 64;
119119
private Img<UnsignedByteType> field;

src/main/java/sc/iview/commands/demo/ShowSegmentationDemo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import net.imagej.mesh.Mesh;
3434
import net.imagej.mesh.Meshes;
3535
import net.imagej.ops.OpService;
36-
import net.imagej.ops.geom.geom3d.mesh.BitTypeVertexInterpolator;
3736
import net.imglib2.Cursor;
3837
import net.imglib2.RandomAccessibleInterval;
3938
import net.imglib2.RealPoint;

src/main/java/sc/iview/commands/demo/VolumeRenderDemo.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
*/
2929
package sc.iview.commands.demo;
3030

31-
import graphics.scenery.Node;
3231
import graphics.scenery.volumes.Volume;
3332
import io.scif.services.DatasetIOService;
3433
import net.imagej.Dataset;
@@ -38,7 +37,6 @@
3837
import net.imglib2.img.Img;
3938
import net.imglib2.type.logic.BitType;
4039
import net.imglib2.type.numeric.integer.UnsignedByteType;
41-
import org.joml.Vector3f;
4240
import org.scijava.command.Command;
4341
import org.scijava.command.CommandService;
4442
import org.scijava.log.LogService;

src/main/java/sc/iview/commands/file/ExportN5.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
package sc.iview.commands.file;
3030

3131
import graphics.scenery.Mesh;
32-
import graphics.scenery.Node;
33-
import org.janelia.saalfeldlab.n5.N5FSReader;
3432
import org.janelia.saalfeldlab.n5.N5FSWriter;
3533
import org.janelia.saalfeldlab.n5.N5Writer;
3634
import org.scijava.command.Command;

src/main/java/sc/iview/commands/process/ConvexHull.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
import org.scijava.plugin.Plugin;
4242

4343
import sc.iview.SciView;
44-
import sc.iview.process.MeshConverter;
4544

4645
import graphics.scenery.Mesh;
46+
import sc.iview.process.MeshConverter;
4747

4848
/**
4949
* Command to create a convex hull of the currently open mesh

src/main/java/sc/iview/commands/process/MeshToImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
import org.scijava.plugin.Plugin;
4444

4545
import sc.iview.SciView;
46-
import sc.iview.process.MeshConverter;
4746

4847
import graphics.scenery.Mesh;
48+
import sc.iview.process.MeshConverter;
4949

5050
/**
5151
* Command to voxelize the currently active Mesh into an image.

src/main/java/sc/iview/io/N5IO.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.scijava.io.AbstractIOPlugin;
4444
import org.scijava.io.IOPlugin;
4545
import org.scijava.plugin.Plugin;
46-
import org.scijava.util.FileUtils;
4746
import sc.iview.SciView;
4847
import sc.iview.SciViewService;
4948
import sc.iview.process.MeshConverter;

src/main/java/sc/iview/process/MeshConverter.java

Lines changed: 0 additions & 167 deletions
This file was deleted.

0 commit comments

Comments
 (0)