aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/graphui/classes/com/jogamp/graph/ui/Shape.java8
-rw-r--r--src/graphui/classes/com/jogamp/graph/ui/layout/BoxLayout.java4
-rw-r--r--src/graphui/classes/com/jogamp/graph/ui/layout/GridLayout.java4
-rw-r--r--src/jogl/classes/com/jogamp/math/Matrix4f.java20
-rw-r--r--src/jogl/classes/com/jogamp/math/Vec2f.java30
-rw-r--r--src/jogl/classes/com/jogamp/math/Vec3d.java34
-rw-r--r--src/jogl/classes/com/jogamp/math/Vec3f.java34
-rw-r--r--src/jogl/classes/com/jogamp/math/Vec4f.java38
-rw-r--r--src/jogl/classes/com/jogamp/math/geom/AABBox.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/math/Matrix4fb.java16
10 files changed, 130 insertions, 66 deletions
diff --git a/src/graphui/classes/com/jogamp/graph/ui/Shape.java b/src/graphui/classes/com/jogamp/graph/ui/Shape.java
index 3f399d1ae..05d562363 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/Shape.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/Shape.java
@@ -330,7 +330,7 @@ public abstract class Shape {
public final Shape setVisible(final boolean v) { return setIO(IO_VISIBLE, v); }
/**
- * Sets the padding for this shape, which is included in {@link #getBounds()B} and also includes the border. Default is zero.
+ * Sets the padding for this shape, which is included in {@link #getBounds()} and also includes the border. Default is zero.
*
* Method issues {@link #markShapeDirty()}.
*
@@ -610,7 +610,7 @@ public abstract class Shape {
* @see #getScale()
*/
public final Shape scale(final Vec3f s) {
- scale.scale(s);
+ scale.mul(s);
updateMat();
return this;
}
@@ -620,7 +620,7 @@ public abstract class Shape {
* @see #getScale()
*/
public final Shape scale(final float sx, final float sy, final float sz) {
- scale.scale(sx, sy, sz);
+ scale.mul(sx, sy, sz);
updateMat();
return this;
}
@@ -1891,7 +1891,7 @@ public abstract class Shape {
}
shapeEvent.objDrag.set( objPos.x() - objDraggedFirst.x(),
objPos.y() - objDraggedFirst.y() );
- shapeEvent.objDrag.scale(x_flip ? -1f : 1f, y_flip ? -1f : 1f);
+ shapeEvent.objDrag.mul(x_flip ? -1f : 1f, y_flip ? -1f : 1f);
shapeEvent.winDrag[0] = glWinX - winDraggedLast[0];
shapeEvent.winDrag[1] = glWinY - winDraggedLast[1];
diff --git a/src/graphui/classes/com/jogamp/graph/ui/layout/BoxLayout.java b/src/graphui/classes/com/jogamp/graph/ui/layout/BoxLayout.java
index bd939f37e..4c654f535 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/layout/BoxLayout.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/layout/BoxLayout.java
@@ -258,9 +258,9 @@ public class BoxLayout implements Group.Layout {
} else if( !isCenteredHoriz && diffBL.x() > 0 ) {
diffBL.setX(0); // only adjust negative if !center-horiz
}
- diffBL.scale(s.getScale()).scale(-1f);
+ diffBL.mul(s.getScale()).scale(-1f);
} else {
- diffBL.min(new Vec3f()).scale(s.getScale()).scale(-1f);
+ diffBL.min(new Vec3f()).mul(s.getScale()).scale(-1f);
}
s.move( diffBL.scale(sxy) );
if( TRACE_LAYOUT ) {
diff --git a/src/graphui/classes/com/jogamp/graph/ui/layout/GridLayout.java b/src/graphui/classes/com/jogamp/graph/ui/layout/GridLayout.java
index e77f51aad..88c046280 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/layout/GridLayout.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/layout/GridLayout.java
@@ -339,9 +339,9 @@ public class GridLayout implements Group.Layout {
} else if( !isCenteredHoriz && diffBL.x() > 0 ) {
diffBL.setX(0); // only adjust negative if !center-horiz
}
- diffBL.scale(s.getScale()).scale(-1f);
+ diffBL.mul(s.getScale()).scale(-1f);
} else {
- diffBL.min(new Vec3f()).scale(s.getScale()).scale(-1f);
+ diffBL.min(new Vec3f()).mul(s.getScale()).scale(-1f);
}
s.move( diffBL.scale(sxy) );
if( TRACE_LAYOUT ) {
diff --git a/src/jogl/classes/com/jogamp/math/Matrix4f.java b/src/jogl/classes/com/jogamp/math/Matrix4f.java
index b82f92727..06e20ed01 100644
--- a/src/jogl/classes/com/jogamp/math/Matrix4f.java
+++ b/src/jogl/classes/com/jogamp/math/Matrix4f.java
@@ -1797,10 +1797,10 @@ public class Matrix4f {
final Vec4f winPos = new Vec4f(winx, winy, winz, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).scale(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
+ winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).mul(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1838,10 +1838,10 @@ public class Matrix4f {
final Vec4f winPos = new Vec4f(winx, winy, winz, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).scale(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
+ winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).mul(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1881,10 +1881,10 @@ public class Matrix4f {
final Vec4f winPos = new Vec4f(winx, winy, winz1, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).scale(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
+ winPos.add(-viewport.x(), -viewport.y(), 0f, 0f).mul(1f/viewport.width(), 1f/viewport.height(), 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos1
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1946,10 +1946,10 @@ public class Matrix4f {
final Vec4f winPos = new Vec4f(winx, winy, winz, clipw);
// Map x and y from window coordinates
- winPos.add(-viewport.x(), -viewport.y(), -near, 0f).scale(1f/viewport.width(), 1f/viewport.height(), 1f/(far-near), 1f);
+ winPos.add(-viewport.x(), -viewport.y(), -near, 0f).mul(1f/viewport.width(), 1f/viewport.height(), 1f/(far-near), 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// objPos = Inv(P x Mv) * winPos
invPMv.mulVec4f(winPos, objPos);
@@ -1989,10 +1989,10 @@ public class Matrix4f {
final Vec4f winPos = new Vec4f(winx, winy, winz, clipw);
// Map x and y from window coordinates
- winPos.add(-viewport.x(), -viewport.y(), -near, 0f).scale(1f/viewport.width(), 1f/viewport.height(), 1f/(far-near), 1f);
+ winPos.add(-viewport.x(), -viewport.y(), -near, 0f).mul(1f/viewport.width(), 1f/viewport.height(), 1f/(far-near), 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// objPos = Inv(P x Mv) * winPos
invPMv.mulVec4f(winPos, objPos);
diff --git a/src/jogl/classes/com/jogamp/math/Vec2f.java b/src/jogl/classes/com/jogamp/math/Vec2f.java
index 27371401a..547f63a05 100644
--- a/src/jogl/classes/com/jogamp/math/Vec2f.java
+++ b/src/jogl/classes/com/jogamp/math/Vec2f.java
@@ -147,21 +147,35 @@ public final class Vec2f {
}
/** this = this * s, returns this. */
- public Vec2f scale(final float s) {
- x *= s;
- y *= s;
- return this;
- }
+ public Vec2f mul(final Vec2f s) { return mul(s.x, s.y); }
/** this = this * { sx, sy }, returns this. */
- public Vec2f scale(final float sx, final float sy) {
+ public Vec2f mul(final float sx, final float sy) {
x *= sx;
y *= sy;
return this;
}
- /** this = this * { s.x, s.y }, returns this. */
- public Vec2f scale(final Vec2f s) { return scale(s.x, s.y); }
+ /** this = a / b, returns this. */
+ public Vec2f div(final Vec2f a, final Vec2f b) {
+ x = a.x / b.x;
+ y = a.y / b.y;
+ return this;
+ }
+
+ /** this = this / a, returns this. */
+ public Vec2f div(final Vec2f a) {
+ x /= a.x;
+ y /= a.y;
+ return this;
+ }
+
+ /** this = this * s, returns this. */
+ public Vec2f scale(final float s) {
+ x *= s;
+ y *= s;
+ return this;
+ }
/** Returns this + arg; creates new vector */
public Vec2f plus(final Vec2f arg) {
diff --git a/src/jogl/classes/com/jogamp/math/Vec3d.java b/src/jogl/classes/com/jogamp/math/Vec3d.java
index 14408f714..7fb4477e0 100644
--- a/src/jogl/classes/com/jogamp/math/Vec3d.java
+++ b/src/jogl/classes/com/jogamp/math/Vec3d.java
@@ -173,23 +173,39 @@ public final class Vec3d {
}
/** this = this * s, returns this. */
- public Vec3d scale(final double s) {
- x *= s;
- y *= s;
- z *= s;
- return this;
- }
+ public Vec3d mul(final Vec3d s) { return mul(s.x, s.y, s.z); }
/** this = this * { sx, sy, sz }, returns this. */
- public Vec3d scale(final double sx, final double sy, final double sz) {
+ public Vec3d mul(final double sx, final double sy, final double sz) {
x *= sx;
y *= sy;
z *= sz;
return this;
}
- /** this = this * { s.x, s.y, s.z }, returns this. */
- public Vec3d scale(final Vec3d s) { return scale(s.x, s.y, s.z); }
+ /** this = a / b, returns this. */
+ public Vec3d div(final Vec3d a, final Vec3d b) {
+ x = a.x / b.x;
+ y = a.y / b.y;
+ z = a.z / b.z;
+ return this;
+ }
+
+ /** this = this / a, returns this. */
+ public Vec3d div(final Vec3d a) {
+ x /= a.x;
+ y /= a.y;
+ z /= a.z;
+ return this;
+ }
+
+ /** this = this * s, returns this. */
+ public Vec3d scale(final double s) {
+ x *= s;
+ y *= s;
+ z *= s;
+ return this;
+ }
/** Returns this + arg; creates new vector */
public Vec3d plus(final Vec3d arg) {
diff --git a/src/jogl/classes/com/jogamp/math/Vec3f.java b/src/jogl/classes/com/jogamp/math/Vec3f.java
index 1ad27463e..2dc399ef1 100644
--- a/src/jogl/classes/com/jogamp/math/Vec3f.java
+++ b/src/jogl/classes/com/jogamp/math/Vec3f.java
@@ -180,23 +180,39 @@ public final class Vec3f {
}
/** this = this * s, returns this. */
- public Vec3f scale(final float s) {
- x *= s;
- y *= s;
- z *= s;
- return this;
- }
+ public Vec3f mul(final Vec3f s) { return mul(s.x, s.y, s.z); }
/** this = this * { sx, sy, sz }, returns this. */
- public Vec3f scale(final float sx, final float sy, final float sz) {
+ public Vec3f mul(final float sx, final float sy, final float sz) {
x *= sx;
y *= sy;
z *= sz;
return this;
}
- /** this = this * { s.x, s.y, s.z }, returns this. */
- public Vec3f scale(final Vec3f s) { return scale(s.x, s.y, s.z); }
+ /** this = a / b, returns this. */
+ public Vec3f div(final Vec3f a, final Vec3f b) {
+ x = a.x / b.x;
+ y = a.y / b.y;
+ z = a.z / b.z;
+ return this;
+ }
+
+ /** this = this / a, returns this. */
+ public Vec3f div(final Vec3f a) {
+ x /= a.x;
+ y /= a.y;
+ z /= a.z;
+ return this;
+ }
+
+ /** this = this * s, returns this. */
+ public Vec3f scale(final float s) {
+ x *= s;
+ y *= s;
+ z *= s;
+ return this;
+ }
/** Returns this + arg; creates new vector */
public Vec3f plus(final Vec3f arg) {
diff --git a/src/jogl/classes/com/jogamp/math/Vec4f.java b/src/jogl/classes/com/jogamp/math/Vec4f.java
index 45afea7f8..5b17d7a4c 100644
--- a/src/jogl/classes/com/jogamp/math/Vec4f.java
+++ b/src/jogl/classes/com/jogamp/math/Vec4f.java
@@ -172,16 +172,10 @@ public final class Vec4f {
}
/** this = this * s, returns this. */
- public Vec4f scale(final float s) {
- x *= s;
- y *= s;
- z *= s;
- w *= s;
- return this;
- }
+ public Vec4f mul(final Vec4f s) { return mul(s.x, s.y, s.z, s.w); }
/** this = this * { sx, sy, sz, sw }, returns this. */
- public Vec4f scale(final float sx, final float sy, final float sz, final float sw) {
+ public Vec4f mul(final float sx, final float sy, final float sz, final float sw) {
x *= sx;
y *= sy;
z *= sz;
@@ -189,8 +183,32 @@ public final class Vec4f {
return this;
}
- /** this = this * { s.x, s.y, s.z, s.w }, returns this. */
- public Vec4f scale(final Vec4f s) { return scale(s.x, s.y, s.z, s.w); }
+ /** this = a / b, returns this. */
+ public Vec4f div(final Vec4f a, final Vec4f b) {
+ x = a.x / b.x;
+ y = a.y / b.y;
+ z = a.z / b.z;
+ w = a.w / b.w;
+ return this;
+ }
+
+ /** this = this / a, returns this. */
+ public Vec4f div(final Vec4f a) {
+ x /= a.x;
+ y /= a.y;
+ z /= a.z;
+ w /= a.w;
+ return this;
+ }
+
+ /** this = this * s, returns this. */
+ public Vec4f scale(final float s) {
+ x *= s;
+ y *= s;
+ z *= s;
+ w *= s;
+ return this;
+ }
/** Returns this + arg; creates new vector */
public Vec4f plus(final Vec4f arg) {
diff --git a/src/jogl/classes/com/jogamp/math/geom/AABBox.java b/src/jogl/classes/com/jogamp/math/geom/AABBox.java
index 2b208267d..9d6153b7a 100644
--- a/src/jogl/classes/com/jogamp/math/geom/AABBox.java
+++ b/src/jogl/classes/com/jogamp/math/geom/AABBox.java
@@ -762,10 +762,10 @@ public class AABBox {
*/
public final AABBox scale(final float sX, final float sY, final float sZ) {
final Vec3f tmp = new Vec3f();
- tmp.set(hi).sub(center).scale(sX, sY, sZ);
+ tmp.set(hi).sub(center).mul(sX, sY, sZ);
hi.set(center).add(tmp);
- tmp.set(lo).sub(center).scale(sX, sY, sZ);
+ tmp.set(lo).sub(center).mul(sX, sY, sZ);
lo.set(center).add(tmp);
return this;
@@ -799,8 +799,8 @@ public class AABBox {
* @see #scale(float, float[])
*/
public final AABBox scale2(final float sX, final float sY, final float sZ) {
- hi.scale(sX, sY, sZ);
- lo.scale(sX, sY, sZ);
+ hi.mul(sX, sY, sZ);
+ lo.mul(sX, sY, sZ);
computeCenter();
return this;
}
diff --git a/src/test/com/jogamp/opengl/test/junit/math/Matrix4fb.java b/src/test/com/jogamp/opengl/test/junit/math/Matrix4fb.java
index a151eec96..9a7d9f7ff 100644
--- a/src/test/com/jogamp/opengl/test/junit/math/Matrix4fb.java
+++ b/src/test/com/jogamp/opengl/test/junit/math/Matrix4fb.java
@@ -1594,10 +1594,10 @@ public class Matrix4fb {
final Vec4f winPos = new Vec4f(winx, winy, winz, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport[0], -viewport[1], 0f, 0f).scale(1f/viewport[2], 1f/viewport[3], 1f, 1f);
+ winPos.add(-viewport[0], -viewport[1], 0f, 0f).mul(1f/viewport[2], 1f/viewport[3], 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1634,10 +1634,10 @@ public class Matrix4fb {
final Vec4f winPos = new Vec4f(winx, winy, winz, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport[0], -viewport[1], 0f, 0f).scale(1f/viewport[2], 1f/viewport[3], 1f, 1f);
+ winPos.add(-viewport[0], -viewport[1], 0f, 0f).mul(1f/viewport[2], 1f/viewport[3], 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1676,10 +1676,10 @@ public class Matrix4fb {
final Vec4f winPos = new Vec4f(winx, winy, winz1, 1f);
// Map x and y from window coordinates
- winPos.add(-viewport[0], -viewport[1], 0f, 0f).scale(1f/viewport[2], 1f/viewport[3], 1f, 1f);
+ winPos.add(-viewport[0], -viewport[1], 0f, 0f).mul(1f/viewport[2], 1f/viewport[3], 1f, 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// rawObjPos = Inv(P x Mv) * winPos1
final Vec4f rawObjPos = invPMv.mulVec4f(winPos, new Vec4f());
@@ -1741,10 +1741,10 @@ public class Matrix4fb {
final Vec4f winPos = new Vec4f(winx, winy, winz, clipw);
// Map x and y from window coordinates
- winPos.add(-viewport[0], -viewport[1], -near, 0f).scale(1f/viewport[2], 1f/viewport[3], 1f/(far-near), 1f);
+ winPos.add(-viewport[0], -viewport[1], -near, 0f).mul(1f/viewport[2], 1f/viewport[3], 1f/(far-near), 1f);
// Map to range -1 to 1
- winPos.scale(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
+ winPos.mul(2f, 2f, 2f, 1f).add(-1f, -1f, -1f, 0f);
// objPos = Inv(P x Mv) * winPos
invPMv.mulVec4f(winPos, objPos);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-20 13:34:03 +0000