diff options
Diffstat (limited to 'drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx')
| -rw-r--r-- | drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx | 54 |
1 files changed, 29 insertions, 25 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx b/drawinglayer/inc/drawinglayer/primitive3d/sdrprimitive3d.hxx index 7556f204ae53..d0d98f373a38 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.3 $ + * $Revision: 1.4 $ * - * last change: $Author: aw $ $Date: 2006-06-02 13:57:59 $ + * last change: $Author: aw $ $Date: 2006-08-09 16:38:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -36,26 +36,30 @@ #ifndef _DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX #define _DRAWINGLAYER_PRIMITIVE3D_SDRPRIMITIVE3D_HXX -#ifndef _DRAWINGLAYER_PRIMITIVE_PRIMITIVE_HXX -#include <drawinglayer/primitive/primitive.hxx> +#ifndef _DRAWINGLAYER_PRIMITIVE3D_PRIMITIVE3D_HXX +#include <drawinglayer/primitive3d/primitive3d.hxx> #endif #ifndef _BGFX_MATRIX_B3DHOMMATRIX_HXX #include <basegfx/matrix/b3dhommatrix.hxx> #endif -#ifndef _DRAWINGLAYER_PRIMITIVE3D_SDRALLATTRIBUTE3D_HXX -#include <drawinglayer/primitive3d/sdrallattribute3d.hxx> +#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRALLATTRIBUTE3D_HXX +#include <drawinglayer/attribute/sdrallattribute3d.hxx> #endif -#ifndef _DRAWINGLAYER_PRIMITIVE3D_SDRATTRIBUTE3D_HXX -#include <drawinglayer/primitive3d/sdrattribute3d.hxx> +#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE_HXX +#include <drawinglayer/attribute/sdrattribute.hxx> #endif #ifndef _DRAWINGLAYER_PRIMITIVE3D_SDREXTRUDELATHETOOLS3D_HXX #include <drawinglayer/primitive3d/sdrextrudelathetools3d.hxx> #endif +#ifndef _DRAWINGLAYER_ATTRIBUTE_SDRATTRIBUTE3D_HXX +#include <drawinglayer/attribute/sdrattribute3d.hxx> +#endif + ////////////////////////////////////////////////////////////////////////////// // predefines @@ -63,40 +67,40 @@ namespace drawinglayer { - namespace primitive + namespace primitive3d { - class sdrPrimitive3D : public basePrimitive + class sdrPrimitive3D : public basePrimitive3D { protected: - ::basegfx::B3DHomMatrix maTransform; - ::basegfx::B2DVector maTextureSize; - sdrLineFillShadowAttribute maSdrLFSAttribute; - sdr3DObjectAttribute maSdr3DObjectAttribute; + basegfx::B3DHomMatrix maTransform; + basegfx::B2DVector maTextureSize; + attribute::sdrLineFillShadowAttribute maSdrLFSAttribute; + attribute::sdr3DObjectAttribute maSdr3DObjectAttribute; // Standard implementation for primitive3D which // will use maTransform as range and expand by evtl. line width / 2 - ::basegfx::B3DRange getStandard3DRange(const ::drawinglayer::geometry::viewInformation& rViewInformation) const; + basegfx::B3DRange getStandard3DRange() const; // implementation for primitive3D which // will use given slices and expand by evtl. line width / 2 - ::basegfx::B3DRange get3DRangeFromSlices(const sliceVector& rSlices, const ::drawinglayer::geometry::viewInformation& rViewInformation) const; + basegfx::B3DRange get3DRangeFromSlices(const sliceVector& rSlices) const; public: sdrPrimitive3D( - const ::basegfx::B3DHomMatrix& rTransform, - const ::basegfx::B2DVector& rTextureSize, - const sdrLineFillShadowAttribute& rSdrLFSAttribute, - const sdr3DObjectAttribute& rSdr3DObjectAttribute); + const basegfx::B3DHomMatrix& rTransform, + const basegfx::B2DVector& rTextureSize, + const attribute::sdrLineFillShadowAttribute& rSdrLFSAttribute, + const attribute::sdr3DObjectAttribute& rSdr3DObjectAttribute); virtual ~sdrPrimitive3D(); // compare operator - virtual bool operator==(const basePrimitive& rPrimitive) const; + virtual bool operator==(const basePrimitive3D& rPrimitive) const; // data access - const ::basegfx::B3DHomMatrix& getTransform() const { return maTransform; } - const ::basegfx::B2DVector& getTextureSize() const { return maTextureSize; } - const sdrLineFillShadowAttribute& getSdrLFSAttribute() const { return maSdrLFSAttribute; } - const sdr3DObjectAttribute getSdr3DObjectAttribute() const { return maSdr3DObjectAttribute; } + const basegfx::B3DHomMatrix& getTransform() const { return maTransform; } + const basegfx::B2DVector& getTextureSize() const { return maTextureSize; } + const attribute::sdrLineFillShadowAttribute& getSdrLFSAttribute() const { return maSdrLFSAttribute; } + const attribute::sdr3DObjectAttribute getSdr3DObjectAttribute() const { return maSdr3DObjectAttribute; } }; } // end of namespace overlay } // end of namespace drawinglayer |