summaryrefslogtreecommitdiff
path: root/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2017-09-22 14:12:07 +0300
committerTor Lillqvist <tml@collabora.com>2017-09-26 14:18:41 +0200
commit8e7897588d7185ef1964e8120669c1de3d1ce734 (patch)
tree8f48598670a5dc22703371943c05789d60b9a07d /drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
parent0b4135ec9945ea627318ecf5fccc4b7d0940ff0d (diff)
Rename the basegfx::tools namespace to basegfx::utils
Reduce potential confusion with the global tools namespace. Will hopefully make it possible to remove the annoying initial :: when referring to the global tools namespace. Unless we have even more tools subnamespaces somewhere. Thorsten said it was OK. Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996 Reviewed-on: https://gerrit.libreoffice.org/42644 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx')
-rw-r--r--drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
index e09476df2c19..396cf22c0e7f 100644
--- a/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/sdrsphereprimitive3d.cxx
@@ -22,7 +22,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b3dpolygon.hxx>
#include <drawinglayer/primitive3d/sdrdecompositiontools3d.hxx>
-#include <basegfx/tools/canvastools.hxx>
+#include <basegfx/utils/canvastools.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/attribute/sdrlineattribute.hxx>
@@ -44,7 +44,7 @@ namespace drawinglayer
|| css::drawing::NormalsKind_SPHERE == getSdr3DObjectAttribute().getNormalsKind());
// create unit geometry
- basegfx::B3DPolyPolygon aFill(basegfx::tools::createSphereFillPolyPolygonFromB3DRange(aUnitRange,
+ basegfx::B3DPolyPolygon aFill(basegfx::utils::createSphereFillPolyPolygonFromB3DRange(aUnitRange,
getHorizontalSegments(), getVerticalSegments(), bCreateNormals));
// normal inversion
@@ -54,7 +54,7 @@ namespace drawinglayer
&& aFill.areNormalsUsed())
{
// invert normals
- aFill = basegfx::tools::invertNormals(aFill);
+ aFill = basegfx::utils::invertNormals(aFill);
}
// texture coordinates
@@ -73,8 +73,8 @@ namespace drawinglayer
if(bParallelX || bParallelY)
{
// apply parallel texture coordinates in X and/or Y
- const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill));
- aFill = basegfx::tools::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY);
+ const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill));
+ aFill = basegfx::utils::applyDefaultTextureCoordinatesParallel(aFill, aRange, bParallelX, bParallelY);
}
if(bSphereX || bObjectSpecificX || bSphereY || bObjectSpecificY)
@@ -94,9 +94,9 @@ namespace drawinglayer
}
// apply spherical texture coordinates in X and/or Y
- const basegfx::B3DRange aRange(basegfx::tools::getRange(aFill));
+ const basegfx::B3DRange aRange(basegfx::utils::getRange(aFill));
const basegfx::B3DPoint aCenter(aRange.getCenter());
- aFill = basegfx::tools::applyDefaultTextureCoordinatesSphere(aFill, aCenter,
+ aFill = basegfx::utils::applyDefaultTextureCoordinatesSphere(aFill, aCenter,
bSphereX || bObjectSpecificX, bSphereY || bObjectSpecificY);
if(bObjectSpecificX)
@@ -146,7 +146,7 @@ namespace drawinglayer
// add line
if(!getSdrLFSAttribute().getLine().isDefault())
{
- basegfx::B3DPolyPolygon aSphere(basegfx::tools::createSpherePolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments()));
+ basegfx::B3DPolyPolygon aSphere(basegfx::utils::createSpherePolyPolygonFromB3DRange(aUnitRange, getHorizontalSegments(), getVerticalSegments()));
const Primitive3DContainer aLines(create3DPolyPolygonLinePrimitives(
aSphere, getTransform(), getSdrLFSAttribute().getLine()));
aRetval.append(aLines);