diff options
Diffstat (limited to 'drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx index b33bb0038a43..fd26f5e36bde 100644 --- a/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/sdrextrudeprimitive3d.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 @@ -92,7 +92,7 @@ namespace drawinglayer // create geometry ::std::vector< basegfx::B3DPolyPolygon > aFill; - extractPlanesFromSlice(aFill, rSliceVector, + extractPlanesFromSlice(aFill, rSliceVector, bCreateNormals, getSmoothHorizontalNormals(), getSmoothNormals(), getSmoothLids(), false, 0.5, 0.6, bCreateTextureCoordiantesX || bCreateTextureCoordiantesY, aTexTransform); @@ -132,20 +132,20 @@ namespace drawinglayer { // add fill aRetval = create3DPolyPolygonFillPrimitives( - aFill, - getTransform(), - getTextureSize(), - getSdr3DObjectAttribute(), - getSdrLFSAttribute().getFill(), + aFill, + getTransform(), + getTextureSize(), + getSdr3DObjectAttribute(), + getSdrLFSAttribute().getFill(), getSdrLFSAttribute().getFillFloatTransGradient()); } else { // create simplified 3d hit test geometry aRetval = createHiddenGeometryPrimitives3D( - aFill, - getTransform(), - getTextureSize(), + aFill, + getTransform(), + getTextureSize(), getSdr3DObjectAttribute()); } @@ -159,7 +159,7 @@ namespace drawinglayer const sal_uInt32 nCount(aVerLine.count()); basegfx::B3DPolyPolygon aReducedLoops; basegfx::B3DPolyPolygon aNewLineGeometry; - + // sort out doubles (front and back planes when no edge rounding is done). Since // this is a line geometry merged from PolyPolygons, loop over all Polygons for(a = 0; a < nCount; a++) @@ -167,7 +167,7 @@ namespace drawinglayer const sal_uInt32 nReducedCount(aReducedLoops.count()); const basegfx::B3DPolygon aCandidate(aVerLine.getB3DPolygon(a)); bool bAdd(true); - + if(nReducedCount) { for(sal_uInt32 b(0); bAdd && b < nReducedCount; b++) @@ -178,7 +178,7 @@ namespace drawinglayer } } } - + if(bAdd) { aReducedLoops.append(aCandidate); @@ -195,13 +195,13 @@ namespace drawinglayer // get loop pair const basegfx::B3DPolygon aCandA(aReducedLoops.getB3DPolygon(b - 1)); const basegfx::B3DPolygon aCandB(aReducedLoops.getB3DPolygon(b)); - + // for each loop pair create the connection edges createReducedOutlines( - rViewInformation, - getTransform(), + rViewInformation, + getTransform(), aCandA, - aCandB, + aCandB, aNewLineGeometry); } } @@ -209,7 +209,7 @@ namespace drawinglayer // add reduced loops themselves aNewLineGeometry.append(aReducedLoops); - // to create vertical edges at non-C1/C2 steady loops, use maCorrectedPolyPolygon + // to create vertical edges at non-C1/C2 steady loops, use maCorrectedPolyPolygon // directly since the 3D Polygons do not suport this. // // Unfortunately there is no bezier polygon provided by the chart module; one reason is @@ -222,7 +222,7 @@ namespace drawinglayer // This is all not very well designed ATM. Ideally, the ReducedLineGeometry is responsible // for creating the outer geometry edges (createReducedOutlines), but for special edges // like the vertical ones for pie center and both start/end, the incarnation with the - // knowledge about that it needs to create those and IS a pie segment -> in this case, + // knowledge about that it needs to create those and IS a pie segment -> in this case, // the chart itself. const sal_uInt32 nPolyCount(maCorrectedPolyPolygon.count()); @@ -236,7 +236,7 @@ namespace drawinglayer sal_uInt32 nIndexA(nPointCount); sal_uInt32 nIndexB(nPointCount); sal_uInt32 nIndexC(nPointCount); - + for(sal_uInt32 d(0); d < nPointCount; d++) { const sal_uInt32 nPrevInd((d + nPointCount - 1) % nPointCount); @@ -278,7 +278,7 @@ namespace drawinglayer } else if(bIndexAUsed && bIndexBUsed) { - // outer edges detected (they are approx. 90 degrees), but center one not. + // outer edges detected (they are approx. 90 degrees), but center one not. // Look with the knowledge that it's in-between the two found ones if(((nIndexA + 2) % nPointCount) == nIndexB) { @@ -303,7 +303,7 @@ namespace drawinglayer aToBeAdded.append(aEnd); aNewLineGeometry.append(aToBeAdded); } - + if(bIndexBUsed) { const basegfx::B2DPoint aPoint(aCandidate.getB2DPoint(nIndexB)); @@ -332,7 +332,7 @@ namespace drawinglayer // append loops themselves aNewLineGeometry.append(aReducedLoops); - + if(aNewLineGeometry.count()) { const Primitive3DSequence aLines(create3DPolyPolygonLinePrimitives( @@ -397,21 +397,21 @@ namespace drawinglayer } SdrExtrudePrimitive3D::SdrExtrudePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, - double fDepth, - double fDiagonal, + double fDepth, + double fDiagonal, double fBackScale, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack) - : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), + : SdrPrimitive3D(rTransform, rTextureSize, rSdrLFSAttribute, rSdr3DObjectAttribute), maCorrectedPolyPolygon(), maSlices(), maPolyPolygon(rPolyPolygon), @@ -468,7 +468,7 @@ namespace drawinglayer if(SdrPrimitive3D::operator==(rPrimitive)) { const SdrExtrudePrimitive3D& rCompare = static_cast< const SdrExtrudePrimitive3D& >(rPrimitive); - + return (getPolyPolygon() == rCompare.getPolyPolygon() && getDepth() == rCompare.getDepth() && getDiagonal() == rCompare.getDiagonal() |