toxiclibs 1.0.0 → 2.0.0

data/src/{toxi → main/java/toxi}/geom/mesh/WingedEdge.java

@@ -97,9 +97,9 @@ public class WingedEdge extends Line3D {
      *
      */
     public void remove() {
-        for (WEFace f : faces) {
+        faces.forEach((f) -> {
             f.edges.remove(this);
-        }
+        });
         ((WEVertex) a).edges.remove(this);
         ((WEVertex) b).edges.remove(this);
     }

data/src/{toxi → main/java/toxi}/geom/mesh2d/DelaunayTriangulation.java

@@ -313,13 +313,11 @@ public class DelaunayTriangulation extends AbstractSet<DelaunayTriangle> {
 
         // Update the graph links for each new triangle
         theTriangles.addAll(newTriangles); // Adj triangle + new triangles
-        for (DelaunayTriangle triangle : newTriangles) {
-            for (DelaunayTriangle other : theTriangles) {
-                if (triangle.isNeighbor(other)) {
-                    triGraph.connect(triangle, other);
-                }
-            }
-        }
+        newTriangles.forEach((triangle) -> {
+            theTriangles.stream().filter((other) -> (triangle.isNeighbor(other))).forEachOrdered((other) -> {
+                triGraph.connect(triangle, other);
+            });
+        });
 
         // Return one of the new triangles
         return newTriangles.iterator().next();

data/src/{toxi → main/java/toxi}/geom/nurbs/NurbsCreator.java

@@ -310,7 +310,7 @@ public final class NurbsCreator {
         }
 
         Vec4D[] pj = curve.getControlPoints();
-        Vec3D P0 = new Vec3D();
+        Vec3D P0; // = new Vec3D();
         final Vec3D P2 = new Vec3D();
         final Vec3D O = new Vec3D();
         final Vec3D T2 = new Vec3D();
@@ -427,7 +427,7 @@ public final class NurbsCreator {
         }
 
         final Vec4D[] pj = curve.getControlPoints();
-        Vec3D P0 = new Vec3D();
+        Vec3D P0; // = new Vec3D();
         final Vec3D O = new Vec3D();
         final Vec3D P2 = new Vec3D();
         final Vec3D T2 = new Vec3D();

data/src/{toxi → main/java/toxi}/math/waves/SineWave.java

@@ -27,13 +27,13 @@
 
 package toxi.math.waves;
 
-import javax.xml.bind.annotation.XmlRootElement;
+
 
 /**
  * Standard Sine wave at fixed frequency and values normalized to the given
  * amplitude.
  */
-@XmlRootElement
+
 public class SineWave extends AbstractWave {
 
     /**

data/src/{toxi → main/java/toxi}/newmesh/IndexedTriangleMesh.java

@@ -156,7 +156,7 @@ public class IndexedTriangleMesh {
             HashMap<String, Object[]> attribs) {
         HashMap<String, int[]> fattribs = null;
         if (attribs != null) {
-            fattribs = (f != null) ? f.attribs : new HashMap<String, int[]>(
+            fattribs = (f != null) ? f.attribs : new HashMap<>(
                     attribs.size(), 1);
             for (String attID : attribs.keySet()) {
                 Object[] items = attribs.get(attID);
@@ -197,9 +197,9 @@ public class IndexedTriangleMesh {
         Vec3D[] v = null;
         for (AttributedFace f : mesh.faces) {
             attribs.clear();
-            for (String a : f.attribs.keySet()) {
-                attribs.put(a, mesh.getFaceAttribValues(f, a));
-            }
+            f.attribs.keySet().forEach((a) -> {
+              attribs.put(a, mesh.getFaceAttribValues(f, a));
+          });
             v = mesh.getFaceVertices(f, v);
             addFace(v[0], v[1], v[2], attribs);
         }
@@ -244,21 +244,21 @@ public class IndexedTriangleMesh {
         }
         HashMap<String, float[]> buffers = new HashMap<>();
         int numF = faces.size();
-        for (String attrib : attribs) {
-            MeshAttributeCompiler comp = mergedComps.get(attrib);
-            if (comp != null) {
-                comp.setMesh(this);
-                ItemIndex<?> index = comp.getIndex();
-                int faceStride = 3 * comp.getStride();
-                float[] buf = new float[numF * faceStride];
-                int offset = 0;
-                for (AttributedFace f : faces) {
-                    comp.compileFace(f, index, buf, offset);
-                    offset += faceStride;
-                }
-                buffers.put(attrib, buf);
-            }
-        }
+        attribs.forEach((attrib) -> {
+          MeshAttributeCompiler comp = mergedComps.get(attrib);
+        if (comp != null) {
+          comp.setMesh(this);
+          ItemIndex<?> index = comp.getIndex();
+          int faceStride = 3 * comp.getStride();
+          float[] buf = new float[numF * faceStride];
+          int offset = 0;
+          for (AttributedFace f : faces) {
+            comp.compileFace(f, index, buf, offset);
+            offset += faceStride;
+          }
+          buffers.put(attrib, buf);
+        }
+      });
         return buffers;
     }
 
@@ -269,15 +269,17 @@ public class IndexedTriangleMesh {
     public List<Object> computeEdges() {
         ItemIndex<Object> edges = getAttributeIndex(ATTR_EDGES);
         edges.clear();
-        for (AttributedFace f : faces) {
-            if (f.attribs == null) {
-                f.attribs = new HashMap<>();
-            }
-            f.attribs.put(ATTR_EDGES, new int[] {
-                    indexFaceEdge(f, f.a, f.b), indexFaceEdge(f, f.b, f.c),
-                    indexFaceEdge(f, f.c, f.a)
-            });
-        }
+        faces.stream().map((f) -> {
+          if (f.attribs == null) {
+            f.attribs = new HashMap<>();
+          }
+        return f;
+      }).forEachOrdered((f) -> {
+        f.attribs.put(ATTR_EDGES, new int[] {
+          indexFaceEdge(f, f.a, f.b), indexFaceEdge(f, f.b, f.c),
+          indexFaceEdge(f, f.c, f.a)
+        });
+      });
         return edges.getItems();
     }
 
@@ -305,28 +307,30 @@ public class IndexedTriangleMesh {
         for (int i = 0; i < vnorms.length; i++) {
             vnorms[i] = new Vec3D();
         }
-        for (AttributedFace f : faces) {
-            final Vec3D n = fnormals.forID(f.normal);
-            vnorms[f.a].addSelf(n);
-            vnorms[f.b].addSelf(n);
-            vnorms[f.c].addSelf(n);
-        }
+        faces.forEach((f) -> {
+          final Vec3D n = fnormals.forID(f.normal);
+          vnorms[f.a].addSelf(n);
+          vnorms[f.b].addSelf(n);
+          vnorms[f.c].addSelf(n);
+      });
         for (Vec3D vnorm : vnorms) {
             vnorm.normalize();
         }
         ItemIndex<Object> idx = getAttributeIndex(ATTR_VNORMALS);
         idx.clear();
-        for (AttributedFace f : faces) {
-            if (f.attribs == null) {
-                f.attribs = new HashMap<>();
-            }
-            f.attribs.put(
-                    ATTR_VNORMALS,
-                    new int[] {
-                            idx.index(vnorms[f.a]), idx.index(vnorms[f.b]),
-                            idx.index(vnorms[f.c])
-                    });
-        }
+        faces.stream().map((f) -> {
+          if (f.attribs == null) {
+            f.attribs = new HashMap<>();
+          }
+        return f;
+      }).forEachOrdered((f) -> {
+        f.attribs.put(
+          ATTR_VNORMALS,
+          new int[] {
+            idx.index(vnorms[f.a]), idx.index(vnorms[f.b]),
+            idx.index(vnorms[f.c])
+          });
+      });
         return idx.getItems();
     }
 
@@ -366,26 +370,26 @@ public class IndexedTriangleMesh {
      * @return itself
      */
     public IndexedTriangleMesh flipVertexOrder() {
-        for (AttributedFace f : faces) {
-            int t = f.b;
-            f.b = f.c;
-            f.c = t;
-            if (f.attribs != null) {
-                for (int[] att : f.attribs.values()) {
-                    t = att[1];
-                    att[1] = att[2];
-                    att[2] = t;
-                }
-            }
-        }
-        for (Vec3D n : fnormals.getItems()) {
-            fnormals.reindex(n, n.getInverted());
-        }
+      faces.forEach((f) -> {
+        int t = f.b;
+        f.b = f.c;
+        f.c = t;
+        if (f.attribs != null) {
+          for (int[] att : f.attribs.values()) {
+            t = att[1];
+            att[1] = att[2];
+            att[2] = t;
+          }
+        }
+      });
+      fnormals.getItems().forEach((n) -> {
+        fnormals.reindex(n, n.getInverted());
+      });
         ItemIndex<Object> vnormals = attributes.get(ATTR_VNORMALS);
         if (vnormals != null) {
-            for (Object n : vnormals.getItems()) {
-                vnormals.reindex(n, ((Vec3D) n).getInverted());
-            }
+          vnormals.getItems().forEach((n) -> {
+            vnormals.reindex(n, ((Vec3D) n).getInverted());
+        });
         }
         return this;
     }
@@ -488,12 +492,9 @@ public class IndexedTriangleMesh {
      */
     public List<AttributedEdge> getEdgesForVertexID(int id) {
         List<AttributedEdge> vedges = new ArrayList<>(2);
-        for (Object o : getEdges()) {
-            AttributedEdge e = (AttributedEdge) o;
-            if (e.a == id || e.b == id) {
-                vedges.add(e);
-            }
-        }
+        getEdges().stream().map((o) -> (AttributedEdge) o).filter((e) -> (e.a == id || e.b == id)).forEachOrdered((e) -> {
+          vedges.add(e);
+      });
         return vedges;
     }