toxiclibs 1.0.0 → 2.0.0

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

@@ -108,12 +108,18 @@ public class Origin3D {
         this.zAxis = dir.getNormalized();
         Vec3D av = null;
         Axis a = zAxis.getClosestAxis();
-        if (a == Vec3D.Axis.X) {
-            av = Vec3D.Axis.Z.getVector().getInverted();
-        } else if (a == Vec3D.Axis.Y) {
-            av = Vec3D.Axis.Z.getVector().getInverted();
-        } else if (a == Vec3D.Axis.Z) {
-            av = Vec3D.Axis.X.getVector().getInverted();
+        if (null != a) switch (a) {
+            case X:
+                av = Vec3D.Axis.Z.getVector().getInverted();
+                break;
+            case Y:
+                av = Vec3D.Axis.Z.getVector().getInverted();
+                break;
+            case Z:
+                av = Vec3D.Axis.X.getVector().getInverted();
+                break;
+            default:
+                break;
         }
         if (av == null) {
             throw new IllegalArgumentException(

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

@@ -27,9 +27,7 @@
 
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+
 
 import toxi.geom.mesh.Mesh3D;
 import toxi.geom.mesh.TriangleMesh;
@@ -39,7 +37,7 @@ import toxi.math.MathUtils;
  * Class to describe and work with infinite generic 3D planes. Useful for
  * intersection problems and classifying points.
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Plane extends Vec3D implements Shape3D {
 
     /**
@@ -81,7 +79,7 @@ public class Plane extends Vec3D implements Shape3D {
     /**
      *
      */
-    @XmlElement(required = true)
+
     public Vec3D normal;
 
     /**

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

@@ -87,9 +87,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * @return
      */
     public PointCloud3D addAll(List<? extends Vec3D> plist) {
-        for (Vec3D p : plist) {
+        plist.forEach((p) -> {
             addPoint(p);
-        }
+        });
         return this;
     }
 
@@ -116,9 +116,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * @return itself
      */
     public PointCloud3D applyMatrix(Matrix4x4 m) {
-        for (Vec3D p : points) {
+        points.forEach((p) -> {
             p.set(m.applyTo(p));
-        }
+        });
         updateBounds();
         return this;
     }
@@ -145,9 +145,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
         getCentroid();
         Vec3D delta = origin != null ? origin.sub(centroid) : centroid
                 .getInverted();
-        for (Vec3D p : points) {
+        points.forEach((p) -> {
             p.addSelf(delta);
-        }
+        });
         min.addSelf(delta);
         max.addSelf(delta);
         centroid.addSelf(delta);
@@ -174,9 +174,9 @@ public class PointCloud3D implements Iterable<Vec3D> {
      */
     public PointCloud3D copy() {
         PointCloud3D c = new PointCloud3D(points.size());
-        for (ReadonlyVec3D p : points) {
+        points.forEach((p) -> {
             c.addPoint(p.copy());
-        }
+        });
         return c;
     }
 
@@ -208,6 +208,7 @@ public class PointCloud3D implements Iterable<Vec3D> {
      * 
      * @see java.lang.Iterable#iterator()
      */
+    @Override
     public Iterator<Vec3D> iterator() {
         return points.iterator();
     }
@@ -238,16 +239,18 @@ public class PointCloud3D implements Iterable<Vec3D> {
     public PointCloud3D updateBounds() {
         min = Vec3D.MAX_VALUE.copy();
         max = Vec3D.NEG_MAX_VALUE.copy();
-        for (Vec3D p : points) {
+        points.stream().map((p) -> {
             min.minSelf(p);
+            return p;
+        }).forEachOrdered((p) -> {
             max.maxSelf(p);
-        }
+        });
         centroid.set(min.add(max).scaleSelf(0.5f));
         radiusSquared = 0;
-        for (ReadonlyVec3D p : points) {
+        points.forEach((p) -> {
             radiusSquared = MathUtils.max(radiusSquared,
                     p.distanceToSquared(centroid));
-        }
+        });
         return this;
     }
 }

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

@@ -32,7 +32,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlElement;
+
 
 import toxi.geom.Line2D.LineIntersection;
 import toxi.geom.Line2D.LineIntersection.Type;
@@ -105,8 +105,8 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
     /**
      *
      */
-    @XmlElement(name = "v")
-    public List<Vec2D> vertices = new ArrayList<Vec2D>();
+  
+    public List<Vec2D> vertices = new ArrayList<>();
 
     /**
      *
@@ -119,9 +119,9 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @param points
      */
     public Polygon2D(List<Vec2D> points) {
-        for (Vec2D p : points) {
+        points.forEach((p) -> {
             add(p.copy());
-        }
+        });
     }
 
     /**
@@ -152,7 +152,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      *            vertex point to add
      * @return itself
      */
-    public Polygon2D add(Vec2D p) {
+    public final Polygon2D add(Vec2D p) {
         if (!vertices.contains(p)) {
             vertices.add(p);
         }
@@ -178,12 +178,13 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
     public Polygon2D center(ReadonlyVec2D origin) {
         Vec2D centroid = getCentroid();
         Vec2D delta = origin != null ? origin.sub(centroid) : centroid.invert();
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             v.addSelf(delta);
-        }
+        });
         return this;
     }
 
+    @Override
     public boolean containsPoint(ReadonlyVec2D p) {
         int num = vertices.size();
         int i, j = num - 1;
@@ -209,12 +210,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return
      */
     public boolean containsPolygon(Polygon2D poly) {
-        for (Vec2D p : poly.vertices) {
-            if (!containsPoint(p)) {
-                return false;
-            }
-        }
-        return true;
+        return poly.vertices.stream().noneMatch((p) -> (!containsPoint(p)));
     }
 
     /**
@@ -270,6 +266,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * 
      * @return polygon area
      */
+    @Override
     public float getArea() {
         float area = 0;
         for (int i = 0, num = vertices.size(); i < num; i++) {
@@ -282,6 +279,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
         return area;
     }
 
+    @Override
     public Circle getBoundingCircle() {
         return Circle.newBoundingCircle(vertices);
     }
@@ -292,6 +290,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return bounding rect
      * @see toxi.geom.Shape2D#getBounds()
      */
+    @Override
     public Rect getBounds() {
         return Rect.getBoundingRect(vertices);
     }
@@ -321,6 +320,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * 
      * @see toxi.geom.Shape2D#getCircumference()
      */
+    @Override
     public float getCircumference() {
         float circ = 0;
         for (int i = 0, num = vertices.size(); i < num; i++) {
@@ -371,9 +371,10 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * 
      * @return list of lines
      */
+    @Override
     public List<Line2D> getEdges() {
         int num = vertices.size();
-        List<Line2D> edges = new ArrayList<Line2D>(num);
+        List<Line2D> edges = new ArrayList<>(num);
         for (int i = 0; i < num; i++) {
             edges.add(new Line2D(vertices.get(i), vertices.get((i + 1) % num)));
         }
@@ -404,6 +405,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * 
      * @return Vec2D
      */
+    @Override
     public Vec2D getRandomPoint() {
         List<Line2D> edges = getEdges();
         int numEdges = edges.size();
@@ -459,13 +461,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return
      */
     protected boolean intersectsLine(Line2D l, List<Line2D> edges) {
-        for (Line2D e : edges) {
-            final Type isec = l.intersectLine(e).getType();
-            if (isec == Type.INTERSECTING || isec == Type.COINCIDENT) {
-                return true;
-            }
-        }
-        return false;
+        return edges.stream().map((e) -> l.intersectLine(e).getType()).anyMatch((isec) -> (isec == Type.INTERSECTING || isec == Type.COINCIDENT));
     }
 
     /**
@@ -477,12 +473,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      */
     public boolean intersectsPolygon(Polygon2D poly) {
         List<Line2D> edgesB = poly.getEdges();
-        for (Line2D ea : getEdges()) {
-            if (intersectsLine(ea, edgesB)) {
-                return true;
-            }
-        }
-        return false;
+        return getEdges().stream().anyMatch((ea) -> (intersectsLine(ea, edgesB)));
     }
 
     /**
@@ -492,12 +483,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      */
     public boolean intersectsRect(Rect r) {
         List<Line2D> edges = r.getEdges();
-        for (Line2D ea : getEdges()) {
-            if (intersectsLine(ea, edges)) {
-                return true;
-            }
-        }
-        return false;
+        return getEdges().stream().anyMatch((ea) -> (intersectsLine(ea, edges)));
     }
 
     /**
@@ -539,6 +525,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      *
      * @return
      */
+    @Override
     public Iterator<Vec2D> iterator() {
         return vertices.iterator();
     }
@@ -653,7 +640,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      */
     public Polygon2D reduceVertices(float minEdgeLen) {
         minEdgeLen *= minEdgeLen;
-        List<Vec2D> reduced = new ArrayList<Vec2D>();
+        List<Vec2D> reduced = new ArrayList<>();
         Vec2D prev = vertices.get(0);
         reduced.add(prev);
         int num = vertices.size() - 1;
@@ -705,9 +692,9 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return
      */
     public Polygon2D rotate(float theta) {
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             v.rotate(theta);
-        }
+        });
         return this;
     }
 
@@ -727,9 +714,9 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return
      */
     public Polygon2D scale(float x, float y) {
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             v.scaleSelf(x, y);
-        }
+        });
         return this;
     }
 
@@ -759,9 +746,9 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      */
     public Polygon2D scaleSize(float x, float y) {
         Vec2D centroid = getCentroid();
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             v.subSelf(centroid).scaleSelf(x, y).addSelf(centroid);
-        }
+        });
         return this;
     }
 
@@ -794,7 +781,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
     public Polygon2D smooth(float amount, float baseWeight) {
         Vec2D centroid = getCentroid();
         int num = vertices.size();
-        List<Vec2D> filtered = new ArrayList<Vec2D>(num);
+        List<Vec2D> filtered = new ArrayList<>(num);
         for (int i = 0, j = num - 1, k = 1; i < num; i++) {
             Vec2D a = vertices.get(i);
             Vec2D dir = vertices.get(j).sub(a).addSelf(vertices.get(k).sub(a))
@@ -863,7 +850,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
     public boolean toOutline() {
         int corners = vertices.size();
         int maxSegs = corners * 3;
-        List<Vec2D> newVerts = new ArrayList<Vec2D>(corners);
+        List<Vec2D> newVerts = new ArrayList<>(corners);
         Vec2D[] segments = new Vec2D[maxSegs];
         Vec2D[] segEnds = new Vec2D[maxSegs];
         float[] segAngles = new float[maxSegs];
@@ -995,6 +982,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * 
      * @return itself
      */
+    @Override
     public Polygon2D toPolygon2D() {
         return this;
     }
@@ -1003,6 +991,7 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      *
      * @return
      */
+    @Override
     public String toString() {
         StringBuilder buf = new StringBuilder();
         for (Iterator<Vec2D> i = vertices.iterator(); i.hasNext();) {
@@ -1021,9 +1010,9 @@ public class Polygon2D implements Shape2D, Iterable<Vec2D> {
      * @return
      */
     public Polygon2D translate(float x, float y) {
-        for (Vec2D v : vertices) {
+        vertices.forEach((v) -> {
             v.addSelf(x, y);
-        }
+        });
         return this;
     }
 

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

@@ -26,9 +26,7 @@
  */
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+
 
 import toxi.math.InterpolateStrategy;
 import toxi.math.MathUtils;
@@ -36,7 +34,7 @@ import toxi.math.MathUtils;
 /**
  * Quaternion implementation with SLERP based on http://is.gd/2n9s
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Quaternion {
 
     /**
@@ -173,7 +171,7 @@ public class Quaternion {
         return createFromAxisAngle(axis, angle);
     }
 
-    @XmlAttribute(required = true)
+
     public float x,
             /**
              *

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

@@ -27,20 +27,18 @@
 
 package toxi.geom;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
+
 
 /**
  * A simple 2D ray datatype
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Ray2D extends Vec2D {
 
     /**
      *
      */
-    @XmlElement(required = true)
+
     protected Vec2D dir;
 
     /**
@@ -140,6 +138,7 @@ public class Ray2D extends Vec2D {
      *
      * @return
      */
+    @Override
     public String toString() {
         return "origin: " + super.toString() + " dir: " + dir;
     }