pbox2d 0.9.1-java → 1.0.0-java

data/src/org/jbox2d/common/MathUtils.java

@@ -69,11 +69,11 @@ public class MathUtils extends PlatformMathUtils {
    */
   public static final float RAD2DEG = 180 / PI;
 
-  public static final float[] sinLUT = new float[Settings.SINCOS_LUT_LENGTH];
+  public static final float[] SIN_LUT = new float[Settings.SINCOS_LUT_LENGTH];
 
   static {
     for (int i = 0; i < Settings.SINCOS_LUT_LENGTH; i++) {
-      sinLUT[i] = (float) Math.sin(i * Settings.SINCOS_LUT_PRECISION);
+      SIN_LUT[i] = (float) Math.sin(i * Settings.SINCOS_LUT_PRECISION);
     }
   }
 
@@ -104,13 +104,13 @@ public class MathUtils extends PlatformMathUtils {
 
       // the next index is 0
       if (index == Settings.SINCOS_LUT_LENGTH - 1) {
-        return ((1 - x) * sinLUT[index] + x * sinLUT[0]);
+        return ((1 - x) * SIN_LUT[index] + x * SIN_LUT[0]);
       } else {
-        return ((1 - x) * sinLUT[index] + x * sinLUT[index + 1]);
+        return ((1 - x) * SIN_LUT[index] + x * SIN_LUT[index + 1]);
       }
 
     } else {
-      return sinLUT[MathUtils.round(x / Settings.SINCOS_LUT_PRECISION) % Settings.SINCOS_LUT_LENGTH];
+      return SIN_LUT[MathUtils.round(x / Settings.SINCOS_LUT_PRECISION) % Settings.SINCOS_LUT_LENGTH];
     }
   }
 

data/src/org/jbox2d/common/Rot.java

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2013, Daniel Murphy
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
  * 	* Redistributions of source code must retain the above copyright notice,
@@ -9,7 +9,7 @@
  * 	* Redistributions in binary form must reproduce the above copyright notice,
  * 	  this list of conditions and the following disclaimer in the documentation
  * 	  and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -27,7 +27,7 @@ import java.io.Serializable;
 
 /**
  * Represents a rotation
- * 
+ *
  * @author Daniel
  */
 public class Rot implements Serializable {
@@ -35,13 +35,18 @@ public class Rot implements Serializable {
 
   public float s, c; // sin and cos
 
-  public Rot() {
-    setIdentity();
-  }
+    public Rot() {
+        setIdentity();
+    }
 
-  public Rot(float angle) {
-    set(angle);
-  }
+    public Rot(float angle) {
+        set(angle);
+    }
+
+    public Rot(Rot rot) {
+        c = rot.c;
+        s = rot.s;
+    }
 
   public float getSin() {
     return s;
@@ -56,7 +61,7 @@ public class Rot implements Serializable {
     return c;
   }
 
-  public Rot set(float angle) {
+  public final Rot set(float angle) {
     s = MathUtils.sin(angle);
     c = MathUtils.cos(angle);
     return this;
@@ -68,7 +73,7 @@ public class Rot implements Serializable {
     return this;
   }
 
-  public Rot setIdentity() {
+  public final Rot setIdentity() {
     s = 0;
     c = 1;
     return this;
@@ -86,14 +91,6 @@ public class Rot implements Serializable {
     yAxis.set(-s, c);
   }
 
-  // @Override // annotation omitted for GWT-compatibility
-  public Rot clone() {
-    Rot copy = new Rot();
-    copy.s = s;
-    copy.c = c;
-    return copy;
-  }
-
   public static final void mul(Rot q, Rot r, Rot out) {
     float tempc = q.c * r.c - q.s * r.s;
     out.s = q.s * r.c + q.c * r.s;

data/src/org/jbox2d/common/Transform.java

@@ -60,8 +60,8 @@ public class Transform implements Serializable {
      * @param xf
      */
     public Transform(final Transform xf) {
-        p = xf.p.clone();
-        q = xf.q.clone();
+        p = new Vec2(xf.p);
+        q = new Rot(xf.q);
     }
 
     /**
@@ -71,8 +71,8 @@ public class Transform implements Serializable {
      * @param _R
      */
     public Transform(final Vec2 _position, final Rot _R) {
-        p = _position.clone();
-        q = _R.clone();
+        p = new Vec2(_position);
+        q = new Rot(_R);
     }
 
     /**

data/src/org/jbox2d/common/Vec2.java

@@ -32,7 +32,9 @@ import java.io.Serializable;
  */
 public class Vec2 implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -8868057637176265779L;
+
+    
 
     public float x, y;
 
@@ -262,17 +264,6 @@ public class Vec2 implements Serializable {
         y = MathUtils.abs(y);
     }
 
-    // @Override // annotation omitted for GWT-compatibility
-    /**
-     * Return a copy of this vector.
-     *
-     * @return
-     */
-    @Override
-    public final Vec2 clone() {
-        return new Vec2(x, y);
-    }
-
     @Override
     public final String toString() {
         return "(" + x + "," + y + ")";
@@ -354,6 +345,7 @@ public class Vec2 implements Serializable {
     }
 
     /**
+     * @return
      * @see java.lang.Object#hashCode()
      */
     @Override
@@ -366,6 +358,8 @@ public class Vec2 implements Serializable {
     }
 
     /**
+     * @param obj
+     * @return
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override

data/src/org/jbox2d/common/Vec3.java

@@ -1,7 +1,7 @@
-/*******************************************************************************
+/** *****************************************************************************
  * Copyright (c) 2013, Daniel Murphy
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
  * 	* Redistributions of source code must retain the above copyright notice,
@@ -9,7 +9,7 @@
  * 	* Redistributions in binary form must reproduce the above copyright notice,
  * 	  this list of conditions and the following disclaimer in the documentation
  * 	  and/or other materials provided with the distribution.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -20,7 +20,7 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
- ******************************************************************************/
+ ***************************************************************************** */
 package org.jbox2d.common;
 
 import java.io.Serializable;
@@ -29,142 +29,147 @@ import java.io.Serializable;
  * @author Daniel Murphy
  */
 public class Vec3 implements Serializable {
-  private static final long serialVersionUID = 1L;
-
-  public float x, y, z;
-
-  public Vec3() {
-    x = y = z = 0f;
-  }
-
-  public Vec3(float argX, float argY, float argZ) {
-    x = argX;
-    y = argY;
-    z = argZ;
-  }
-
-  public Vec3(Vec3 copy) {
-    x = copy.x;
-    y = copy.y;
-    z = copy.z;
-  }
-
-  public Vec3 set(Vec3 vec) {
-    x = vec.x;
-    y = vec.y;
-    z = vec.z;
-    return this;
-  }
-
-  public Vec3 set(float argX, float argY, float argZ) {
-    x = argX;
-    y = argY;
-    z = argZ;
-    return this;
-  }
-
-  public Vec3 addLocal(Vec3 argVec) {
-    x += argVec.x;
-    y += argVec.y;
-    z += argVec.z;
-    return this;
-  }
-
-  public Vec3 add(Vec3 argVec) {
-    return new Vec3(x + argVec.x, y + argVec.y, z + argVec.z);
-  }
-
-  public Vec3 subLocal(Vec3 argVec) {
-    x -= argVec.x;
-    y -= argVec.y;
-    z -= argVec.z;
-    return this;
-  }
-
-  public Vec3 sub(Vec3 argVec) {
-    return new Vec3(x - argVec.x, y - argVec.y, z - argVec.z);
-  }
-
-  public Vec3 mulLocal(float argScalar) {
-    x *= argScalar;
-    y *= argScalar;
-    z *= argScalar;
-    return this;
-  }
-
-  public Vec3 mul(float argScalar) {
-    return new Vec3(x * argScalar, y * argScalar, z * argScalar);
-  }
-
-  public Vec3 negate() {
-    return new Vec3(-x, -y, -z);
-  }
-
-  public Vec3 negateLocal() {
-    x = -x;
-    y = -y;
-    z = -z;
-    return this;
-  }
-
-  public void setZero() {
-    x = 0;
-    y = 0;
-    z = 0;
-  }
-
-  @Override
-  public Vec3 clone() {
-    return new Vec3(this);
-  }
-
-  @Override
-  public String toString() {
-    return "(" + x + "," + y + "," + z + ")";
-  }
-
-  @Override
-  public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + Float.floatToIntBits(x);
-    result = prime * result + Float.floatToIntBits(y);
-    result = prime * result + Float.floatToIntBits(z);
-    return result;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) return true;
-    if (obj == null) return false;
-    if (getClass() != obj.getClass()) return false;
-    Vec3 other = (Vec3) obj;
-    if (Float.floatToIntBits(x) != Float.floatToIntBits(other.x)) return false;
-    if (Float.floatToIntBits(y) != Float.floatToIntBits(other.y)) return false;
-    return (Float.floatToIntBits(z) == Float.floatToIntBits(other.z));
-  }
-
-  public final static float dot(Vec3 a, Vec3 b) {
-    return a.x * b.x + a.y * b.y + a.z * b.z;
-  }
-
-  public final static Vec3 cross(Vec3 a, Vec3 b) {
-    return new Vec3(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x);
-  }
-
-  public final static void crossToOut(Vec3 a, Vec3 b, Vec3 out) {
-    final float tempy = a.z * b.x - a.x * b.z;
-    final float tempz = a.x * b.y - a.y * b.x;
-    out.x = a.y * b.z - a.z * b.y;
-    out.y = tempy;
-    out.z = tempz;
-  }
-  
-  public final static void crossToOutUnsafe(Vec3 a, Vec3 b, Vec3 out) {
-    assert(out != b);
-    assert(out != a);
-    out.x = a.y * b.z - a.z * b.y;
-    out.y = a.z * b.x - a.x * b.z;
-    out.z = a.x * b.y - a.y * b.x;
-  }
+
+    private static final long serialVersionUID = 102913558223451982L;
+    public float x, y, z;
+
+    public Vec3() {
+        x = y = z = 0f;
+    }
+
+    public Vec3(float argX, float argY, float argZ) {
+        x = argX;
+        y = argY;
+        z = argZ;
+    }
+
+    public Vec3(Vec3 copy) {
+        x = copy.x;
+        y = copy.y;
+        z = copy.z;
+    }
+
+    public Vec3 set(Vec3 vec) {
+        x = vec.x;
+        y = vec.y;
+        z = vec.z;
+        return this;
+    }
+
+    public Vec3 set(float argX, float argY, float argZ) {
+        x = argX;
+        y = argY;
+        z = argZ;
+        return this;
+    }
+
+    public Vec3 addLocal(Vec3 argVec) {
+        x += argVec.x;
+        y += argVec.y;
+        z += argVec.z;
+        return this;
+    }
+
+    public Vec3 add(Vec3 argVec) {
+        return new Vec3(x + argVec.x, y + argVec.y, z + argVec.z);
+    }
+
+    public Vec3 subLocal(Vec3 argVec) {
+        x -= argVec.x;
+        y -= argVec.y;
+        z -= argVec.z;
+        return this;
+    }
+
+    public Vec3 sub(Vec3 argVec) {
+        return new Vec3(x - argVec.x, y - argVec.y, z - argVec.z);
+    }
+
+    public Vec3 mulLocal(float argScalar) {
+        x *= argScalar;
+        y *= argScalar;
+        z *= argScalar;
+        return this;
+    }
+
+    public Vec3 mul(float argScalar) {
+        return new Vec3(x * argScalar, y * argScalar, z * argScalar);
+    }
+
+    public Vec3 negate() {
+        return new Vec3(-x, -y, -z);
+    }
+
+    public Vec3 negateLocal() {
+        x = -x;
+        y = -y;
+        z = -z;
+        return this;
+    }
+
+    public void setZero() {
+        x = 0;
+        y = 0;
+        z = 0;
+    }
+
+    @Override
+    public String toString() {
+        return "(" + x + "," + y + "," + z + ")";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Float.floatToIntBits(x);
+        result = prime * result + Float.floatToIntBits(y);
+        result = prime * result + Float.floatToIntBits(z);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Vec3 other = (Vec3) obj;
+        if (Float.floatToIntBits(x) != Float.floatToIntBits(other.x)) {
+            return false;
+        }
+        if (Float.floatToIntBits(y) != Float.floatToIntBits(other.y)) {
+            return false;
+        }
+        return (Float.floatToIntBits(z) == Float.floatToIntBits(other.z));
+    }
+
+    public final static float dot(Vec3 a, Vec3 b) {
+        return a.x * b.x + a.y * b.y + a.z * b.z;
+    }
+
+    public final static Vec3 cross(Vec3 a, Vec3 b) {
+        return new Vec3(a.y * b.z - a.z * b.y, a.z * b.x - a.x * b.z, a.x * b.y - a.y * b.x);
+    }
+
+    public final static void crossToOut(Vec3 a, Vec3 b, Vec3 out) {
+        final float tempy = a.z * b.x - a.x * b.z;
+        final float tempz = a.x * b.y - a.y * b.x;
+        out.x = a.y * b.z - a.z * b.y;
+        out.y = tempy;
+        out.z = tempz;
+    }
+
+    public final static void crossToOutUnsafe(Vec3 a, Vec3 b, Vec3 out) {
+        assert (out != b);
+        assert (out != a);
+        out.x = a.y * b.z - a.z * b.y;
+        out.y = a.z * b.x - a.x * b.z;
+        out.z = a.x * b.y - a.y * b.x;
+    }
 }