diff options
Diffstat (limited to 'basegfx/source/matrix/b3dhommatrix.cxx')
| -rw-r--r-- | basegfx/source/matrix/b3dhommatrix.cxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx index e665b47d58a6..ef1bd73bbce5 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace basegfx class Impl3DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 4 > { }; - - namespace { struct IdentityMatrix : public rtl::Static< B3DHomMatrix::ImplType, + + namespace { struct IdentityMatrix : public rtl::Static< B3DHomMatrix::ImplType, IdentityMatrix > {}; } B3DHomMatrix::B3DHomMatrix() : @@ -229,7 +229,7 @@ namespace basegfx mpImpl->doMulMatrix(aRotMatY); } - + if(!fTools::equalZero(fAngleZ)) { Impl3DHomMatrix aRotMatZ; @@ -251,7 +251,7 @@ namespace basegfx if(!fTools::equalZero(fX) || !fTools::equalZero(fY) || !fTools::equalZero(fZ)) { Impl3DHomMatrix aTransMat; - + aTransMat.set(0, 3, fX); aTransMat.set(1, 3, fY); aTransMat.set(2, 3, fZ); @@ -267,7 +267,7 @@ namespace basegfx if(!fTools::equal(fOne, fX) || !fTools::equal(fOne, fY) ||!fTools::equal(fOne, fZ)) { Impl3DHomMatrix aScaleMat; - + aScaleMat.set(0, 0, fX); aScaleMat.set(1, 1, fY); aScaleMat.set(2, 2, fZ); @@ -282,7 +282,7 @@ namespace basegfx if(!fTools::equalZero(fSx) || !fTools::equalZero(fSy)) { Impl3DHomMatrix aShearXYMat; - + aShearXYMat.set(0, 2, fSx); aShearXYMat.set(1, 2, fSy); @@ -296,7 +296,7 @@ namespace basegfx if(!fTools::equalZero(fSy) || !fTools::equalZero(fSz)) { Impl3DHomMatrix aShearYZMat; - + aShearYZMat.set(1, 0, fSy); aShearYZMat.set(2, 0, fSz); @@ -310,7 +310,7 @@ namespace basegfx if(!fTools::equalZero(fSx) || !fTools::equalZero(fSz)) { Impl3DHomMatrix aShearXZMat; - + aShearXZMat.set(0, 1, fSx); aShearXZMat.set(2, 1, fSz); @@ -351,7 +351,7 @@ namespace basegfx } Impl3DHomMatrix aFrustumMat; - + aFrustumMat.set(0, 0, 2.0 * fNear / (fRight - fLeft)); aFrustumMat.set(1, 1, 2.0 * fNear / (fTop - fBottom)); aFrustumMat.set(0, 2, (fRight + fLeft) / (fRight - fLeft)); @@ -363,7 +363,7 @@ namespace basegfx mpImpl->doMulMatrix(aFrustumMat); } - + void B3DHomMatrix::ortho(double fLeft, double fRight, double fBottom, double fTop, double fNear, double fFar) { if(fTools::equal(fNear, fFar)) @@ -384,14 +384,14 @@ namespace basegfx } Impl3DHomMatrix aOrthoMat; - + aOrthoMat.set(0, 0, 2.0 / (fRight - fLeft)); aOrthoMat.set(1, 1, 2.0 / (fTop - fBottom)); aOrthoMat.set(2, 2, -1.0 * (2.0 / (fFar - fNear))); aOrthoMat.set(0, 3, -1.0 * ((fRight + fLeft) / (fRight - fLeft))); aOrthoMat.set(1, 3, -1.0 * ((fTop + fBottom) / (fTop - fBottom))); aOrthoMat.set(2, 3, -1.0 * ((fFar + fNear) / (fFar - fNear))); - + mpImpl->doMulMatrix(aOrthoMat); } @@ -502,7 +502,7 @@ namespace basegfx // get ShearYZ rShear.setZ(aCol1.scalar(aCol2)); - + if(fTools::equalZero(rShear.getZ())) { rShear.setZ(0.0); @@ -552,7 +552,7 @@ namespace basegfx { double fy=0; double cy=0; - + if( ::basegfx::fTools::equal( aCol0.getZ(), 1.0 ) || aCol0.getZ() > 1.0 ) { |