jatria-soft/etk
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[DEV] add avg in vector 3f

Browse Source
This commit is contained in:
Edouard DUPIN 2022-04-24 08:03:38 +02:00
parent c55f439e13
commit cb8b89a636
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/atriasoft/etk/math/Vector3f.java
View File

@ -178,7 +178,7 @@ public record Vector3f(
@CheckReturnValue @CheckReturnValue
public Vector3f divide(final float val) { public Vector3f divide(final float val) {
if (val != 0.0f) { if (val != 0.0f) {
float tmp = 1.0f / val; final float tmp = 1.0f / val;
return new Vector3f(this.x * tmp, this.y * tmp, this.z * tmp); return new Vector3f(this.x * tmp, this.y * tmp, this.z * tmp);
} }
throw new IllegalArgumentException("divice by 0 (vector3f)"); throw new IllegalArgumentException("divice by 0 (vector3f)");
@ -316,7 +316,7 @@ public record Vector3f(
* @return the new reflect vector * @return the new reflect vector
*/ */
@CheckReturnValue @CheckReturnValue
public Vector3f reflect(Vector3f normal) { public Vector3f reflect(final Vector3f normal) {
return this.less(normal.multiply(this.dot(normal) * 2.0f)); return this.less(normal.multiply(this.dot(normal) * 2.0f));
} }
@ -539,6 +539,11 @@ public record Vector3f(
return new Vector3f(Math.min(obj1.x, obj2.x), Math.min(obj1.y, obj2.y), Math.min(obj1.z, obj2.z)); return new Vector3f(Math.min(obj1.x, obj2.x), Math.min(obj1.y, obj2.y), Math.min(obj1.z, obj2.z));
} }
@CheckReturnValue
public static Vector3f avg(final Vector3f min, final Vector3f obj2, final Vector3f max) {
return new Vector3f(FMath.avg(min.x, obj2.x, max.x), FMath.avg(min.y, obj2.y, max.y), FMath.avg(min.z, obj2.z, max.z));
}
/** /**
* Set each element to the min of the current values and the values of * Set each element to the min of the current values and the values of
* another Vector3f * another Vector3f
@ -603,9 +608,9 @@ public record Vector3f(
@CheckReturnValue @CheckReturnValue
public static Vector3f valueOf(final String valuesX, final String valuesY, final String valuesZ) { public static Vector3f valueOf(final String valuesX, final String valuesY, final String valuesZ) {
float val1 = Float.valueOf(valuesX); final float val1 = Float.valueOf(valuesX);
float val2 = Float.valueOf(valuesY); final float val2 = Float.valueOf(valuesY);
float val3 = Float.valueOf(valuesZ); final float val3 = Float.valueOf(valuesZ);
return new Vector3f(val1, val2, val3); return new Vector3f(val1, val2, val3);
} }