diff options
Diffstat (limited to 'src/jogl/classes/com/jogamp/math/Matrix4f.java')
| -rw-r--r-- | src/jogl/classes/com/jogamp/math/Matrix4f.java | 20 |
1 files changed, 10 insertions, 10 deletions
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); |