Math Vec*: Rename {scale->mul}(..) for non-scalar types (n-dim); Add div(..)

3 files changed, 8 insertions, 8 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 ) {