Merge branch 'master' of https://github.com/ruby-processing/jbox2d

Author: monkstone

lib/pbox2d/version.rb

@@ -1,4 +1,4 @@
 # module to give version a namespace
 module Pbox2d
-  VERSION = '0.9.2'
+  VERSION = '1.0.0'
 end

pom.rb

@@ -2,7 +2,7 @@
 project 'pbox2d', 'https://github.com/ruby-processing/jbox2d' do
 
   model_version '4.0.0'
-  id 'ruby-processing:pbox2d', '0.9.22'
+  id 'ruby-processing:pbox2d', '1.0.0'
   packaging 'jar'
 
   description 'jbox2d for JRubyArt'
@@ -12,7 +12,7 @@
   developer 'monkstone' do
     name 'Martin Prout'
     email 'mamba2928@yahoo.co.uk'
-    roles 'developer' 
+    roles 'developer'
   end
 
   license 'BSD-2-clause', 'http://www.opensource.org/licenses/bsd-license.php'
@@ -24,7 +24,7 @@
     :connection => 'scm:git:git://github.com/ruby-processing/jbox2d.git',
     :developer_connection => 'scm:git:git@github.com/ruby-processing/jbox2dt.git'
   )
-  
+
   properties( 'maven.compiler.source' => '1.8',
               'project.build.sourceEncoding' => 'UTF-8',
               'maven.compiler.target' => '1.8',
@@ -33,12 +33,14 @@
               'jruby.api' => "http://jruby.org/apidocs/"
             )
 
-  pom 'org.jruby:jruby:9.1.5.0'
-  jar 'org.processing:core:3.2.1'
+
+  pom 'org.jruby:jruby:9.1.6.0'
+  jar 'org.processing:core:3.2.3'
+
   plugin_management do
     plugin :resources, '2.6'
     plugin :dependency, '2.8'
-    plugin( 
+    plugin(
           :compiler, '3.5.1',
           source: '${maven.compiler.source}',
           target: '${maven.compiler.target}'

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>pbox2d</artifactId>
-  <version>0.9.22</version>
+  <version>1.0.0</version>
   <name>pbox2d</name>
   <description>jbox2d for JRubyArt</description>
   <url>https://github.com/ruby-processing/jbox2d</url>
@@ -56,13 +56,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.1.5.0</version>
+      <version>9.1.6.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.3</version>
     </dependency>
   </dependencies>
   <build>

src/org/jbox2d/collision/AABB.java

@@ -69,8 +69,8 @@ public AABB(final AABB copy) {
      * @param upperVertex
      */
     public AABB(final Vec2 lowerVertex, final Vec2 upperVertex) {
-        this.lowerBound = lowerVertex.clone(); // clone to be safe
-        this.upperBound = upperVertex.clone();
+        this.lowerBound = new Vec2(lowerVertex); // clone to be safe
+        this.upperBound = new Vec2(upperVertex);
     }
 
     /**

src/org/jbox2d/collision/Manifold.java

@@ -88,8 +88,8 @@ public Manifold() {
    */
   public Manifold(Manifold other) {
     points = new ManifoldPoint[Settings.maxManifoldPoints];
-    localNormal = other.localNormal.clone();
-    localPoint = other.localPoint.clone();
+    localNormal = new Vec2(other.localNormal);
+    localPoint = new Vec2(other.localPoint);
     pointCount = other.pointCount;
     type = other.type;
     // djm: this is correct now

src/org/jbox2d/collision/ManifoldPoint.java

@@ -57,7 +57,7 @@
  * <ul><li>e_circles: the local center of circleB</li>
  * <li>e_faceA: the local center of cirlceB or the clip point of polygonB</li>
  * <li>e_faceB: the clip point of polygonA</li></ul>
- * This structure is stored across time steps, so we keep it small.<br/>
+ * This structure is stored across time steps, so we keep it small.
  * Note: the impulses are used for internal caching and may not
  * provide reliable contact forces, especially for high speed collisions.
  */
@@ -85,7 +85,7 @@ public ManifoldPoint() {
 	 * @param cp point to copy from
 	 */
 	public ManifoldPoint(final ManifoldPoint cp) {
-		localPoint = cp.localPoint.clone();
+		localPoint = new Vec2(cp.localPoint);
 		normalImpulse = cp.normalImpulse;
 		tangentImpulse = cp.tangentImpulse;
 		id = new ContactID(cp.id);

src/org/jbox2d/collision/shapes/MassData.java

@@ -84,7 +84,7 @@ public MassData() {
     public MassData(MassData md) {
         mass = md.mass;
         I = md.I;
-        center = md.center.clone();
+        center = new Vec2(md.center);
     }
 
     public void set(MassData md) {

src/org/jbox2d/common/Mat22.java

@@ -32,12 +32,15 @@
  */
 public class Mat22 implements Serializable {
 
-    private static final long serialVersionUID = 2L;
+    private static final long serialVersionUID = -3851554186221722070L;
+
+    
 
     public final Vec2 ex, ey;
 
     /**
      * Convert the matrix to printable format.
+     * @return
      */
     @Override
     public String toString() {
@@ -63,8 +66,8 @@ public Mat22() {
      * @param c2 Column 2 of matrix
      */
     public Mat22(final Vec2 c1, final Vec2 c2) {
-        ex = c1.clone();
-        ey = c2.clone();
+        ex = new Vec2(c1);
+        ey = new Vec2(c2);
     }
 
     /**
@@ -102,16 +105,6 @@ public final Mat22 set(final float exx, final float col2x, final float exy, fina
         return this;
     }
 
-    /**
-     * Return a clone of this matrix. djm fixed double allocation
-     *
-     * @return
-     */
-    // @Override // annotation omitted for GWT-compatibility
-    @Override
-    public final Mat22 clone() {
-        return new Mat22(ex, ey);
-    }
 
     /**
      * Set as a matrix representing a rotation.