OSDN Git Service

Modified maxLocal and minLocal to return 'this' to
authorPSpeed42@gmail.com <PSpeed42@gmail.com@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Fri, 12 Apr 2013 17:46:09 +0000 (17:46 +0000)
committerPSpeed42@gmail.com <PSpeed42@gmail.com@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Fri, 12 Apr 2013 17:46:09 +0000 (17:46 +0000)
match other methods.

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@10532 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/core/com/jme3/math/Vector3f.java
engine/src/core/com/jme3/math/Vector4f.java

index c3a2260..b82ec20 100644 (file)
@@ -806,10 +806,11 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * in this vector.\r
      * @param other \r
      */\r
-    public void maxLocal(Vector3f other){\r
+    public Vector3f maxLocal(Vector3f other){\r
         x = other.x > x ? other.x : x;\r
         y = other.y > y ? other.y : y;\r
         z = other.z > z ? other.z : z;\r
+        return this;\r
     }\r
 \r
     /**\r
@@ -818,10 +819,11 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
      * in this vector.\r
      * @param other\r
      */\r
-    public void minLocal(Vector3f other){\r
+    public Vector3f minLocal(Vector3f other){\r
         x = other.x < x ? other.x : x;\r
         y = other.y < y ? other.y : y;\r
         z = other.z < z ? other.z : z;\r
+        return this;\r
     }\r
 \r
     /**\r
index a9eb965..dfd42f1 100644 (file)
@@ -733,11 +733,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
      * in this vector.
      * @param other
      */
-    public void maxLocal(Vector4f other){
+    public Vector4f maxLocal(Vector4f other){
         x = other.x > x ? other.x : x;
         y = other.y > y ? other.y : y;
         z = other.z > z ? other.z : z;
         w = other.w > w ? other.w : w;
+        return this;
     }
 
     /**
@@ -746,11 +747,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
      * in this vector.
      * @param other
      */
-    public void minLocal(Vector4f other){
+    public Vector4f minLocal(Vector4f other){
         x = other.x < x ? other.x : x;
         y = other.y < y ? other.y : y;
         z = other.z < z ? other.z : z;
         w = other.w < w ? other.w : w;
+        return this;
     }
 
     /**