summaryrefslogtreecommitdiff
path: root/drawinglayer/source/processor3d
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/processor3d
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/processor3d')
-rw-r--r--drawinglayer/source/processor3d/cutfindprocessor3d.cxx4
-rw-r--r--drawinglayer/source/processor3d/defaultprocessor3d.cxx6
-rw-r--r--drawinglayer/source/processor3d/geometry2dextractor.cxx4
-rw-r--r--drawinglayer/source/processor3d/shadow3dextractor.cxx4
-rw-r--r--drawinglayer/source/processor3d/zbufferprocessor3d.cxx4
5 files changed, 11 insertions, 11 deletions
diff --git a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
index 00b9a9a43c0f..04a37a73c2ad 100644
--- a/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/cutfindprocessor3d.cxx
@@ -163,11 +163,11 @@ namespace drawinglayer
const basegfx::B3DPoint aPointOnPlane(aPolygon.getB3DPoint(0));
double fCut(0.0);
- if(basegfx::tools::getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, maFront, maBack, fCut))
+ if(basegfx::utils::getCutBetweenLineAndPlane(aPlaneNormal, aPointOnPlane, maFront, maBack, fCut))
{
const basegfx::B3DPoint aCutPoint(basegfx::interpolate(maFront, maBack, fCut));
- if(basegfx::tools::isInside(rPolyPolygon, aCutPoint))
+ if(basegfx::utils::isInside(rPolyPolygon, aCutPoint))
{
// #i102956# add result. Do not forget to do this in the coordinate
// system the processor get started with, so use the collected
diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
index bd584eae9a93..a055a3e71aef 100644
--- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx
@@ -270,7 +270,7 @@ namespace drawinglayer
basegfx::B2DRange aGraphicRange(rFillGraphicAttribute.getGraphicRange());
aGraphicRange.transform(
- basegfx::tools::createScaleB2DHomMatrix(
+ basegfx::utils::createScaleB2DHomMatrix(
rPrimitive.getTextureSize()));
if(rFillGraphicAttribute.getTiling())
@@ -330,7 +330,7 @@ namespace drawinglayer
// transform to device coordinates (-1.0 .. 1.0) and check for visibility
aHairline.transform(getViewInformation3D().getObjectToView());
- const basegfx::B3DRange a3DRange(basegfx::tools::getRange(aHairline));
+ const basegfx::B3DRange a3DRange(basegfx::utils::getRange(aHairline));
const basegfx::B2DRange a2DRange(a3DRange.getMinX(), a3DRange.getMinY(), a3DRange.getMaxX(), a3DRange.getMaxY());
if(a2DRange.overlaps(maRasterRange))
@@ -370,7 +370,7 @@ namespace drawinglayer
// transform to device coordinates (-1.0 .. 1.0) and check for visibility
aFill.transform(getViewInformation3D().getObjectToView());
- const basegfx::B3DRange a3DRange(basegfx::tools::getRange(aFill));
+ const basegfx::B3DRange a3DRange(basegfx::utils::getRange(aFill));
const basegfx::B2DRange a2DRange(a3DRange.getMinX(), a3DRange.getMinY(), a3DRange.getMaxX(), a3DRange.getMaxY());
bPaintIt = a2DRange.overlaps(maRasterRange);
diff --git a/drawinglayer/source/processor3d/geometry2dextractor.cxx b/drawinglayer/source/processor3d/geometry2dextractor.cxx
index 5279e7fa560a..d935546c1118 100644
--- a/drawinglayer/source/processor3d/geometry2dextractor.cxx
+++ b/drawinglayer/source/processor3d/geometry2dextractor.cxx
@@ -85,7 +85,7 @@ namespace drawinglayer
{
// PolygonHairlinePrimitive3D
const primitive3d::PolygonHairlinePrimitive3D& rPrimitive = static_cast< const primitive3d::PolygonHairlinePrimitive3D& >(rCandidate);
- basegfx::B2DPolygon a2DHairline(basegfx::tools::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView()));
+ basegfx::B2DPolygon a2DHairline(basegfx::utils::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView()));
if(a2DHairline.count())
{
@@ -100,7 +100,7 @@ namespace drawinglayer
{
// PolyPolygonMaterialPrimitive3D
const primitive3d::PolyPolygonMaterialPrimitive3D& rPrimitive = static_cast< const primitive3d::PolyPolygonMaterialPrimitive3D& >(rCandidate);
- basegfx::B2DPolyPolygon a2DFill(basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView()));
+ basegfx::B2DPolyPolygon a2DFill(basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView()));
if(a2DFill.count())
{
diff --git a/drawinglayer/source/processor3d/shadow3dextractor.cxx b/drawinglayer/source/processor3d/shadow3dextractor.cxx
index 0544406ed59b..35032588c766 100644
--- a/drawinglayer/source/processor3d/shadow3dextractor.cxx
+++ b/drawinglayer/source/processor3d/shadow3dextractor.cxx
@@ -147,7 +147,7 @@ namespace drawinglayer
}
else
{
- a2DHairline = basegfx::tools::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView());
+ a2DHairline = basegfx::utils::createB2DPolygonFromB3DPolygon(rPrimitive.getB3DPolygon(), getViewInformation3D().getObjectToView());
}
if(a2DHairline.count())
@@ -178,7 +178,7 @@ namespace drawinglayer
}
else
{
- a2DFill = basegfx::tools::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView());
+ a2DFill = basegfx::utils::createB2DPolyPolygonFromB3DPolyPolygon(rPrimitive.getB3DPolyPolygon(), getViewInformation3D().getObjectToView());
}
if(a2DFill.count())
diff --git a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
index 0d9354cf303c..8f08a70d8dbe 100644
--- a/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
+++ b/drawinglayer/source/processor3d/zbufferprocessor3d.cxx
@@ -395,7 +395,7 @@ public:
mpTransparenceGeoTexSvx(pTransparenceGeoTexSvx),
maMaterial(rMaterial),
maPolyPolygon(rPolyPolygon),
- mfCenterZ(basegfx::tools::getRange(rPolyPolygon).getCenter().getZ()),
+ mfCenterZ(basegfx::utils::getRange(rPolyPolygon).getCenter().getZ()),
mbModulate(bModulate),
mbFilter(bFilter),
mbSimpleTextureActive(bSimpleTextureActive),
@@ -464,7 +464,7 @@ namespace drawinglayer
aSnappedHairline.transform(aTransform);
// snap to integer
- aSnappedHairline = basegfx::tools::snapPointsOfHorizontalOrVerticalEdges(aSnappedHairline);
+ aSnappedHairline = basegfx::utils::snapPointsOfHorizontalOrVerticalEdges(aSnappedHairline);
// add oversampling again
aTransform.identity();