Removed (cycling) dependency from MeshModel to GUI

MeshModel/pom.xml

@@ -100,12 +100,6 @@
             <version>RELEASE</version>
             <scope>test</scope>
         </dependency>
-	<dependency>
-            <groupId>cz.findetis</groupId>
-            <artifactId>GUI</artifactId>
-            <version>2.0</version>
-            <type>jar</type>
-        </dependency>
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjExporter.java

@@ -2,7 +2,6 @@ package cz.fidentis.analyst.mesh.io;
 
 import cz.fidentis.analyst.mesh.core.MeshFacet;
 import cz.fidentis.analyst.mesh.core.MeshModel;
-import cz.fidentis.analyst.symmetry.Triangle;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -62,8 +61,7 @@ public class MeshObjExporter {
 
         exportFile = new File(exportFile.getParent() + File.separator + fileName + ".obj");
         
-        try (FileWriter fstream = new FileWriter(exportFile);
-        BufferedWriter out = new BufferedWriter(fstream);) {
+        try (BufferedWriter out = new BufferedWriter(new FileWriter(exportFile))) {
            
             DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
             otherSymbols.setDecimalSeparator('.');  //dot as separator for decimal numbers
@@ -73,7 +71,8 @@ public class MeshObjExporter {
             for (int j = 0; j < facet.getNumberOfVertices(); j++) {
                 out.write("v " + df.format(facet.getVertices().get(j).getPosition().x) + " " 
                         + df.format(facet.getVertices().get(j).getPosition().y) + " " 
-                        + df.format(facet.getVertices().get(j).getPosition().z) + "\n");
+                        + df.format(facet.getVertices().get(j).getPosition().z));
+                out.newLine();
             }
             
             //detects if first vertex has normal
@@ -84,10 +83,32 @@ public class MeshObjExporter {
                 if(facet.getVertex(i).getNormal() != null) {
                 out.write("vn " + df.format(facet.getVertices().get(i).getNormal().x) + " "
                         + df.format(facet.getVertices().get(i).getNormal().y) + " "
-                        + df.format(facet.getVertices().get(i).getNormal().z) + "\n");
+                        + df.format(facet.getVertices().get(i).getNormal().z));
+                out.newLine();
                 }
             }
             
+            for (int i = 0; i < facet.getCornerTable().getSize(); i += 3) {
+                int v1i = facet.getCornerTable().getRow(i).getVertexIndex();
+                int v2i = facet.getCornerTable().getRow(i + 1).getVertexIndex();
+                int v3i = facet.getCornerTable().getRow(i + 2).getVertexIndex();
+                
+                out.write("f ");
+                if (facet.getVertex(v1i).getNormal() != null && hasAllNormals) {
+                    out.write((v1i + 1) + "//" + (v1i + 1) + " "
+                            + (v2i + 1) + "//" + (v2i + 1) + " "
+                            + (v3i + 1) + "//" + (v3i + 1)); 
+                    out.newLine();
+                } else {
+                    out.write((v1i + 1) + " " + (v2i + 1) + " " + (v3i + 1));
+                    out.newLine();
+                }
+            }
+            
+            out.write("#" + facet.getCornerTable().getSize() / 3 + " triangles");
+            out.newLine();
+            
+            /*
             //computes triangles of facet
             Triangle[] triangles = new Triangle[facet.getCornerTable().getSize() / 3];
             for (int i = 0; i < facet.getCornerTable().getSize(); i += 3) {
@@ -113,6 +134,7 @@ public class MeshObjExporter {
             out.write("\n");
             out.close();
             fstream.close();
+            */
         }
     }
 }