From e7aa7eb627ef24add7a74efced6dccb70ed736da Mon Sep 17 00:00:00 2001 From: "PSp..om" Date: Fri, 12 Apr 2013 17:46:09 +0000 Subject: [PATCH] Modified maxLocal and minLocal to return 'this' to match other methods. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10532 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/math/Vector3f.java | 6 ++++-- engine/src/core/com/jme3/math/Vector4f.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/engine/src/core/com/jme3/math/Vector3f.java b/engine/src/core/com/jme3/math/Vector3f.java index c3a22602b..b82ec2023 100644 --- a/engine/src/core/com/jme3/math/Vector3f.java +++ b/engine/src/core/com/jme3/math/Vector3f.java @@ -806,10 +806,11 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable * in this vector. * @param other */ - public void maxLocal(Vector3f other){ + public Vector3f maxLocal(Vector3f other){ x = other.x > x ? other.x : x; y = other.y > y ? other.y : y; z = other.z > z ? other.z : z; + return this; } /** @@ -818,10 +819,11 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable * in this vector. * @param other */ - public void minLocal(Vector3f other){ + public Vector3f minLocal(Vector3f other){ x = other.x < x ? other.x : x; y = other.y < y ? other.y : y; z = other.z < z ? other.z : z; + return this; } /** diff --git a/engine/src/core/com/jme3/math/Vector4f.java b/engine/src/core/com/jme3/math/Vector4f.java index a9eb9653f..dfd42f1b0 100644 --- a/engine/src/core/com/jme3/math/Vector4f.java +++ b/engine/src/core/com/jme3/math/Vector4f.java @@ -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; } /**