#i39532# corrections

1 files changed, 61 insertions, 16 deletions

diff --git a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
index 1493b221c3af..c4377bb16c62 100644
--- a/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/embedded3dprimitive2d.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: embedded3dprimitive2d.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: aw $ $Date: 2008-06-10 09:29:32 $
+ *  last change: $Author: aw $ $Date: 2008-06-24 15:31:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,6 +45,7 @@
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
+#include <drawinglayer/processor3d/shadow3dextractor.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -56,33 +57,62 @@ namespace drawinglayer
 {
     namespace primitive2d
     {
-        Primitive2DSequence Embedded3DPrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        bool Embedded3DPrimitive2D::impGetShadow3D(const geometry::ViewInformation2D& /*rViewInformation*/) const
         {
-            // use info to create a yellow 2d rectangle, similar to empty 3d scenes and/or groups
-            basegfx::B3DRange a3DRange(primitive3d::getB3DRangeFromPrimitive3DSequence(getChildren3D(), getViewInformation3D()));
-            a3DRange.transform(getViewInformation3D().getObjectToView());
+            osl::MutexGuard aGuard( m_aMutex );
 
-            // create 2d range from projected 3d and transform with scene's object transformation
-            basegfx::B2DRange a2DRange;
-            a2DRange.expand(basegfx::B2DPoint(a3DRange.getMinX(), a3DRange.getMinY()));
-            a2DRange.expand(basegfx::B2DPoint(a3DRange.getMaxX(), a3DRange.getMaxY()));
-            a2DRange.transform(getObjectTransformation());
+            // create on demand
+            if(!mbShadow3DChecked && getChildren3D().hasElements())
+            {
+                // create shadow extraction processor
+                processor3d::Shadow3DExtractingProcessor aShadowProcessor(
+                    getViewInformation3D(),
+                    getObjectTransformation(),
+                    getLightNormal(),
+                    getShadowSlant(),
+                    getScene3DRange());
+
+                // process local primitives
+                aShadowProcessor.process(getChildren3D());
+
+                // fetch result and set checked flag
+                const_cast< Embedded3DPrimitive2D* >(this)->maShadowPrimitives = aShadowProcessor.getPrimitive2DSequence();
+                const_cast< Embedded3DPrimitive2D* >(this)->mbShadow3DChecked = true;
+            }
+
+            // return if there are shadow primitives
+            return maShadowPrimitives.hasElements();
+        }
 
-            const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(a2DRange));
+        Primitive2DSequence Embedded3DPrimitive2D::createLocalDecomposition(const geometry::ViewInformation2D& rViewInformation) const
+        {
+            // use info to create a yellow 2d rectangle, similar to empty 3d scenes and/or groups
+            const basegfx::B2DRange aLocal2DRange(getB2DRange(rViewInformation));
+            const basegfx::B2DPolygon aOutline(basegfx::tools::createPolygonFromRect(aLocal2DRange));
             const basegfx::BColor aYellow(1.0, 1.0, 0.0);
             const Primitive2DReference xRef(new PolygonHairlinePrimitive2D(aOutline, aYellow));
+
             return Primitive2DSequence(&xRef, 1L);
         }
 
         Embedded3DPrimitive2D::Embedded3DPrimitive2D(
             const primitive3d::Primitive3DSequence& rxChildren3D,
             const basegfx::B2DHomMatrix& rObjectTransformation,
-            const geometry::ViewInformation3D& rViewInformation3D)
+            const geometry::ViewInformation3D& rViewInformation3D,
+            const basegfx::B3DVector& rLightNormal,
+            double fShadowSlant,
+            const basegfx::B3DRange& rScene3DRange)
         :   BasePrimitive2D(),
             mxChildren3D(rxChildren3D),
             maObjectTransformation(rObjectTransformation),
-            maViewInformation3D(rViewInformation3D)
+            maViewInformation3D(rViewInformation3D),
+            maLightNormal(rLightNormal),
+            mfShadowSlant(fShadowSlant),
+            maScene3DRange(rScene3DRange),
+            maShadowPrimitives(),
+            mbShadow3DChecked(false)
         {
+            maLightNormal.normalize();
         }
 
         bool Embedded3DPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
@@ -93,13 +123,16 @@ namespace drawinglayer
 
                 return (primitive3d::arePrimitive3DSequencesEqual(getChildren3D(), rCompare.getChildren3D())
                     && getObjectTransformation() == rCompare.getObjectTransformation()
-                    && getViewInformation3D() == rCompare.getViewInformation3D());
+                    && getViewInformation3D() == rCompare.getViewInformation3D()
+                    && getLightNormal() == rCompare.getLightNormal()
+                    && getShadowSlant() == rCompare.getShadowSlant()
+                    && getScene3DRange() == rCompare.getScene3DRange());
             }
 
             return false;
         }
 
-        basegfx::B2DRange Embedded3DPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
+        basegfx::B2DRange Embedded3DPrimitive2D::getB2DRange(const geometry::ViewInformation2D& rViewInformation) const
         {
             // use the 3d transformation stack to create a projection of the 3D range
             basegfx::B3DRange a3DRange(primitive3d::getB3DRangeFromPrimitive3DSequence(getChildren3D(), getViewInformation3D()));
@@ -111,6 +144,18 @@ namespace drawinglayer
             aRetval.expand(basegfx::B2DPoint(a3DRange.getMaxX(), a3DRange.getMaxY()));
             aRetval.transform(getObjectTransformation());
 
+            // cehck for 3D shadows and their 2D projections. If those exist, they need to be
+            // taken into account
+            if(impGetShadow3D(rViewInformation))
+            {
+                const basegfx::B2DRange aShadow2DRange(getB2DRangeFromPrimitive2DSequence(maShadowPrimitives, rViewInformation));
+
+                if(!aShadow2DRange.isEmpty())
+                {
+                    aRetval.expand(aShadow2DRange);
+                }
+            }
+
             return aRetval;
         }