diff --git a/MeshModel/MeshModel.iml b/MeshModel/MeshModel.iml index df0b22bf0cb8c1d360fe1d05711bbbd2a40697e7..a77b632e179a54a4670e16be7b8c14afd12e678f 100644 --- a/MeshModel/MeshModel.iml +++ b/MeshModel/MeshModel.iml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <output url="file://$MODULE_DIR$/target/classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" /> <content url="file://$MODULE_DIR$"> diff --git a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java index 14d6730fdfc092e7d7f5a4fe59ee72d032da0ef1..12ef65c44b81a258c918368b250925240a628e94 100644 --- a/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java +++ b/MeshModel/src/main/java/cz/fidentis/analyst/mesh/io/MeshObjLoader.java @@ -1,14 +1,31 @@ package cz.fidentis.analyst.mesh.io; -import com.mokiat.data.front.parser.*; +import com.mokiat.data.front.parser.IOBJParser; +import com.mokiat.data.front.parser.OBJDataReference; +import com.mokiat.data.front.parser.OBJFace; +import com.mokiat.data.front.parser.OBJMesh; +import com.mokiat.data.front.parser.OBJModel; +import com.mokiat.data.front.parser.OBJNormal; +import com.mokiat.data.front.parser.OBJObject; +import com.mokiat.data.front.parser.OBJParser; +import com.mokiat.data.front.parser.OBJTexCoord; +import com.mokiat.data.front.parser.OBJVertex; import cz.fidentis.analyst.mesh.core.CornerTableRow; import cz.fidentis.analyst.mesh.core.MeshFacet; import cz.fidentis.analyst.mesh.core.MeshModel; import cz.fidentis.analyst.mesh.core.MeshPoint; import javax.vecmath.Vector3d; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** @@ -179,7 +196,7 @@ public class MeshObjLoader { private final Vector3d v2; private final int cornerIndex; - public Edge(Vector3d v1, Vector3d v2, int cornerIndex) { + Edge(Vector3d v1, Vector3d v2, int cornerIndex) { this.v1 = v1; this.v2 = v2; this.cornerIndex = cornerIndex;