diff options
Diffstat (limited to 'drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx')
| -rw-r--r-- | drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx index ae682f72a21b..a75772cf9c8d 100644 --- a/drawinglayer/source/primitive3d/sdrdecompositiontools3d.cxx +++ b/drawinglayer/source/primitive3d/sdrdecompositiontools3d.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 @@ -146,7 +146,7 @@ namespace drawinglayer } Primitive3DSequence create3DPolyPolygonLinePrimitives( - const basegfx::B3DPolyPolygon& rUnitPolyPolygon, + const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine) { @@ -204,15 +204,15 @@ namespace drawinglayer } const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D( - aScaledPolyPolygon, - aSdr3DObjectAttribute.getMaterial(), + aScaledPolyPolygon, + aSdr3DObjectAttribute.getMaterial(), aSdr3DObjectAttribute.getDoubleSided())); aRetval[a] = xRef; } // look for and evtl. build texture sub-group primitive - if(!rFill.getGradient().isDefault() - || !rFill.getHatch().isDefault() + if(!rFill.getGradient().isDefault() + || !rFill.getHatch().isDefault() || !rFill.getBitmap().isDefault()) { bool bModulate(::com::sun::star::drawing::TextureMode_MODULATE == aSdr3DObjectAttribute.getTextureMode()); @@ -223,39 +223,39 @@ namespace drawinglayer { // create gradientTexture3D with sublist, add to local aRetval pNewTexturePrimitive3D = new GradientTexturePrimitive3D( - rFill.getGradient(), - aRetval, - rTextureSize, - bModulate, + rFill.getGradient(), + aRetval, + rTextureSize, + bModulate, bFilter); } else if(!rFill.getHatch().isDefault()) { // create hatchTexture3D with sublist, add to local aRetval pNewTexturePrimitive3D = new HatchTexturePrimitive3D( - rFill.getHatch(), - aRetval, - rTextureSize, - bModulate, + rFill.getHatch(), + aRetval, + rTextureSize, + bModulate, bFilter); } else // if(!rFill.getBitmap().isDefault()) { // create bitmapTexture3D with sublist, add to local aRetval basegfx::B2DRange aTexRange(0.0, 0.0, rTextureSize.getX(), rTextureSize.getY()); - + pNewTexturePrimitive3D = new BitmapTexturePrimitive3D( - rFill.getBitmap().getFillBitmapAttribute(aTexRange), - aRetval, - rTextureSize, - bModulate, + rFill.getBitmap().getFillBitmapAttribute(aTexRange), + aRetval, + rTextureSize, + bModulate, bFilter); } // exchange aRetval content with texture group const Primitive3DReference xRef(pNewTexturePrimitive3D); aRetval = Primitive3DSequence(&xRef, 1L); - + if(::com::sun::star::drawing::TextureKind2_LUMINANCE == aSdr3DObjectAttribute.getTextureKind()) { // use modified color primitive to force textures to gray @@ -317,17 +317,17 @@ namespace drawinglayer 0.0, basegfx::BColor(), attribute::FillGradientAttribute(), - attribute::FillHatchAttribute(), + attribute::FillHatchAttribute(), attribute::SdrFillBitmapAttribute()); - + const Primitive3DReference aHidden( new HiddenGeometryPrimitive3D( create3DPolyPolygonFillPrimitives( - r3DPolyPolygonVector, - rObjectTransform, - rTextureSize, - aSdr3DObjectAttribute, - aSimplifiedFillAttribute, + r3DPolyPolygonVector, + rObjectTransform, + rTextureSize, + aSdr3DObjectAttribute, + aSimplifiedFillAttribute, attribute::FillGradientAttribute()))); return Primitive3DSequence(&aHidden, 1); |