diff options
Diffstat (limited to 'drawinglayer/inc/drawinglayer/primitive3d')
20 files changed, 232 insertions, 232 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx index b80bd9d0a8ed..3d3cf4aae0d1 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/baseprimitive3d.hxx @@ -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 @@ -70,21 +70,21 @@ namespace drawinglayer namespace primitive3d { /** BasePrimitive3D class - + Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information. Current Basic 3D Primitives are: - + - PolygonHairlinePrimitive3D (for 3D hairlines) - PolyPolygonMaterialPrimitive3D (for 3D filled plane polygons) That's all for 3D! */ class BasePrimitive3D - : private boost::noncopyable, + : private boost::noncopyable, protected comphelper::OBaseMutex, public BasePrimitive3DImplBase { @@ -142,18 +142,18 @@ namespace drawinglayer namespace primitive3d { /** BufferedDecompositionPrimitive3D class - + Baseclass for all C++ implementations of com::sun::star::graphic::XPrimitive2D The description/functionality is identical with the 2D case in baseprimitive2d.hxx, please see there for detailed information */ class BufferedDecompositionPrimitive3D - : public BasePrimitive3D + : public BasePrimitive3D { private: /// a sequence used for buffering the last create3DDecomposition() result - Primitive3DSequence maBuffered3DDecomposition; + Primitive3DSequence maBuffered3DDecomposition; protected: /** access methods to maBuffered3DDecomposition. The usage of this methods may allow @@ -172,10 +172,10 @@ namespace drawinglayer // constructor BufferedDecompositionPrimitive3D(); - /** The getDecomposition default implementation will on demand use create3DDecomposition() if - maBuffered3DDecomposition is empty. It will set maBuffered3DDecomposition to this obtained decomposition - to buffer it. If the decomposition is also ViewInformation-dependent, this method needs to be - overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and + /** The getDecomposition default implementation will on demand use create3DDecomposition() if + maBuffered3DDecomposition is empty. It will set maBuffered3DDecomposition to this obtained decomposition + to buffer it. If the decomposition is also ViewInformation-dependent, this method needs to be + overloaded and the ViewInformation for the last decomposition needs to be remembered, too, and be used in the next call to decide if the buffered decomposition may be reused or not. */ virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx index 0255cf3ddb3b..2f6aeb8c93a7 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx @@ -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 @@ -32,30 +32,30 @@ ////////////////////////////////////////////////////////////////////////////// // define ranges for other libraries -#define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) -// #define PRIMITIVE3D_ID_RANGE_SVX (1 << 16) +#define PRIMITIVE3D_ID_RANGE_DRAWINGLAYER (0 << 16) +// #define PRIMITIVE3D_ID_RANGE_SVX (1 << 16) ////////////////////////////////////////////////////////////////////////////// // local primitives -#define PRIMITIVE3D_ID_GROUPPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 0) -#define PRIMITIVE3D_ID_HATCHTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 1) -#define PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 2) -#define PRIMITIVE3D_ID_POLYGONHAIRLINEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 3) -#define PRIMITIVE3D_ID_POLYGONSTROKEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 4) -#define PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 5) -#define PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 6) -#define PRIMITIVE3D_ID_SDRCUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 7) -#define PRIMITIVE3D_ID_SDREXTRUDEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 8) -#define PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 9) -#define PRIMITIVE3D_ID_SDRPOLYPOLYGONPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 10) -#define PRIMITIVE3D_ID_SDRSPHEREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 11) -#define PRIMITIVE3D_ID_SHADOWPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 12) -#define PRIMITIVE3D_ID_UNIFIEDTRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 13) -#define PRIMITIVE3D_ID_GRADIENTTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 14) -#define PRIMITIVE3D_ID_BITMAPTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 15) -#define PRIMITIVE3D_ID_TRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 16) -#define PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 17) +#define PRIMITIVE3D_ID_GROUPPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 0) +#define PRIMITIVE3D_ID_HATCHTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 1) +#define PRIMITIVE3D_ID_MODIFIEDCOLORPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 2) +#define PRIMITIVE3D_ID_POLYGONHAIRLINEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 3) +#define PRIMITIVE3D_ID_POLYGONSTROKEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 4) +#define PRIMITIVE3D_ID_POLYGONTUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 5) +#define PRIMITIVE3D_ID_POLYPOLYGONMATERIALPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 6) +#define PRIMITIVE3D_ID_SDRCUBEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 7) +#define PRIMITIVE3D_ID_SDREXTRUDEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 8) +#define PRIMITIVE3D_ID_SDRLATHEPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 9) +#define PRIMITIVE3D_ID_SDRPOLYPOLYGONPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 10) +#define PRIMITIVE3D_ID_SDRSPHEREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 11) +#define PRIMITIVE3D_ID_SHADOWPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 12) +#define PRIMITIVE3D_ID_UNIFIEDTRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 13) +#define PRIMITIVE3D_ID_GRADIENTTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 14) +#define PRIMITIVE3D_ID_BITMAPTEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 15) +#define PRIMITIVE3D_ID_TRANSPARENCETEXTUREPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 16) +#define PRIMITIVE3D_ID_TRANSFORMPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 17) #define PRIMITIVE3D_ID_HIDDENGEOMETRYPRIMITIVE3D (PRIMITIVE3D_ID_RANGE_DRAWINGLAYER| 18) ////////////////////////////////////////////////////////////////////////////// diff --git a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx index 6b2a3ba9c773..a51bae2d52dd 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/groupprimitive3d.hxx @@ -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 @@ -38,7 +38,7 @@ namespace drawinglayer namespace primitive3d { /** GroupPrimitive3D class - + Baseclass for all grouping 3D primitives The description/functionality is identical with the 2D case in groupprimitive2d.hxx, @@ -60,7 +60,7 @@ namespace drawinglayer { private: /// the children. Declared private since this shall never be changed at all after construction - Primitive3DSequence maChildren; + Primitive3DSequence maChildren; public: /// constructor diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index f2f88b56bda0..ef5e09cc68e2 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -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,7 +39,7 @@ namespace drawinglayer namespace primitive3d { /** HatchTexturePrimitive3D class - + HatchTexturePrimitive3D is derived from GroupPrimitive3D, but implements a decomposition which is complicated enough for buffering. Since the group primitive has no default buffering, it is necessary here to add a local @@ -49,7 +49,7 @@ namespace drawinglayer { private: /// the hatch definition - attribute::FillHatchAttribute maHatch; + attribute::FillHatchAttribute maHatch; /// the buffered decomposed hatch Primitive3DSequence maBuffered3DDecomposition; @@ -65,10 +65,10 @@ namespace drawinglayer public: /// constructor HatchTexturePrimitive3D( - const attribute::FillHatchAttribute& rHatch, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillHatchAttribute& rHatch, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx index d79f41077872..2b53cd913383 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hiddengeometryprimitive3d.hxx @@ -46,9 +46,9 @@ namespace drawinglayer namespace primitive3d { // This primitive is used to represent geometry for non-visible objects, - // e.g. a 3D cube without fill attributes. To still be able to use - // primitives for HitTest functionality, the 3d decompositions produce - // an as much as possible simplified fill geometry encapsulated in this + // e.g. a 3D cube without fill attributes. To still be able to use + // primitives for HitTest functionality, the 3d decompositions produce + // an as much as possible simplified fill geometry encapsulated in this // primtive when there is no fill geometry. Currently, the 3d hit test // uses only areas, so maybe in a further enchanced version this will change // to 'if neither filled nor lines' creation criteria. The whole primitive @@ -60,7 +60,7 @@ namespace drawinglayer public: HiddenGeometryPrimitive3D(const Primitive3DSequence& rChildren); - // despite returning an empty decomposition since it's no visualisation data, + // despite returning an empty decomposition since it's no visualisation data, // range calculation is intended to use hidden geometry, so // the local implementation will return the children's range virtual basegfx::B3DRange getB3DRange(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx index b28dca4c445b..1f142c0742cd 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/modifiedcolorprimitive3d.hxx @@ -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 @@ -49,12 +49,12 @@ namespace drawinglayer { private: /// The ColorModifier to use - basegfx::BColorModifier maColorModifier; + basegfx::BColorModifier maColorModifier; public: /// constructor ModifiedColorPrimitive3D( - const Primitive3DSequence& rChildren, + const Primitive3DSequence& rChildren, const basegfx::BColorModifier& rColorModifier); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index 1b92bced8258..eba60a18c7c0 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -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 @@ -53,15 +53,15 @@ namespace drawinglayer { private: /// the hairline geometry - basegfx::B3DPolygon maPolygon; - + basegfx::B3DPolygon maPolygon; + /// the hairline color - basegfx::BColor maBColor; + basegfx::BColor maBColor; public: /// constructor PolygonHairlinePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor); /// data read access @@ -89,20 +89,20 @@ namespace drawinglayer /** PolygonStrokePrimitive3D class This primitive defines a 3D line with line width, line join, line color - and stroke attributes. It will be decomposed dependent on the definition + and stroke attributes. It will be decomposed dependent on the definition to the needed primitives, e.g. filled Tubes for fat lines. */ class PolygonStrokePrimitive3D : public BufferedDecompositionPrimitive3D { private: /// the line geometry - basegfx::B3DPolygon maPolygon; - + basegfx::B3DPolygon maPolygon; + /// the line attributes like width, join and color - attribute::LineAttribute maLineAttribute; - + attribute::LineAttribute maLineAttribute; + /// the line stroking (if used) - attribute::StrokeAttribute maStrokeAttribute; + attribute::StrokeAttribute maStrokeAttribute; protected: /// local decomposition. @@ -111,13 +111,13 @@ namespace drawinglayer public: /// constructor PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute, const attribute::StrokeAttribute& rStrokeAttribute); /// constructor without stroking PolygonStrokePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const attribute::LineAttribute& rLineAttribute); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 7d5620305134..b353ad05792a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -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 @@ -56,13 +56,13 @@ namespace drawinglayer { private: /// hold the last decompositon since it's expensive - Primitive3DSequence maLast3DDecomposition; + Primitive3DSequence maLast3DDecomposition; /// visualisation parameters - double mfRadius; - double mfDegreeStepWidth; - double mfMiterMinimumAngle; - basegfx::B2DLineJoin maLineJoin; + double mfRadius; + double mfDegreeStepWidth; + double mfMiterMinimumAngle; + basegfx::B2DLineJoin maLineJoin; protected: /** access methods to maLast3DDecomposition. The usage of this methods may allow @@ -78,7 +78,7 @@ namespace drawinglayer public: /// constructor PolygonTubePrimitive3D( - const basegfx::B3DPolygon& rPolygon, + const basegfx::B3DPolygon& rPolygon, const basegfx::BColor& rBColor, double fRadius, basegfx::B2DLineJoin aLineJoin, double fDegreeStepWidth = 10.0 * F_PI180, @@ -93,7 +93,7 @@ namespace drawinglayer /// compare operator virtual bool operator==(const BasePrimitive3D& rPrimitive) const; - /** local decomposition. Use own buffering since we are not derived from + /** local decomposition. Use own buffering since we are not derived from BufferedDecompositionPrimitive3D */ virtual Primitive3DSequence get3DDecomposition(const geometry::ViewInformation3D& rViewInformation) const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 77050889b487..440d07ef8408 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -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 @@ -51,19 +51,19 @@ namespace drawinglayer { private: /// the PolyPolygon geometry - basegfx::B3DPolyPolygon maPolyPolygon; + basegfx::B3DPolyPolygon maPolyPolygon; /// the fill parameters - attribute::MaterialAttribute3D maMaterial; + attribute::MaterialAttribute3D maMaterial; /// bitfield - unsigned mbDoubleSided : 1; + unsigned mbDoubleSided : 1; public: /// constructor PolyPolygonMaterialPrimitive3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, - const attribute::MaterialAttribute3D& rMaterial, + const basegfx::B3DPolyPolygon& rPolyPolygon, + const attribute::MaterialAttribute3D& rMaterial, bool bDoubleSided); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index bef18f7042c4..731ed3472025 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -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 @@ -40,7 +40,7 @@ namespace drawinglayer /** SdrCubePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D cube definition. - The cube is implicitely in unit coordinates and the given transformation + The cube is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ class SdrCubePrimitive3D : public SdrPrimitive3D @@ -52,9 +52,9 @@ namespace drawinglayer public: /// constructor SdrCubePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// compare operator diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 61a67dad1c44..a46b101b4cfe 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -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 @@ -62,7 +62,7 @@ namespace drawinglayer void applyNormalsKindSphereTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill, const basegfx::B3DRange& rRange); void applyNormalsKindFlatTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); void applyNormalsInvertTo3DGeometry(::std::vector< basegfx::B3DPolyPolygon >& rFill); - + // #i98314# void applyTextureTo3DGeometry( ::com::sun::star::drawing::TextureProjectionMode eModeX, @@ -72,7 +72,7 @@ namespace drawinglayer const basegfx::B2DVector& rTextureSize); Primitive3DSequence create3DPolyPolygonLinePrimitives( - const basegfx::B3DPolyPolygon& rUnitPolyPolygon, + const basegfx::B3DPolyPolygon& rUnitPolyPolygon, const basegfx::B3DHomMatrix& rObjectTransform, const attribute::SdrLineAttribute& rLine); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx index 7dfb986d0a0d..e69af0871b04 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx @@ -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 @@ -36,7 +36,7 @@ ////////////////////////////////////////////////////////////////////////////// // predefines -namespace drawinglayer { namespace geometry { +namespace drawinglayer { namespace geometry { class ViewInformation3D; }} @@ -49,33 +49,33 @@ namespace drawinglayer /** SliceType3D definition */ enum SliceType3D { - SLICETYPE3D_REGULAR, // normal geoemtry Slice3D - SLICETYPE3D_FRONTCAP, // front cap - SLICETYPE3D_BACKCAP // back cap + SLICETYPE3D_REGULAR, // normal geoemtry Slice3D + SLICETYPE3D_FRONTCAP, // front cap + SLICETYPE3D_BACKCAP // back cap }; /// class to hold one Slice3D class Slice3D { protected: - basegfx::B3DPolyPolygon maPolyPolygon; - SliceType3D maSliceType; + basegfx::B3DPolyPolygon maPolyPolygon; + SliceType3D maSliceType; public: Slice3D( - const basegfx::B2DPolyPolygon& rPolyPolygon, - const basegfx::B3DHomMatrix& aTransform, + const basegfx::B2DPolyPolygon& rPolyPolygon, + const basegfx::B3DHomMatrix& aTransform, SliceType3D aSliceType = SLICETYPE3D_REGULAR) - : maPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), + : maPolyPolygon(basegfx::tools::createB3DPolyPolygonFromB2DPolyPolygon(rPolyPolygon)), maSliceType(aSliceType) { maPolyPolygon.transform(aTransform); } Slice3D( - const basegfx::B3DPolyPolygon& rPolyPolygon, + const basegfx::B3DPolyPolygon& rPolyPolygon, SliceType3D aSliceType = SLICETYPE3D_REGULAR) - : maPolyPolygon(rPolyPolygon), + : maPolyPolygon(rPolyPolygon), maSliceType(aSliceType) { } @@ -90,24 +90,24 @@ namespace drawinglayer /// helpers for creation void createLatheSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fRotation, - sal_uInt32 nSteps, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fRotation, + sal_uInt32 nSteps, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); - + void createExtrudeSlices( - Slice3DVector& rSliceVector, - const basegfx::B2DPolyPolygon& rSource, - double fBackScale, - double fDiagonal, - double fDepth, - bool bCharacterMode, - bool bCloseFront, + Slice3DVector& rSliceVector, + const basegfx::B2DPolyPolygon& rSource, + double fBackScale, + double fDiagonal, + double fDepth, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); /// helpers for geometry extraction @@ -115,23 +115,23 @@ namespace drawinglayer basegfx::B3DPolyPolygon extractVerticalLinesFromSlice(const Slice3DVector& rSliceVector); void extractPlanesFromSlice( - ::std::vector< basegfx::B3DPolyPolygon >& rFill, + ::std::vector< basegfx::B3DPolyPolygon >& rFill, const Slice3DVector& rSliceVector, - bool bCreateNormals, - bool bSmoothHorizontalNormals, - bool bSmoothNormals, - bool bSmoothLids, + bool bCreateNormals, + bool bSmoothHorizontalNormals, + bool bSmoothNormals, + bool bSmoothLids, bool bClosed, - double fSmoothNormalsMix, - double fSmoothLidsMix, - bool bCreateTextureCoordinates, + double fSmoothNormalsMix, + double fSmoothLidsMix, + bool bCreateTextureCoordinates, const basegfx::B2DHomMatrix& rTexTransform); void createReducedOutlines( - const geometry::ViewInformation3D& rViewInformation, + const geometry::ViewInformation3D& rViewInformation, const basegfx::B3DHomMatrix& rObjectTransform, - const basegfx::B3DPolygon& rLoopA, - const basegfx::B3DPolygon& rLoopB, + const basegfx::B3DPolygon& rLoopA, + const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget); } // end of namespace overlay diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 06f881a7f260..008d56ab1b96 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -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 @@ -53,25 +53,25 @@ namespace drawinglayer { private: /// geometry helper for slices - basegfx::B2DPolyPolygon maCorrectedPolyPolygon; - Slice3DVector maSlices; + basegfx::B2DPolyPolygon maCorrectedPolyPolygon; + Slice3DVector maSlices; /// primitive geometry data - basegfx::B2DPolyPolygon maPolyPolygon; - double mfDepth; - double mfDiagonal; - double mfBackScale; + basegfx::B2DPolyPolygon maPolyPolygon; + double mfDepth; + double mfDiagonal; + double mfBackScale; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition geometry::ViewInformation3D* mpLastRLGViewInformation; /// bitfield - unsigned mbSmoothNormals : 1; // Plane self - unsigned mbSmoothHorizontalNormals : 1; // always - unsigned mbSmoothLids : 1; // Front/back - unsigned mbCharacterMode : 1; - unsigned mbCloseFront : 1; - unsigned mbCloseBack : 1; + unsigned mbSmoothNormals : 1; // Plane self + unsigned mbSmoothHorizontalNormals : 1; // always + unsigned mbSmoothLids : 1; // Front/back + unsigned mbCharacterMode : 1; + unsigned mbCloseFront : 1; + unsigned mbCloseBack : 1; /// create slices void impCreateSlices(); @@ -86,19 +86,19 @@ namespace drawinglayer public: /// constructor SdrExtrudePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + 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); virtual ~SdrExtrudePrimitive3D(); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index b4e4f18c10aa..a6bce8fb07c5 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -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 @@ -53,27 +53,27 @@ namespace drawinglayer { private: /// geometry helper for slices - basegfx::B2DPolyPolygon maCorrectedPolyPolygon; - Slice3DVector maSlices; + basegfx::B2DPolyPolygon maCorrectedPolyPolygon; + Slice3DVector maSlices; /// primitive geometry data - basegfx::B2DPolyPolygon maPolyPolygon; - sal_uInt32 mnHorizontalSegments; - sal_uInt32 mnVerticalSegments; - double mfDiagonal; - double mfBackScale; - double mfRotation; + basegfx::B2DPolyPolygon maPolyPolygon; + sal_uInt32 mnHorizontalSegments; + sal_uInt32 mnVerticalSegments; + double mfDiagonal; + double mfBackScale; + double mfRotation; /// decomposition data when ReducedLineGeometry is used, see get3DDecomposition geometry::ViewInformation3D* mpLastRLGViewInformation; /// bitfield - unsigned mbSmoothNormals : 1; // Plane self - unsigned mbSmoothHorizontalNormals : 1; // always - unsigned mbSmoothLids : 1; // Front/back - unsigned mbCharacterMode : 1; - unsigned mbCloseFront : 1; - unsigned mbCloseBack : 1; + unsigned mbSmoothNormals : 1; // Plane self + unsigned mbSmoothHorizontalNormals : 1; // always + unsigned mbSmoothLids : 1; // Front/back + unsigned mbCharacterMode : 1; + unsigned mbCloseFront : 1; + unsigned mbCloseBack : 1; /// create slices void impCreateSlices(); @@ -84,14 +84,14 @@ namespace drawinglayer protected: /// local helpers void impCreateOutlines( - const geometry::ViewInformation3D& rViewInformation, - const basegfx::B3DPolygon& rLoopA, - const basegfx::B3DPolygon& rLoopB, + const geometry::ViewInformation3D& rViewInformation, + const basegfx::B3DPolygon& rLoopA, + const basegfx::B3DPolygon& rLoopB, basegfx::B3DPolyPolygon& rTarget) const; - + bool impHasCutWith( - const basegfx::B2DPolygon& rPoly, - const basegfx::B2DPoint& rStart, + const basegfx::B2DPolygon& rPoly, + const basegfx::B2DPoint& rStart, const basegfx::B2DPoint& rEnd) const; /// local decomposition. @@ -100,21 +100,21 @@ namespace drawinglayer public: /// constructor SdrLathePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, const basegfx::B2DPolyPolygon& rPolyPolygon, sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments, - double fDiagonal, + double fDiagonal, double fBackScale, double fRotation, - bool bSmoothNormals, + bool bSmoothNormals, bool bSmoothHorizontalNormals, - bool bSmoothLids, - bool bCharacterMode, - bool bCloseFront, + bool bSmoothLids, + bool bCharacterMode, + bool bCloseFront, bool bCloseBack); virtual ~SdrLathePrimitive3D(); diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx index 71f868b468aa..51455ba3e7e5 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrpolypolygonprimitive3d.hxx @@ -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 @@ -41,17 +41,17 @@ namespace drawinglayer This 3D primitive defines a PolyPolgon in space which may have Line- and FillStyles and extra 3D surface attributes. It is assumed - that the given 3D PolyPolgon (which may contain texture and normal + that the given 3D PolyPolgon (which may contain texture and normal information) is planar in 3D. - The decomposition will include all needed 3D data for visualisation, + The decomposition will include all needed 3D data for visualisation, including FatLines and fill styles. */ class SdrPolyPolygonPrimitive3D : public SdrPrimitive3D { private: /// the planar polyPolygon evtl with normals and texture coordinates - basegfx::B3DPolyPolygon maPolyPolygon3D; + basegfx::B3DPolyPolygon maPolyPolygon3D; protected: /// local decomposition. @@ -61,9 +61,9 @@ namespace drawinglayer /// constructor SdrPolyPolygonPrimitive3D( const basegfx::B3DPolyPolygon& rPolyPolygon3D, - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// data access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index 26d5efda687b..5076c2c30e52 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -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 @@ -41,7 +41,7 @@ namespace drawinglayer { /** SdrPrimitive3D class - + Base class for the more complicated geometric primitives, so derive from buffered primitive to allow overloading of create3DDecomposition there. @@ -52,10 +52,10 @@ namespace drawinglayer { private: /// object surface attributes - basegfx::B3DHomMatrix maTransform; - basegfx::B2DVector maTextureSize; - attribute::SdrLineFillShadowAttribute3D maSdrLFSAttribute; - attribute::Sdr3DObjectAttribute maSdr3DObjectAttribute; + basegfx::B3DHomMatrix maTransform; + basegfx::B2DVector maTextureSize; + attribute::SdrLineFillShadowAttribute3D maSdrLFSAttribute; + attribute::Sdr3DObjectAttribute maSdr3DObjectAttribute; protected: /** Standard implementation for primitive3D which @@ -71,9 +71,9 @@ namespace drawinglayer public: /// constructor SdrPrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index a2ec5e5f7c46..add82da4f101 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -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 @@ -40,15 +40,15 @@ namespace drawinglayer /** SdrSpherePrimitive3D class This 3D primitive expands the SdrPrimitive3D to a 3D sphere definition. - The sphere is implicitely in unit coordinates and the given transformation + The sphere is implicitely in unit coordinates and the given transformation defines it's geometry in space. */ class SdrSpherePrimitive3D : public SdrPrimitive3D { private: /// additional geometry definitions - sal_uInt32 mnHorizontalSegments; - sal_uInt32 mnVerticalSegments; + sal_uInt32 mnHorizontalSegments; + sal_uInt32 mnVerticalSegments; protected: /// local decomposition. @@ -57,11 +57,11 @@ namespace drawinglayer public: /// constructor SdrSpherePrimitive3D( - const basegfx::B3DHomMatrix& rTransform, + const basegfx::B3DHomMatrix& rTransform, const basegfx::B2DVector& rTextureSize, - const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, - const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, - sal_uInt32 nHorizontalSegments, + const attribute::SdrLineFillShadowAttribute3D& rSdrLFSAttribute, + const attribute::Sdr3DObjectAttribute& rSdr3DObjectAttribute, + sal_uInt32 nHorizontalSegments, sal_uInt32 nVerticalSegments); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index 26ac8dcd6739..416cb85d1b8a 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -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 @@ -53,20 +53,20 @@ namespace drawinglayer { protected: /// 2D shadow definition - basegfx::B2DHomMatrix maShadowTransform; - basegfx::BColor maShadowColor; - double mfShadowTransparence; + basegfx::B2DHomMatrix maShadowTransform; + basegfx::BColor maShadowColor; + double mfShadowTransparence; /// bitfield - unsigned mbShadow3D : 1; + unsigned mbShadow3D : 1; public: /// constructor ShadowPrimitive3D( - const basegfx::B2DHomMatrix& rShadowTransform, - const basegfx::BColor& rShadowColor, - double fShadowTransparence, - bool bShadow3D, + const basegfx::B2DHomMatrix& rShadowTransform, + const basegfx::BColor& rShadowColor, + double fShadowTransparence, + bool bShadow3D, const Primitive3DSequence& rChildren); /// data read access diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 0eb6a6a3844e..f4d723756997 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -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 @@ -51,21 +51,21 @@ namespace drawinglayer { private: /// texture geometry definition - basegfx::B2DVector maTextureSize; + basegfx::B2DVector maTextureSize; /// bitfield /// flag if texture shall be modulated with white interpolated color - unsigned mbModulate : 1; + unsigned mbModulate : 1; /// flag if texture shall be filtered - unsigned mbFilter : 1; + unsigned mbFilter : 1; public: /// constructor TexturePrimitive3D( - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -95,12 +95,12 @@ namespace drawinglayer { private: /// transparency definition - double mfTransparence; + double mfTransparence; public: /// constructor UnifiedTransparenceTexturePrimitive3D( - double fTransparence, + double fTransparence, const Primitive3DSequence& rChildren); /// data read access @@ -129,23 +129,23 @@ namespace drawinglayer { /** GradientTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a gradient texture - definition. All 3D primitives embedded here will be shown with the + This 3D primitive expands TexturePrimitive3D to a gradient texture + definition. All 3D primitives embedded here will be shown with the defined gradient. */ class GradientTexturePrimitive3D : public TexturePrimitive3D { private: /// the gradient definition - attribute::FillGradientAttribute maGradient; + attribute::FillGradientAttribute maGradient; public: /// constructor GradientTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -168,23 +168,23 @@ namespace drawinglayer { /** BitmapTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a bitmap texture - definition. All 3D primitives embedded here will be shown with the + This 3D primitive expands TexturePrimitive3D to a bitmap texture + definition. All 3D primitives embedded here will be shown with the defined bitmap (maybe tiled if defined). */ class BitmapTexturePrimitive3D : public TexturePrimitive3D { private: /// bitmap fill attribute - attribute::FillBitmapAttribute maFillBitmapAttribute; + attribute::FillBitmapAttribute maFillBitmapAttribute; public: /// constructor BitmapTexturePrimitive3D( - const attribute::FillBitmapAttribute& rFillBitmapAttribute, - const Primitive3DSequence& rChildren, - const basegfx::B2DVector& rTextureSize, - bool bModulate, + const attribute::FillBitmapAttribute& rFillBitmapAttribute, + const Primitive3DSequence& rChildren, + const basegfx::B2DVector& rTextureSize, + bool bModulate, bool bFilter); /// data read access @@ -207,9 +207,9 @@ namespace drawinglayer { /** TransparenceTexturePrimitive3D class - This 3D primitive expands TexturePrimitive3D to a transparence texture + This 3D primitive expands TexturePrimitive3D to a transparence texture definition. For transparence definition, a gradient is used. The values in - that gradient will be interpreted as luminance Transparence-Values. All 3D + that gradient will be interpreted as luminance Transparence-Values. All 3D primitives embedded here will be shown with the defined transparence. */ class TransparenceTexturePrimitive3D : public GradientTexturePrimitive3D @@ -217,8 +217,8 @@ namespace drawinglayer public: /// constructor TransparenceTexturePrimitive3D( - const attribute::FillGradientAttribute& rGradient, - const Primitive3DSequence& rChildren, + const attribute::FillGradientAttribute& rGradient, + const Primitive3DSequence& rChildren, const basegfx::B2DVector& rTextureSize); /// compare operator diff --git a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx index 544fb0b2690e..15764ee73324 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/transformprimitive3d.hxx @@ -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 @@ -51,12 +51,12 @@ namespace drawinglayer { private: // the 3D transformation to apply - basegfx::B3DHomMatrix maTransformation; + basegfx::B3DHomMatrix maTransformation; public: /// constructor TransformPrimitive3D( - const basegfx::B3DHomMatrix& rTransformation, + const basegfx::B3DHomMatrix& rTransformation, const Primitive3DSequence& rChildren); /// data read access |