toxiclibs 1.0.0 → 2.0.0

data/src/{toxi → main/java/toxi}/geom/Ray3D.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 3D ray datatype
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Ray3D extends Vec3D {
 
     /**
      *
      */
-    @XmlElement(required = true)
+ 
     protected Vec3D dir;
 
     /**

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

@@ -30,16 +30,14 @@ package toxi.geom;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
+
 import toxi.math.MathUtils;
 
 /**
  *
  * @author tux
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Rect implements Shape2D {
 
     /**
@@ -71,7 +69,7 @@ public class Rect implements Shape2D {
         return bounds;
     }
 
-    @XmlAttribute(required = true)
+ 
     public float x,
 
     /**

data/src/{toxi → main/java/toxi}/geom/Sphere.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.XmlAttribute;
+
 
 import toxi.geom.mesh.Mesh3D;
 import toxi.geom.mesh.SphereFunction;
@@ -39,7 +37,7 @@ import toxi.geom.mesh.SurfaceMeshBuilder;
  *
  * @author tux
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Sphere extends Vec3D implements Shape3D {
 
     /**
@@ -51,7 +49,7 @@ public class Sphere extends Vec3D implements Shape3D {
     /**
      *
      */
-    @XmlAttribute(required = true)
+
     public float radius;
 
     /**

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

@@ -31,11 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+
 
 /**
  * <p>
@@ -62,7 +58,7 @@ import javax.xml.bind.annotation.XmlTransient;
  * @version 0015 Added JAXB annotations and List support for dynamic building of
  *          spline
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Spline2D {
 
     /**
@@ -78,49 +74,49 @@ public class Spline2D {
     /**
      *
      */
-    @XmlTransient
+  
     protected Vec2D[] points;
 
     /**
      *
      */
-    @XmlElement(name = "p")
+    
     public List<Vec2D> pointList = new ArrayList<>();
 
     /**
      *
      */
-    @XmlTransient
+  
     public BernsteinPolynomial bernstein;
 
     /**
      *
      */
-    @XmlTransient
+  
     public Vec2D[] delta;
 
     /**
      *
      */
-    @XmlTransient
+  
     public Vec2D[] coeffA;
 
     /**
      *
      */
-    @XmlTransient
+  
     public float[] bi;
 
     /**
      *
      */
-    @XmlAttribute
+
     protected float tightness;
 
     /**
      *
      */
-    @XmlTransient
+  
     protected float invTightness;
 
     /**
@@ -254,9 +250,9 @@ public class Spline2D {
      */
     public Spline2D setPointList(List<Vec2D> plist) {
         pointList.clear();
-        for (ReadonlyVec2D p : plist) {
+        plist.forEach((p) -> {
             pointList.add(p.copy());
-        }
+        });
         return this;
     }
 

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

@@ -31,11 +31,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
+
 
 /**
  * <p>
@@ -62,7 +58,7 @@ import javax.xml.bind.annotation.XmlTransient;
  * @version 0015 Added JAXB annotations and List support for dynamic building of
  *          spline
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Spline3D {
 
     /**
@@ -73,49 +69,49 @@ public class Spline3D {
     /**
      *
      */
-    @XmlTransient
+
     protected Vec3D[] points;
 
     /**
      *
      */
-    @XmlElement(name = "p")
+
     public List<Vec3D> pointList = new ArrayList<>();
 
     /**
      *
      */
-    @XmlTransient
+
     public BernsteinPolynomial bernstein;
 
     /**
      *
      */
-    @XmlTransient
+
     public Vec3D[] delta;
 
     /**
      *
      */
-    @XmlTransient
+
     public Vec3D[] coeffA;
 
     /**
      *
      */
-    @XmlTransient
+
     public float[] bi;
 
     /**
      *
      */
-    @XmlAttribute
+
     protected float tightness;
 
     /**
      *
      */
-    @XmlTransient
+
     protected float invTightness;
 
     /**
@@ -254,9 +250,9 @@ public class Spline3D {
      */
     public Spline3D setPointList(List<Vec3D> plist) {
         pointList.clear();
-        for (ReadonlyVec3D p : plist) {
+        plist.forEach((p) -> {
             pointList.add(p.copy());
-        }
+        });
         return this;
     }
 

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

@@ -31,10 +31,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-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.geom.Line2D.LineIntersection.Type;
 import toxi.math.MathUtils;
@@ -43,7 +40,7 @@ import toxi.math.MathUtils;
  *
  * @author tux
  */
-@XmlAccessorType(XmlAccessType.FIELD)
+
 public class Triangle2D implements Shape2D {
 
     /**
@@ -73,7 +70,7 @@ public class Triangle2D implements Shape2D {
         return (determ > 0.0);
     }
 
-    @XmlElement(required = true)
+
     public Vec2D a,
 
     /**
@@ -97,7 +94,7 @@ public class Triangle2D implements Shape2D {
     /**
      *
      */
-    @XmlTransient
+
     public Vec2D centroid;
 
     /**

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