sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified maxLocal and minLocal to return 'this' to

Browse Source 
match other methods.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10532 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2013-04-12 17:46:09 +00:00
parent ffd8c72c66
commit e7aa7eb627
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engine/src/core/com/jme3/math/Vector3f.java
View File

@ -806,10 +806,11 @@ public final class Vector3f implements Savable, Cloneable, java.io.Serializable
* in this vector. * in this vector.
* @param other * @param other
*/ */
public void maxLocal(Vector3f other){ public Vector3f maxLocal(Vector3f other){
x = other.x > x ? other.x : x; x = other.x > x ? other.x : x;
y = other.y > y ? other.y : y; y = other.y > y ? other.y : y;
z = other.z > z ? other.z : z; 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. * in this vector.
* @param other * @param other
*/ */
public void minLocal(Vector3f other){ public Vector3f minLocal(Vector3f other){
x = other.x < x ? other.x : x; x = other.x < x ? other.x : x;
y = other.y < y ? other.y : y; y = other.y < y ? other.y : y;
z = other.z < z ? other.z : z; z = other.z < z ? other.z : z;
return this;
} }
/** /**

6
engine/src/core/com/jme3/math/Vector4f.java
View File

@ -733,11 +733,12 @@ public final class Vector4f implements Savable, Cloneable, java.io.Serializable
* in this vector. * in this vector.
* @param other * @param other
*/ */
public void maxLocal(Vector4f other){ public Vector4f maxLocal(Vector4f other){
x = other.x > x ? other.x : x; x = other.x > x ? other.x : x;
y = other.y > y ? other.y : y; y = other.y > y ? other.y : y;
z = other.z > z ? other.z : z; z = other.z > z ? other.z : z;
w = other.w > w ? other.w : w; 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. * in this vector.
* @param other * @param other
*/ */
public void minLocal(Vector4f other){ public Vector4f minLocal(Vector4f other){
x = other.x < x ? other.x : x; x = other.x < x ? other.x : x;
y = other.y < y ? other.y : y; y = other.y < y ? other.y : y;
z = other.z < z ? other.z : z; z = other.z < z ? other.z : z;
w = other.w < w ? other.w : w; w = other.w < w ? other.w : w;
return this;
} }
/** /**