they're baaaaaack #257

benfry · benfry · commit a224a2f021ef · 2015-06-08T16:50:06.000-04:00
diff --git a/core/src/processing/core/PVector.java b/core/src/processing/core/PVector.java
@@ -3,8 +3,9 @@
 /*
   Part of the Processing project - http://processing.org
 
+  Copyright (c) 2012-15 The Processing Foundation
+  Copyright (c) 2008-12 Ben Fry and Casey Reas
   Copyright (c) 2008 Dan Shiffman
-  Copyright (c) 2008-10 Ben Fry and Casey Reas
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -68,12 +69,6 @@
  * @webref math
  */
 public class PVector implements Serializable {
-
-  /**
-   * Generated 2010-09-14 by jdf
-   */
-  private static final long serialVersionUID = -6717872085945400694L;
-
   /**
    * ( begin auto-generated from PVector_x.xml )
    *
@@ -165,45 +160,49 @@ public PVector(float x, float y) {
    * @param z the z component of the vector
    * @brief Set the components of the vector
    */
-  public void set(float x, float y, float z) {
+  public PVector set(float x, float y, float z) {
     this.x = x;
     this.y = y;
     this.z = z;
+    return this;
   }
 
 
   /**
    * @param x the x component of the vector
    * @param y the y component of the vector
    */
-  public void set(float x, float y) {
+  public PVector set(float x, float y) {
     this.x = x;
     this.y = y;
+    return this;
   }
 
 
   /**
    * @param v any variable of type PVector
    */
-  public void set(PVector v) {
+  public PVector set(PVector v) {
     x = v.x;
     y = v.y;
     z = v.z;
+    return this;
   }
 
 
   /**
    * Set the x, y (and maybe z) coordinates using a float[] array as the source.
    * @param source array to copy from
    */
-  public void set(float[] source) {
+  public PVector set(float[] source) {
     if (source.length >= 2) {
       x = source[0];
       y = source[1];
     }
     if (source.length >= 3) {
       z = source[2];
     }
+    return this;
   }
 
 
@@ -453,10 +452,11 @@ public float magSq() {
    * @param v the vector to be added
    * @brief Adds x, y, and z components to a vector, one vector to another, or two independent vectors
    */
-  public void add(PVector v) {
+  public PVector add(PVector v) {
     x += v.x;
     y += v.y;
     z += v.z;
+    return this;
   }
 
 
@@ -465,10 +465,11 @@ public void add(PVector v) {
    * @param y y component of the vector
    * @param z z component of the vector
    */
-  public void add(float x, float y, float z) {
+  public PVector add(float x, float y, float z) {
     this.x += x;
     this.y += y;
     this.z += z;
+    return this;
   }
 
 
@@ -512,10 +513,11 @@ static public PVector add(PVector v1, PVector v2, PVector target) {
    * @param v any variable of type PVector
    * @brief Subtract x, y, and z components from a vector, one vector from another, or two independent vectors
    */
-  public void sub(PVector v) {
+  public PVector sub(PVector v) {
     x -= v.x;
     y -= v.y;
     z -= v.z;
+    return this;
   }
 
 
@@ -524,10 +526,11 @@ public void sub(PVector v) {
    * @param y the y component of the vector
    * @param z the z component of the vector
    */
-  public void sub(float x, float y, float z) {
+  public PVector sub(float x, float y, float z) {
     this.x -= x;
     this.y -= y;
     this.z -= z;
+    return this;
   }
 
 
@@ -568,10 +571,11 @@ static public PVector sub(PVector v1, PVector v2, PVector target) {
    * @brief Multiply a vector by a scalar
    * @param n the number to multiply with the vector
    */
-  public void mult(float n) {
+  public PVector mult(float n) {
     x *= n;
     y *= n;
     z *= n;
+    return this;
   }
 
 
@@ -609,10 +613,11 @@ static public PVector mult(PVector v, float n, PVector target) {
    * @brief Divide a vector by a scalar
    * @param n the number by which to divide the vector
    */
-  public void div(float n) {
+  public PVector div(float n) {
     x /= n;
     y /= n;
     z /= n;
+    return this;
   }
 
 
@@ -776,11 +781,12 @@ static public PVector cross(PVector v1, PVector v2, PVector target) {
    * @usage web_application
    * @brief Normalize the vector to a length of 1
    */
-  public void normalize() {
+  public PVector normalize() {
     float m = mag();
     if (m != 0 && m != 1) {
       div(m);
     }
+    return this;
   }
 
 
@@ -814,11 +820,12 @@ public PVector normalize(PVector target) {
    * @param max the maximum magnitude for the vector
    * @brief Limit the magnitude of the vector
    */
-  public void limit(float max) {
+  public PVector limit(float max) {
     if (magSq() > max*max) {
       normalize();
       mult(max);
     }
+    return this;
   }
 
 
@@ -834,9 +841,10 @@ public void limit(float max) {
    * @param len the new length for this vector
    * @brief Set the magnitude of the vector
    */
-  public void setMag(float len) {
+  public PVector setMag(float len) {
     normalize();
     mult(len);
+    return this;
   }
 
 
@@ -889,11 +897,12 @@ public float heading2D() {
    * @brief Rotate the vector by an angle (2D only)
    * @param theta the angle of rotation
    */
-  public void rotate(float theta) {
+  public PVector rotate(float theta) {
     float temp = x;
     // Might need to check for rounding errors like with angleBetween function?
     x = x*PApplet.cos(theta) - y*PApplet.sin(theta);
     y = temp*PApplet.sin(theta) + y*PApplet.cos(theta);
+    return this;
   }
 
 
@@ -911,10 +920,11 @@ public void rotate(float theta) {
    * @param amt  The amount of interpolation; some value between 0.0 (old vector) and 1.0 (new vector). 0.1 is very near the new vector. 0.5 is halfway in between.
    * @see PApplet#lerp(float, float, float)
    */
-  public void lerp(PVector v, float amt) {
+  public PVector lerp(PVector v, float amt) {
     x = PApplet.lerp(x, v.x, amt);
     y = PApplet.lerp(y, v.y, amt);
     z = PApplet.lerp(z, v.z, amt);
+    return this;
   }
 
 
@@ -936,10 +946,11 @@ public static PVector lerp(PVector v1, PVector v2, float amt) {
    * @param y the y component to lerp to
    * @param z the z component to lerp to
    */
-  public void lerp(float x, float y, float z, float amt) {
+  public PVector lerp(float x, float y, float z, float amt) {
     this.x = PApplet.lerp(this.x, x, amt);
     this.y = PApplet.lerp(this.y, y, amt);
     this.z = PApplet.lerp(this.z, z, amt);
+    return this;
   }
 
 
