diff options
author | Armin Weiss <aw@openoffice.org> | 2006-06-02 12:58:03 +0000 |
---|---|---|
committer | Armin Weiss <aw@openoffice.org> | 2006-06-02 12:58:03 +0000 |
commit | d20e799551390411b32c4d398ea0c473af986a63 (patch) | |
tree | dcc2f69911e26b627dd6348e202e816046f3fb40 /drawinglayer/inc | |
parent | aba469dc674ec4b465155f23324792e6753b4ac5 (diff) |
#i39532# renderers to pixel, own directory
Diffstat (limited to 'drawinglayer/inc')
12 files changed, 55 insertions, 113 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx index 28fb22545e44..bd46561cda06 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/hatchtextureprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: hatchtextureprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:12 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,15 +52,15 @@ namespace drawinglayer fillHatchAttribute maHatch; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); // helpers - void impCreateDecomposition(const primitiveList& rSource, primitiveList& rDest); + void impCreateDecomposition(const primitiveVector& rSource, primitiveVector& rDest); public: hatchTexturePrimitive3D( const fillHatchAttribute& rHatch, - const primitiveList& rPrimitiveList, + const primitiveVector& rPrimitiveVector, const ::basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter); @@ -72,9 +72,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx index b4d44e28c6df..15f15006f082 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygonprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polygonprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:13 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,17 +78,11 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; // get 3Drange of primitive. Default implementation uses decomposition virtual ::basegfx::B3DRange get3DRange(const ::drawinglayer::geometry::viewInformation& rViewInformation) const; - - // version for 3D geometries, analog to 2d version (see above) - virtual void transform(const ::basegfx::B3DHomMatrix& rMatrix); }; } // end of namespace primitive } // end of namespace drawinglayer @@ -106,7 +100,7 @@ namespace drawinglayer strokeAttribute maStrokeAttribute; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: polygonStrokePrimitive3D(const ::basegfx::B3DPolygon& rPolygon, const strokeAttribute& rStrokeAttribute); @@ -119,14 +113,8 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; - - // version for 3D geometries, analog to 2d version (see above) - virtual void transform(const ::basegfx::B3DHomMatrix& rMatrix); }; } // end of namespace primitive } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 1116657a6c9d..236cf9a7202e 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polygontubeprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:13 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -63,7 +63,7 @@ namespace drawinglayer ::basegfx::tools::B2DLineJoin maLineJoin; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: polygonTubePrimitive3D( @@ -83,9 +83,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx index 6a0bdcf916ff..955b3add97b4 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/polypolygonprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: polypolygonprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:13 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,17 +79,11 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; // get 3Drange of primitive. Default implementation uses decomposition virtual ::basegfx::B3DRange get3DRange(const ::drawinglayer::geometry::viewInformation& rViewInformation) const; - - // version for 3D geometries, analog to 2d version (see above) - virtual void transform(const ::basegfx::B3DHomMatrix& rMatrix); }; } // end of namespace primitive } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx index 96234e6ecb62..dd3deb4bd011 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrcubeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrcubeprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:13 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,7 @@ namespace drawinglayer { protected: // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: sdrCubePrimitive3D( @@ -64,9 +64,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index ccc3486d7c4e..0ae39f660d02 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrdecompositiontools3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:14 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,6 +36,10 @@ #ifndef _DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX #define _DRAWINGLAYER_PRIMITIVE3D_SDRDECOMPOSITIONTOOLS3D_HXX +#ifndef _DRAWINGLAYER_PRIMITIVE_PRIMITIVE_HXX +#include <drawinglayer/primitive/primitive.hxx> +#endif + #include <vector> ////////////////////////////////////////////////////////////////////////////// @@ -48,7 +52,6 @@ namespace basegfx { } namespace drawinglayer { namespace primitive { - class primitiveList; class sdrLineAttribute; class sdrFillAttribute; class sdr3DObjectAttribute; @@ -65,20 +68,20 @@ namespace drawinglayer void add3DPolyPolygonLinePrimitive( const ::basegfx::B3DPolyPolygon& rUnitPolyPolygon, const ::basegfx::B3DHomMatrix& rObjectTransform, - primitiveList& rTarget, + primitiveVector& rTarget, const sdrLineAttribute& rLine); void add3DPolyPolygonFillPrimitive( const ::std::vector< ::basegfx::B3DPolyPolygon >& r3DPolyPolygonVector, const ::basegfx::B3DHomMatrix& rObjectTransform, const ::basegfx::B2DVector& rTextureSize, - primitiveList& rTarget, + primitiveVector& rTarget, const sdr3DObjectAttribute& aSdr3DObjectAttribute, const sdrFillAttribute& rFill, const fillGradientAttribute* pFillGradient = 0L); void addShadowPrimitive3D( - primitiveList& rTarget, + primitiveVector& rTarget, const sdrShadowAttribute& rShadow, bool bShadow3D); } // end of namespace overlay diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx index 182de49c173b..45ed6c0fbf95 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrextrudeprimitive3d.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-05-19 09:34:50 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,7 +78,7 @@ namespace drawinglayer unsigned mbCloseBack : 1; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); // get (evtl. create) slices const sliceVector& getSlices() const; @@ -104,9 +104,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx index 143f360e7e56..de2c1fa4dca4 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrlatheprimitive3d.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-05-19 09:34:50 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,7 +79,7 @@ namespace drawinglayer unsigned mbCloseBack : 1; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); // get (evtl. create) slices const sliceVector& getSlices() const; @@ -107,9 +107,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index bdd5f44c0e83..7556f204ae53 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrprimitive3d.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: aw $ $Date: 2006-05-19 09:34:51 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,9 +97,6 @@ namespace drawinglayer const ::basegfx::B2DVector& getTextureSize() const { return maTextureSize; } const sdrLineFillShadowAttribute& getSdrLFSAttribute() const { return maSdrLFSAttribute; } const sdr3DObjectAttribute getSdr3DObjectAttribute() const { return maSdr3DObjectAttribute; } - - // version for 3D geometries, analog to 2d version (see above) - virtual void transform(const ::basegfx::B3DHomMatrix& rMatrix); }; } // end of namespace overlay } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx index 6917b49139b7..35e61f32747d 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/sdrsphereprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: sdrsphereprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:14 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,7 @@ namespace drawinglayer sal_uInt32 mnVerticalSegments; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: sdrSpherePrimitive3D( @@ -70,9 +70,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; diff --git a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx index e663518c3b65..a26f2e43003f 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/shadowprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: shadowprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:15 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,8 @@ #ifndef _DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX #define _DRAWINGLAYER_PRIMITIVE3D_SHADOWPRIMITIVE3D_HXX -#ifndef _DRAWINGLAYER_PRIMITIVE_LISTPRIMITIVE_HXX -#include <drawinglayer/primitive/listprimitive.hxx> +#ifndef _DRAWINGLAYER_PRIMITIVE_VECTORPRIMITIVE_HXX +#include <drawinglayer/primitive/vectorprimitive.hxx> #endif #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX @@ -54,7 +54,7 @@ namespace drawinglayer { namespace primitive { - class shadowPrimitive3D : public listPrimitive + class shadowPrimitive3D : public vectorPrimitive { protected: ::basegfx::B2DHomMatrix maShadowTransform; @@ -67,7 +67,7 @@ namespace drawinglayer public: shadowPrimitive3D( const ::basegfx::B2DHomMatrix& rShadowTransform, const ::basegfx::BColor& rShadowColor, - double fShadowTransparence, bool bShadow3D, const primitiveList& rPrimitiveList); + double fShadowTransparence, bool bShadow3D, const primitiveVector& rPrimitiveVector); virtual ~shadowPrimitive3D(); // get data @@ -79,14 +79,8 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; - - // transformations for different aspects - virtual void transform(const ::basegfx::B2DHomMatrix& rMatrix); }; } // end of namespace primitive } // end of namespace drawinglayer diff --git a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx index 25cd863958ff..85dc14523fdf 100644 --- a/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -4,9 +4,9 @@ * * $RCSfile: textureprimitive3d.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: aw $ $Date: 2006-05-12 11:45:15 $ + * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,8 +36,8 @@ #ifndef _DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX #define _DRAWINGLAYER_PRIMITIVE3D_TEXTUREPRIMITIVE3D_HXX -#ifndef _DRAWINGLAYER_PRIMITIVE_LISTPRIMITIVE_HXX -#include <drawinglayer/primitive/listprimitive.hxx> +#ifndef _DRAWINGLAYER_PRIMITIVE_VECTORPRIMITIVE_HXX +#include <drawinglayer/primitive/vectorprimitive.hxx> #endif #ifndef _DRAWINGLAYER_PRIMITIVE_FILLATTRIBUTE_HXX @@ -48,10 +48,6 @@ #include <drawinglayer/primitive/fillbitmapattribute.hxx> #endif -#ifndef _DRAWINGLAYER_PRIMITIVE_PRIMITIVELIST_HXX -#include <drawinglayer/primitive/primitivelist.hxx> -#endif - #ifndef _BGFX_MATRIX_B2DHOMMATRIX_HXX #include <basegfx/matrix/b2dhommatrix.hxx> #endif @@ -62,7 +58,7 @@ namespace drawinglayer { namespace primitive { - class texturePrimitive3D : public listPrimitive + class texturePrimitive3D : public vectorPrimitive { protected: ::basegfx::B2DVector maTextureSize; @@ -76,7 +72,7 @@ namespace drawinglayer public: texturePrimitive3D( - const primitiveList& rPrimitiveList, + const primitiveVector& rPrimitiveVector, const ::basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter); @@ -105,12 +101,12 @@ namespace drawinglayer double mfTransparence; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: simpleTransparenceTexturePrimitive3D( double fTransparence, - const primitiveList& rPrimitiveList); + const primitiveVector& rPrimitiveVector); virtual ~simpleTransparenceTexturePrimitive3D(); // get data @@ -119,9 +115,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; @@ -140,12 +133,12 @@ namespace drawinglayer fillGradientAttribute maGradient; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: gradientTexturePrimitive3D( const fillGradientAttribute& rGradient, - const primitiveList& rPrimitiveList, + const primitiveVector& rPrimitiveVector, const ::basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter); @@ -157,9 +150,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; @@ -178,12 +168,12 @@ namespace drawinglayer fillBitmapAttribute maBitmap; // create decomposition - virtual void decompose(primitiveList& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); + virtual void decompose(primitiveVector& rTarget, const ::drawinglayer::geometry::viewInformation& rViewInformation); public: bitmapTexturePrimitive3D( const fillBitmapAttribute& rBitmap, - const primitiveList& rPrimitiveList, + const primitiveVector& rPrimitiveVector, const ::basegfx::B2DVector& rTextureSize, bool bModulate, bool bFilter); @@ -195,9 +185,6 @@ namespace drawinglayer // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; @@ -215,16 +202,13 @@ namespace drawinglayer public: transparenceTexturePrimitive3D( const fillGradientAttribute& rGradient, - const primitiveList& rPrimitiveList, + const primitiveVector& rPrimitiveVector, const ::basegfx::B2DVector& rTextureSize); virtual ~transparenceTexturePrimitive3D(); // compare operator virtual bool operator==(const basePrimitive& rPrimitive) const; - // clone operator - virtual basePrimitive* createNewClone() const; - // id generator virtual PrimitiveID getID() const; }; |