Merge remote-tracking branch 'origin/dev' into dev_cpp_code_conversion

CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/tesselation/JoglTesselator.java

@@ -33,7 +33,7 @@ import de.hft.stuttgart.citydoctor2.datastructure.Vertex;
 import de.hft.stuttgart.citydoctor2.math.Vector3d;
 
 /**
- * Tesselator to create triangles out of polygons.
+ * Tesselator to create triangles out of polygons. Uses JOGL implementation.
  * 
  * @author Matthias Betz
  *
@@ -102,6 +102,10 @@ public class JoglTesselator {
 	}
 
 	public static TesselatedPolygon tesselatePolygon(Polygon p) {
+		return tesselatePolygon(p, true);
+	}
+	
+	public static TesselatedPolygon tesselatePolygon(Polygon p, boolean discardDegeneratedTriangles) {
 		ArrayList<Vector3d> vertices = new ArrayList<>();
 		Vector3d normal = p.calculateNormalNormalized();
 		synchronized (tess) {
@@ -121,7 +125,7 @@ public class JoglTesselator {
 			GLU.gluTessEndPolygon(tess);
 			ArrayList<Integer> indices = new ArrayList<>();
 			for (Primitive primitive : primitives) {
-				primitive.fillListWithIndices(indices);
+				primitive.fillListWithIndices(indices, discardDegeneratedTriangles);
 			}
 			primitives.clear();
 			return new TesselatedPolygon(vertices, indices, p);
@@ -137,7 +141,7 @@ public class JoglTesselator {
 		GLU.gluTessEndContour(tess);
 	}
 
-	public static TesselatedRing tesselateRing(LinearRing r) {
+	public static TesselatedRing tesselateRing(LinearRing r, boolean discardDegeneratedTriangles) {
 		ArrayList<Vector3d> vertices = new ArrayList<>();
 		Vector3d normal = r.calculateNormal();
 		synchronized (tess) {
@@ -147,12 +151,16 @@ public class JoglTesselator {
 			GLU.gluTessEndPolygon(tess);
 			ArrayList<Integer> indices = new ArrayList<>();
 			for (Primitive primitive : primitives) {
-				primitive.fillListWithIndices(indices);
+				primitive.fillListWithIndices(indices, discardDegeneratedTriangles);
 			}
 			primitives.clear();
 			return new TesselatedRing(vertices, indices, r);
 		}
 	}
+	
+	public static TesselatedRing tesselateRing(LinearRing r) {
+		return tesselateRing(r, true);
+	}
 
 	private JoglTesselator() {
 		// only static useage