Returning a list of triangles refactored as a Visitor

Comparison/src/main/java/cz/fidentis/analyst/comparison/HausdorffDistance.java

@@ -4,6 +4,7 @@ import cz.fidentis.analyst.mesh.core.MeshFacet;
 import cz.fidentis.analyst.mesh.core.MeshPoint;
 import cz.fidentis.analyst.mesh.core.MeshPointImpl;
 import cz.fidentis.analyst.mesh.core.MeshTriangle;
+import cz.fidentis.analyst.mesh.visitors.TriangleListVisitor;
 
 import javax.vecmath.Vector3d;
 import java.util.ArrayList;
@@ -205,7 +206,9 @@ public class HausdorffDistance {
         List<Pair<Vector3d, Double>> projections = new ArrayList<>(indicesOfTrianglesOfVertex.size());
         Vector3d helperVector = new Vector3d();
 
-        List<MeshTriangle> trList = comparedFacet.asTriangles();
+        TriangleListVisitor visitor = new TriangleListVisitor();
+        comparedFacet.accept(visitor);
+        List<MeshTriangle> trList = visitor.getTriangles();
         for (int index : indicesOfTrianglesOfVertex) {
             List<Vector3d> triangle = new ArrayList<>();
             triangle.add(trList.get(index).vertex1.getPosition());

Comparison/src/main/java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java

@@ -8,6 +8,7 @@ import cz.fidentis.analyst.mesh.core.MeshFacetImpl;
 import cz.fidentis.analyst.mesh.core.MeshPointImpl;
 import cz.fidentis.analyst.mesh.core.MeshTriangle;
 import cz.fidentis.analyst.mesh.visitors.BoundingBoxVisitor;
+import cz.fidentis.analyst.mesh.visitors.TriangleListVisitor;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -48,7 +49,9 @@ public class SymmetryEstimator {
         this.facet = f;
         this.config = config;
         
-        this.triangles = f.asTriangles();
+        TriangleListVisitor visitor = new TriangleListVisitor();
+        f.accept(visitor);
+        this.triangles = visitor.getTriangles();
         
         this.areas = new TriangleVertexAreas[triangles.size()];
         for (int i = 0; i < areas.length; i++) {

MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacet.java

 package cz.fidentis.analyst.mesh.core;
 
-import cz.fidentis.analyst.mesh.visitors.BoundingBox;
 import cz.fidentis.analyst.mesh.visitors.Visitor;
 import java.util.List;
 
@@ -47,12 +46,6 @@ public interface MeshFacet {
      */
     CornerTable getCornerTable();
     
-    /**
-     * Returns the mesh as a list of individial triangles.
-     * @return the list of individial triangles.
-     */
-    List<MeshTriangle> asTriangles();
-    
     /**
      * Returns true if normals of vertices are calculated.
      * @return true if normals of vertices are calculated.

MeshModel/src/main/java/cz/fidentis/analyst/mesh/core/MeshFacetImpl.java

 package cz.fidentis.analyst.mesh.core;
 
 import cz.fidentis.analyst.mesh.visitors.BoundingBox;
+import cz.fidentis.analyst.mesh.visitors.TriangleListVisitor;
 import cz.fidentis.analyst.mesh.visitors.Visitor;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -66,18 +67,6 @@ public class MeshFacetImpl implements MeshFacet {
         return cornerTable;
     }
     
-    @Override
-    public List<MeshTriangle> asTriangles() {
-        List<MeshTriangle> ret = new ArrayList<>();
-        for (int i = 0; i < cornerTable.getSize(); i += 3) {
-            ret.add(new MeshTriangle(
-                    vertices.get(cornerTable.getRow(i + 0).getVertexIndex()),
-                    vertices.get(cornerTable.getRow(i + 1).getVertexIndex()),
-                    vertices.get(cornerTable.getRow(i + 2).getVertexIndex())));
-        }
-        return ret;
-    }
-    
     @Override
     public boolean hasVertexNormals() {
         return !this.vertices.isEmpty() && this.vertices.get(0).getNormal() != null;
@@ -99,7 +88,9 @@ public class MeshFacetImpl implements MeshFacet {
         }
         
         // calculate normals from corresponding triangles
-        for (MeshTriangle t : asTriangles()) { 
+        TriangleListVisitor visitor = new TriangleListVisitor();
+        this.accept(visitor);
+        for (MeshTriangle t : visitor.getTriangles()) { 
             Vector3d triangleNormal = 
                     (t.vertex3.subtractPosition(t.vertex1)).crossProduct(t.vertex2.subtractPosition(t.vertex1)).getPosition();
             normalMap.get(t.vertex1).add(triangleNormal);

MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitor.java

@@ -4,7 +4,7 @@ import cz.fidentis.analyst.mesh.core.MeshFacet;
 import cz.fidentis.analyst.mesh.core.MeshModel;
 
 /**
- * Computes a 3D bounding box (cube).
+ * Visitor that computes a 3D bounding box (cube).
  * 
  * @author oslejsek
  */

MeshModel/src/main/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitor.java

+package cz.fidentis.analyst.mesh.visitors;
+
+import cz.fidentis.analyst.mesh.core.CornerTable;
+import cz.fidentis.analyst.mesh.core.MeshFacet;
+import cz.fidentis.analyst.mesh.core.MeshModel;
+import cz.fidentis.analyst.mesh.core.MeshTriangle;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Visitor that collects and returs list of triangles.
+ * 
+ * @author oslejsek
+ */
+public class TriangleListVisitor implements Visitor {
+    
+    private List<MeshTriangle> triangles = new ArrayList<>();
+
+    @Override
+    public void visitMeshFacet(MeshFacet facet) {
+        CornerTable ct = facet.getCornerTable();
+        for (int i = 0; i < ct.getSize(); i += 3) {
+            triangles.add(new MeshTriangle(
+                    facet.getVertex(ct.getRow(i + 0).getVertexIndex()),
+                    facet.getVertex(ct.getRow(i + 1).getVertexIndex()),
+                    facet.getVertex(ct.getRow(i + 2).getVertexIndex())));
+        }
+    }
+    
+    public List<MeshTriangle> getTriangles() {
+        return triangles;
+    }
+}

MeshModel/src/test/java/cz/fidentis/analyst/mesh/visitors/BoundingBoxVisitorTest.java

@@ -17,12 +17,6 @@ public class BoundingBoxVisitorTest {
     
     Path testFileDirectory = Paths.get("src", "test", "resources", "cz", "fidentis", "analyst", "mesh", "io");
     
-    @Test
-    void moreObjectFileTest() { //TODO: Not testing in loader
-        File moreObjects = new File(testFileDirectory.toFile(), "MoreObjects.obj");
-        Exception ex = assertThrows(IOException.class, () -> MeshObjLoader.read(moreObjects));
-    }
-    
     @Test
     void icoSphereTest() throws IOException {
         MeshModel m = MeshObjLoader.read(new File(testFileDirectory.toFile(), "IcoSphere-20.obj"));

MeshModel/src/test/java/cz/fidentis/analyst/mesh/visitors/TriangleListVisitorTest.java

+package cz.fidentis.analyst.mesh.visitors;
+
+import cz.fidentis.analyst.mesh.visitors.*;
+import cz.fidentis.analyst.mesh.core.MeshModel;
+import cz.fidentis.analyst.mesh.io.MeshObjLoader;
+import cz.fidentis.analyst.mesh.io.MeshObjLoader;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import javax.vecmath.Vector3d;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author Radek Oslejsek
+ */
+public class TriangleListVisitorTest {
+    
+    Path testFileDirectory = Paths.get("src", "test", "resources", "cz", "fidentis", "analyst", "mesh", "io");
+    
+    @Test
+    void icoSphereTest() throws IOException {
+        MeshModel m = MeshObjLoader.read(new File(testFileDirectory.toFile(), "IcoSphere-20.obj"));
+        assertNotNull(m);
+        TriangleListVisitor visitor = new TriangleListVisitor();
+        m.accept(visitor);
+        assertEquals(20, visitor.getTriangles().size());
+    }
+    
+    @Test
+    void combinedTest() throws IOException {
+        MeshModel m = MeshObjLoader.read(new File(testFileDirectory.toFile(), "IcoSphere-20.obj"));
+        assertNotNull(m);
+        TriangleListVisitor visitor = new TriangleListVisitor();
+        m.accept(visitor);
+        
+        m = MeshObjLoader.read(new File(testFileDirectory.toFile(), "Tetrahedron.obj"));
+        assertNotNull(m);
+        m.accept(visitor);
+        
+        assertEquals(24, visitor.getTriangles().size());
+    }
+}