diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-08 13:14:39 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-08 18:53:00 +0200 |
commit | 347112fbd89ebd2a244052f14e085c9d3c90838d (patch) | |
tree | 07475c844d26adcec9333327524d9df71363610e /include/basegfx/vector | |
parent | e64d85c9eb18642ed3a0526f3dd8db9a4b88e629 (diff) |
Drop temporary aliases from Tuple2D and Tuple3D
Change-Id: I091b68bbeee74452a3d6a03711cfc482b7a78e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157685
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/basegfx/vector')
-rw-r--r-- | include/basegfx/vector/b2dvector.hxx | 16 | ||||
-rw-r--r-- | include/basegfx/vector/b3dvector.hxx | 30 |
2 files changed, 23 insertions, 23 deletions
diff --git a/include/basegfx/vector/b2dvector.hxx b/include/basegfx/vector/b2dvector.hxx index c7d8bc08a867..b698ccffe609 100644 --- a/include/basegfx/vector/b2dvector.hxx +++ b/include/basegfx/vector/b2dvector.hxx @@ -80,8 +80,8 @@ namespace basegfx */ B2DVector& operator*=( const B2DVector& rPnt ) { - mfX *= rPnt.mfX; - mfY *= rPnt.mfY; + mnX *= rPnt.mnX; + mnY *= rPnt.mnY; return *this; } @@ -89,8 +89,8 @@ namespace basegfx */ B2DVector& operator*=(double t) { - mfX *= t; - mfY *= t; + mnX *= t; + mnY *= t; return *this; } @@ -99,8 +99,8 @@ namespace basegfx */ B2DVector& operator=(Tuple2D<double> const& rVector) { - mfX = rVector.getX(); - mfY = rVector.getY(); + mnX = rVector.getX(); + mnY = rVector.getY(); return *this; } @@ -131,7 +131,7 @@ namespace basegfx @return The Scalar value of the two involved 2D Vectors */ - double scalar( const B2DVector& rVec ) const { return((mfX * rVec.mfX) + (mfY * rVec.mfY)); } + double scalar( const B2DVector& rVec ) const { return((mnX * rVec.mnX) + (mnY * rVec.mnY)); } /** Calculate the length of the cross product with another 2D Vector @@ -148,7 +148,7 @@ namespace basegfx @return The length of the cross product of the two involved 2D Vectors */ - double cross( const B2DVector& rVec ) const { return(mfX * rVec.getY() - mfY * rVec.getX()); } + double cross( const B2DVector& rVec ) const { return(mnX * rVec.getY() - mnY * rVec.getX()); } /** Calculate the Angle with another 2D Vector diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx index 399bba3edf7c..44c926e805c8 100644 --- a/include/basegfx/vector/b3dvector.hxx +++ b/include/basegfx/vector/b3dvector.hxx @@ -73,9 +73,9 @@ namespace basegfx */ B3DVector& operator*=( const B3DVector& rPnt ) { - mfX *= rPnt.mfX; - mfY *= rPnt.mfY; - mfZ *= rPnt.mfZ; + mnX *= rPnt.mnX; + mnY *= rPnt.mnY; + mnZ *= rPnt.mnZ; return *this; } @@ -83,9 +83,9 @@ namespace basegfx */ B3DVector& operator*=(double t) { - mfX *= t; - mfY *= t; - mfZ *= t; + mnX *= t; + mnY *= t; + mnZ *= t; return *this; } @@ -94,9 +94,9 @@ namespace basegfx */ B3DVector& operator=( const ::basegfx::B3DTuple& rVec ) { - mfX = rVec.getX(); - mfY = rVec.getY(); - mfZ = rVec.getZ(); + mnX = rVec.getX(); + mnY = rVec.getY(); + mnZ = rVec.getZ(); return *this; } @@ -118,7 +118,7 @@ namespace basegfx */ double getXZLength() const { - double fLen((mfX * mfX) + (mfZ * mfZ)); // #i73040# + double fLen((mnX * mnX) + (mnZ * mnZ)); // #i73040# if((0.0 == fLen) || (1.0 == fLen)) return fLen; return sqrt(fLen); @@ -130,7 +130,7 @@ namespace basegfx */ double getYZLength() const { - double fLen((mfY * mfY) + (mfZ * mfZ)); + double fLen((mnY * mnY) + (mnZ * mnZ)); if((0.0 == fLen) || (1.0 == fLen)) return fLen; return sqrt(fLen); @@ -154,9 +154,9 @@ namespace basegfx fLen /= sqrt(fLenNow); } - mfX *= fLen; - mfY *= fLen; - mfZ *= fLen; + mnX *= fLen; + mnY *= fLen; + mnZ *= fLen; } return *this; @@ -194,7 +194,7 @@ namespace basegfx */ double scalar(const B3DVector& rVec) const { - return ((mfX * rVec.mfX) + (mfY * rVec.mfY) + (mfZ * rVec.mfZ)); + return ((mnX * rVec.mnX) + (mnY * rVec.mnY) + (mnZ * rVec.mnZ)); } /** Transform vector by given transformation matrix. |