Merge branch 'master' of github.com:scenerygraphics/sciview

scenerygraphics · Oct 16, 2020 · 0b56cb5 · 0b56cb5
2 parents ac00bba + 17cade6
commit 0b56cb5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ branches:
   - master
   - "/.*-[0-9]+\\..*/"
 install: true
+git:
+  depth: false
 script:
 #- ".travis/build.sh"
 - "python3 .travis/pre_ci.py"

diff --git a/pom.xml b/pom.xml
@@ -108,7 +108,7 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>deploy-to-scijava</releaseProfiles>
 
-		<scenery.version>b9c44a2</scenery.version>
+		<scenery.version>242d9cf</scenery.version>
 <!--		<scijava-common.version>2.84.0</scijava-common.version>-->
 
 		<kotlin.version>1.4.10</kotlin.version>

diff --git a/src/main/java/sc/iview/SciView.java b/src/main/java/sc/iview/SciView.java
@@ -1269,8 +1269,8 @@ public void writeSCMesh( String filename, Mesh scMesh ) {
             out = new BufferedOutputStream( new FileOutputStream( f ) );
             out.write( "solid STL generated by FIJI\n".getBytes() );
 
-            FloatBuffer normalsFB = scMesh.getNormals();
-            FloatBuffer verticesFB = scMesh.getVertices();
+            FloatBuffer normalsFB = scMesh.getNormals().duplicate();
+            FloatBuffer verticesFB = scMesh.getVertices().duplicate();
 
             while( verticesFB.hasRemaining() && normalsFB.hasRemaining() ) {
                 out.write( ( "facet normal " + normalsFB.get() + " " + normalsFB.get() + " " + normalsFB.get() +

diff --git a/src/main/java/sc/iview/commands/process/Isosurface.java b/src/main/java/sc/iview/commands/process/Isosurface.java
@@ -28,6 +28,7 @@
  */
 package sc.iview.commands.process;
 
+import graphics.scenery.HasGeometry;
 import graphics.scenery.Node;
 import net.imagej.mesh.Mesh;
 import net.imagej.ops.OpService;
@@ -36,6 +37,7 @@
 import net.imglib2.img.Img;
 import net.imglib2.type.logic.BitType;
 import net.imglib2.type.numeric.RealType;
+import org.joml.Vector3f;
 import org.scijava.command.Command;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
@@ -82,7 +84,8 @@ public void run() {
         Mesh m = ops.geom().marchingCubes(bitImg, 1, new BitTypeVertexInterpolator());
 
         Node scMesh = sciView.addMesh(m);
-
+        ((HasGeometry)scMesh).recalculateNormals();
+        scMesh.setScale(new Vector3f(0.001f, 0.001f, 0.001f));
     }
 
 }