toxiclibs 0.9.2 → 2.1.0

data/src/{toxi → main/java/toxi}/geom/Triangle3D.java

@@ -27,10 +27,7 @@
 
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+
 
 import toxi.math.MathUtils;
 
@@ -38,7 +35,7 @@ import toxi.math.MathUtils;
  *
  * @author tux
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Triangle3D implements Shape3D {
 
     /**
@@ -91,7 +88,7 @@ public class Triangle3D implements Shape3D {
         return (determ < 0.0);
     }
 
-    @XmlElement(required = true)
+
     public Vec3D a,
 
     /**
@@ -115,13 +112,13 @@ public class Triangle3D implements Shape3D {
     /**
      *
      */
-    @XmlElement(required = true)
+
     public Vec3D normal;
 
     /**
      *
      */
-    @XmlTransient
+
     public Vec3D centroid;
 
     /**

data/src/{toxi → main/java/toxi}/geom/Vec2D.java

@@ -28,7 +28,7 @@ package toxi.geom;
 
 import java.util.Random;
 
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 import toxi.math.InterpolateStrategy;
 import toxi.math.MathUtils;
@@ -171,13 +171,13 @@ public class Vec2D implements Comparable<ReadonlyVec2D>, ReadonlyVec2D {
     /**
      * X coordinate
      */
-    @XmlAttribute(required = true)
+
     public float x;
 
     /**
      * Y coordinate
      */
-    @XmlAttribute(required = true)
+
     public float y;
 
     /**

data/src/{toxi → main/java/toxi}/geom/Vec3D.java

@@ -29,7 +29,7 @@ package toxi.geom;
 
 import java.util.Random;
 
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 import toxi.math.InterpolateStrategy;
 import toxi.math.MathUtils;
@@ -213,15 +213,15 @@ public class Vec3D implements Comparable<ReadonlyVec3D>, ReadonlyVec3D {
     }
 
     /** X coordinate. */
-    @XmlAttribute(required = true)
+
     public float x;
 
     /** Y coordinate. */
-    @XmlAttribute(required = true)
+
     public float y;
 
     /** Z coordinate. */
-    @XmlAttribute(required = true)
+
     public float z;
 
     /**

data/src/{toxi → main/java/toxi}/geom/Vec4D.java

@@ -27,7 +27,7 @@
 
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 import toxi.math.InterpolateStrategy;
 import toxi.math.MathUtils;
@@ -40,19 +40,19 @@ import toxi.math.ScaleMap;
 public class Vec4D implements ReadonlyVec4D, Cloneable {
 
     /** X coordinate */
-    @XmlAttribute(required = true)
+
     public float x;
 
     /** Y coordinate */
-    @XmlAttribute(required = true)
+
     public float y;
 
     /** Z coordinate */
-    @XmlAttribute(required = true)
+
     public float z;
 
     /** W coordinate (weight) */
-    @XmlAttribute(required = true)
+
     public float w;
 
     /**

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 {
 
     /**