[Libreoffice-commits] core.git: Branch 'private/quwex/gsoc-box2d-experimental' - 4 commits - slideshow/Library_slideshow.mk slideshow/source slideshow/test
Sarper Akdemir (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 12 08:48:02 UTC 2020
Rebased ref, commits from common ancestor:
commit be6898681401fa55e0a94db01027b0c24d9a5fd5
Author: Sarper Akdemir <q.sarperakdemir at gmail.com>
AuthorDate: Thu Jun 11 19:29:38 2020 +0300
Commit: Sarper Akdemir <q.sarperakdemir at gmail.com>
CommitDate: Fri Jun 12 11:39:55 2020 +0300
Hacking on PathAnimation class for box2d demo
Change-Id: I1f125df5324673e9937b8164c0fc267c9683afa0
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index f81c37b77df3..d20ba42b2c70 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -35,6 +35,7 @@
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <box2dtools.hxx>
using namespace ::com::sun::star;
@@ -212,7 +213,10 @@ namespace slideshow::internal
maShapeOrig(),
mnFlags( nFlags ),
mbAnimationStarted( false ),
- mnAdditive( nAdditive )
+ mnAdditive( nAdditive ),
+ mpBox2DBody(),
+ mpBox2DWorld(),
+ mfPreviousElapsedTime(0.00f)
{
ENSURE_OR_THROW( rShapeManager,
"PathAnimation::PathAnimation(): Invalid ShapeManager" );
@@ -248,10 +252,29 @@ namespace slideshow::internal
mpShape = rShape;
mpAttrLayer = rAttrLayer;
+ mpBox2DWorld = std::make_shared<box2d::utils::box2DWorld>( maPageSize );
+ mpBox2DBody = std::make_shared<box2d::utils::box2DBody>( mpBox2DWorld->createDynamicBodyFromBoundingBox(
+ rShape, rAttrLayer) );
+
+ auto pXShapeHash = mpShapeManager->getXShapeToShapeMapPtr();
+
+ // iterate over shapes in the current slide
+ for( auto aIt = pXShapeHash->begin(); aIt != pXShapeHash->end(); aIt++ )
+ {
+ ShapeSharedPtr pShape = aIt->second;
+
+ if( pShape->isVisible()
+ && pShape->getPriority() != rShape->getPriority() // checking against our main animation shape
+ && pShape->isForeground() )
+ {
+ mpBox2DWorld->createStaticBodyFromBoundingBox( pShape );
+ }
+ }
+
ENSURE_OR_THROW( rShape,
"PathAnimation::start(): Invalid shape" );
ENSURE_OR_THROW( rAttrLayer,
- "PathAnimation::start(): Invalid attribute layer" );
+ "PathAnimation::(): Invalid attribute layer" );
// TODO(F1): Check whether _shape_ bounds are correct here.
// Theoretically, our AttrLayer is way down the stack, and
@@ -294,23 +317,24 @@ namespace slideshow::internal
ENSURE_OR_RETURN_FALSE( mpAttrLayer && mpShape,
"PathAnimation::operator(): Invalid ShapeAttributeLayer" );
- ::basegfx::B2DPoint rOutPos = ::basegfx::utils::getPositionRelative( maPathPoly,
- nValue );
-
- // TODO(F1): Determine whether the path is
- // absolute, or shape-relative.
+ double fDuration = 40.00f;
+ double fPassedTime = (fDuration * nValue) - mfPreviousElapsedTime;
+ double fTimeStep = 1.0f/60.0f;
- // interpret path as page-relative. Scale up with page size
- rOutPos *= maPageSize;
-
- // TODO(F1): Determine whether the path origin is
- // absolute, or shape-relative.
-
- // interpret path as shape-originated. Offset to shape position
+ for( ; fPassedTime - fTimeStep >= 0; fPassedTime -= fTimeStep )
+ {
+ mpBox2DWorld->step( fTimeStep );
+ mfPreviousElapsedTime += fTimeStep;
+ }
- rOutPos += maShapeOrig;
+ if( (nValue * fDuration) < fDuration )
+ {
+ ::basegfx::B2DPoint rOutPos = mpBox2DBody->getPosition( maPageSize );
+ mpAttrLayer->setPosition( rOutPos );
- mpAttrLayer->setPosition( rOutPos );
+ double fAngle = mpBox2DBody->getAngle();
+ mpAttrLayer->setRotationAngle( fAngle );
+ }
if( mpShape->isContentChanged() )
mpShapeManager->notifyShapeUpdate( mpShape );
@@ -339,6 +363,9 @@ namespace slideshow::internal
const int mnFlags;
bool mbAnimationStarted;
sal_Int16 mnAdditive;
+ box2d::utils::Box2DBodySharedPtr mpBox2DBody;
+ box2d::utils::Box2DWorldSharedPtr mpBox2DWorld;
+ double mfPreviousElapsedTime;
};
commit d9eab7cb47c69748ff6321954b03c8762c9a96dd
Author: Sarper Akdemir <q.sarperakdemir at gmail.com>
AuthorDate: Wed Jun 10 02:33:22 2020 +0300
Commit: Sarper Akdemir <q.sarperakdemir at gmail.com>
CommitDate: Fri Jun 12 11:39:50 2020 +0300
Add Shape mbIsForeground flag and getters and setters for it
mbIsForeground is a flag that is set if a shape is known to not belong
to the foreground.
It is set to false while shapes are being imported and the shape
belongs to the master slide or is a group shape, right now.
Change-Id: I7f7d5cc8b5ca99961049ab7b1062fa20b77884ca
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 88d48b7e72e9..a4e02ac7e0c1 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -83,6 +83,8 @@ namespace slideshow::internal
virtual ::basegfx::B2DRectangle getUpdateArea() const override;
virtual bool isVisible() const override;
virtual double getPriority() const override;
+ virtual bool isForeground() const override;
+ virtual void setIsForeground( const bool bIsForeground) override;
virtual bool isBackgroundDetached() const override;
@@ -98,6 +100,7 @@ namespace slideshow::internal
GDIMetaFileSharedPtr mpMtf;
// The attributes of this Shape
+ bool mbIsForeground;
::basegfx::B2DRectangle maBounds; // always needed for rendering
/// the list of active view shapes (one for each registered view layer)
@@ -111,6 +114,7 @@ namespace slideshow::internal
const uno::Reference< drawing::XDrawPage >& xMasterPage,
const SlideShowContext& rContext ) :
mpMtf(),
+ mbIsForeground(true),
maBounds(),
maViewShapes()
{
@@ -235,6 +239,16 @@ namespace slideshow::internal
return 0.0; // lowest prio, we're the background
}
+ bool BackgroundShape::isForeground() const
+ {
+ return mbIsForeground;
+ }
+
+ void BackgroundShape::setIsForeground( const bool bIsForeground )
+ {
+ mbIsForeground = bIsForeground;
+ }
+
bool BackgroundShape::update() const
{
return render();
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index e8fcd0299ab3..3b9df45dcc91 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -346,6 +346,7 @@ namespace slideshow::internal
? MTF_LOAD_FOREIGN_SOURCE : MTF_LOAD_NONE ),
maCurrentShapeUnitBounds(),
mnPriority( nPrio ), // TODO(F1): When ZOrder someday becomes usable: make this ( getAPIShapePrio( xShape ) ),
+ mbIsForeground(true),
maBounds( getAPIShapeBounds( xShape ) ),
mpAttributeLayer(),
mpIntrinsicAnimationActivity(),
@@ -455,6 +456,7 @@ namespace slideshow::internal
mnCurrMtfLoadFlags( rSrc.mnCurrMtfLoadFlags ),
maCurrentShapeUnitBounds(),
mnPriority( nPrio ),
+ mbIsForeground(true),
maBounds( rSrc.maBounds ),
mpAttributeLayer(),
mpIntrinsicAnimationActivity(),
@@ -796,6 +798,16 @@ namespace slideshow::internal
return mnPriority;
}
+ bool DrawShape::isForeground() const
+ {
+ return mbIsForeground;
+ }
+
+ void DrawShape::setIsForeground(const bool bIsForeground)
+ {
+ mbIsForeground = bIsForeground;
+ }
+
bool DrawShape::isBackgroundDetached() const
{
return mnIsAnimatedCount > 0;
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e4def440fe3d..9e65472fd14a 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -137,6 +137,8 @@ namespace slideshow
virtual ::basegfx::B2DRectangle getUpdateArea() const override;
virtual bool isVisible() const override;
virtual double getPriority() const override;
+ virtual bool isForeground() const override;
+ virtual void setIsForeground( const bool bIsForeground ) override;
// animation methods
@@ -296,6 +298,7 @@ namespace slideshow
// The attributes of this Shape
const double mnPriority;
+ bool mbIsForeground;
::basegfx::B2DRectangle maBounds; // always needed for rendering.
// for subset shapes, this member
// might change when views are
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index aeff0f412cc9..d2aee17170ed 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -85,6 +85,7 @@ namespace slideshow::internal
mpShapeManager( rContext.mpSubsettableShapeManager ),
mrEventMultiplexer( rContext.mrEventMultiplexer ),
mnPriority( nPrio ), // TODO(F1): When ZOrder someday becomes usable: make this ( getAPIShapePrio( xShape ) ),
+ mbIsForeground(true),
maBounds( getAPIShapeBounds( xShape ) )
{
ENSURE_OR_THROW( mxShape.is(), "ExternalShapeBase::ExternalShapeBase(): Invalid XShape" );
@@ -198,6 +199,15 @@ namespace slideshow::internal
return mnPriority;
}
+ bool ExternalShapeBase::isForeground() const
+ {
+ return mbIsForeground;
+ }
+
+ void ExternalShapeBase::setIsForeground( const bool bIsForeground )
+ {
+ mbIsForeground = bIsForeground;
+ }
bool ExternalShapeBase::isBackgroundDetached() const
{
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index 6b455e387f07..f3c5fa63e49f 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -84,6 +84,8 @@ namespace slideshow
virtual ::basegfx::B2DRectangle getUpdateArea() const override;
virtual bool isVisible() const override;
virtual double getPriority() const override;
+ virtual bool isForeground() const override;
+ virtual void setIsForeground( const bool bIsForeground ) override;
virtual bool isBackgroundDetached() const override;
protected:
@@ -122,6 +124,7 @@ namespace slideshow
// The attributes of this Shape
const double mnPriority;
+ bool mbIsForeground;
::basegfx::B2DRectangle maBounds;
};
}
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index b1b1b3417269..60e884ef6696 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -97,12 +97,15 @@ public:
virtual basegfx::B2DRectangle getUpdateArea() const override;
virtual bool isVisible() const override;
virtual double getPriority() const override;
+ virtual bool isForeground() const override;
+ virtual void setIsForeground( const bool bIsForeground ) override;
virtual bool isBackgroundDetached() const override;
private:
ShapeSharedPtr const mpGroupShape;
uno::Reference<drawing::XShape> const mxShape;
double const mnPrio;
+ bool mbIsForeground;
basegfx::B2DPoint maPosOffset;
double mnWidth;
double mnHeight;
@@ -114,7 +117,8 @@ ShapeOfGroup::ShapeOfGroup( ShapeSharedPtr const& pGroupSha
double nPrio ) :
mpGroupShape(pGroupShape),
mxShape(xShape),
- mnPrio(nPrio)
+ mnPrio(nPrio),
+ mbIsForeground(true)
{
// read bound rect
uno::Any const aTmpRect_( xPropSet->getPropertyValue( "BoundRect" ));
@@ -188,6 +192,16 @@ double ShapeOfGroup::getPriority() const
return mnPrio;
}
+bool ShapeOfGroup::isForeground() const
+{
+ return mbIsForeground;
+}
+
+void ShapeOfGroup::setIsForeground(const bool bIsForeground)
+{
+ mbIsForeground = bIsForeground;
+}
+
bool ShapeOfGroup::isBackgroundDetached() const
{
return false;
@@ -426,6 +440,7 @@ ShapeSharedPtr ShapeImporter::importBackgroundShape() // throw (ShapeLoadFailedE
uno::UNO_QUERY_THROW),
mrContext) );
mnAscendingPrio += 1.0;
+ pBgShape->setIsForeground(false);
return pBgShape;
}
@@ -495,6 +510,7 @@ ShapeSharedPtr ShapeImporter::importShape() // throw (ShapeLoadFailedException)
}
if( bIsGroupShape && pRet )
{
+ pRet->setIsForeground(false);
// push new group on the stack: group traversal
maShapesStack.push( XShapesEntry( pRet ) );
}
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 0805d084e9fa..a9120c6da829 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -981,7 +981,10 @@ bool SlideImpl::loadShapes()
ShapeSharedPtr const& rShape(
aMPShapesFunctor.importShape() );
if( rShape )
+ {
+ rShape->setIsForeground(false);
mpLayerManager->addShape( rShape );
+ }
}
addPolygons(aMPShapesFunctor.getPolygons());
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 9b6099462ab6..a522a0f76766 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -204,6 +204,24 @@ namespace slideshow
*/
virtual bool isBackgroundDetached() const = 0;
+ /** Check whether the shape belongs to the foreground
+
+ For instance, if the shape is part of the Master slide
+ it does not belong to the foreground.
+
+ @return true if the shape is on the foreground
+ */
+ virtual bool isForeground() const = 0;
+
+ /**
+ Set the flag that holds wheter the shape is
+ in the foreground or not
+
+ @param bIsForeground
+ Shape is on the foreground
+ */
+ virtual void setIsForeground( const bool bIsForeground ) = 0;
+
// Misc
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index db7031070ba8..d13a05f2be1e 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -44,6 +44,7 @@ class ImplTestShape : public TestShape,
ViewVector maViewLayers;
const basegfx::B2DRange maRect;
const double mnPrio;
+ bool mbIsForeground;
sal_Int32 mnAnimated;
mutable sal_Int32 mnNumUpdates;
mutable sal_Int32 mnNumRenders;
@@ -55,6 +56,7 @@ public:
maViewLayers(),
maRect( rRect ),
mnPrio( nPrio ),
+ mbIsForeground(true),
mnAnimated(0),
mnNumUpdates(0),
mnNumRenders(0)
@@ -175,6 +177,14 @@ private:
{
return mnPrio;
}
+ virtual bool isForeground() const override
+ {
+ return mbIsForeground;
+ }
+ virtual void setIsForeground( const bool bIsForeground ) override
+ {
+ mbIsForeground = bIsForeground;
+ }
virtual bool isBackgroundDetached() const override
{
return mnAnimated != 0;
commit 2981d1584d2daaea81bfcf0ead436ca34aa32f1f
Author: Sarper Akdemir <q.sarperakdemir at gmail.com>
AuthorDate: Wed Jun 10 02:11:36 2020 +0300
Commit: Sarper Akdemir <q.sarperakdemir at gmail.com>
CommitDate: Fri Jun 12 11:39:45 2020 +0300
adding XShapeHashMapSharedPtr getter to ShapeManager
Refactoring XShapeHash in layermanager as XShapeToShapeMap
and XShapeHash in targetpropertiescreator as XShapeToNamedValuesMap.
This refactoring describes what the types are more clearly and
stops violating one define rule in the desired implementation.
In layer manager getting XShapeToShapeMap ready to be passed around
changing it to be a shared pointer.
And adding getter getXShapeToShapeMap to ShapeManager to enable
Animation::start() to access Shapes and XShapes of the current
slide.
Change-Id: Ida2554b6727861b9be13acc09e2356fdd1793b3e
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index 2ec37ee2c6ff..2a491197d8b4 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -67,7 +67,7 @@ namespace slideshow::internal
bool bDisableAnimationZOrder ) :
mrViews(rViews),
maLayers(),
- maXShapeHash( 101 ),
+ mpXShapeHash( std::make_shared<XShapeToShapeMap>(101) ),
maAllShapes(),
maUpdateShapes(),
mnActiveSprites(0),
@@ -210,7 +210,7 @@ namespace slideshow::internal
ENSURE_OR_THROW( rShape, "LayerManager::addShape(): invalid Shape" );
// add shape to XShape hash map
- if( !maXShapeHash.emplace(rShape->getXShape(),
+ if( !mpXShapeHash->emplace(rShape->getXShape(),
rShape).second )
{
// entry already present, nothing to do
@@ -252,7 +252,7 @@ namespace slideshow::internal
bool LayerManager::removeShape( const ShapeSharedPtr& rShape )
{
// remove shape from XShape hash map
- if( maXShapeHash.erase( rShape->getXShape() ) == 0 )
+ if( mpXShapeHash->erase( rShape->getXShape() ) == 0 )
return false; // shape not in map
OSL_ASSERT( maAllShapes.find(rShape) != maAllShapes.end() );
@@ -302,8 +302,8 @@ namespace slideshow::internal
{
ENSURE_OR_THROW( xShape.is(), "LayerManager::lookupShape(): invalid Shape" );
- const XShapeHash::const_iterator aIter( maXShapeHash.find( xShape ));
- if( aIter == maXShapeHash.end() )
+ const XShapeToShapeMap::const_iterator aIter( mpXShapeHash->find( xShape ));
+ if( aIter == mpXShapeHash->end() )
return ShapeSharedPtr(); // not found
// found, return data part of entry pair.
@@ -341,6 +341,11 @@ namespace slideshow::internal
return pSubset;
}
+ XShapeToShapeMapSharedPtr LayerManager::getXShapeToShapeMapPtr() const
+ {
+ return mpXShapeHash;
+ }
+
void LayerManager::revokeSubset( const AttributableShapeSharedPtr& rOrigShape,
const AttributableShapeSharedPtr& rSubsetShape )
{
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index 0f2844ced967..728de62223fe 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -38,6 +38,17 @@ namespace slideshow
{
namespace internal
{
+ /** A hash map which maps the XShape to the corresponding Shape object.
+
+ Provides quicker lookup than ShapeSet for simple mappings
+ */
+ typedef std::unordered_map<
+ css::uno::Reference< css::drawing::XShape >,
+ ShapeSharedPtr,
+ hash< css::uno::Reference< css::drawing::XShape > >
+ > XShapeToShapeMap;
+
+ typedef std::shared_ptr<XShapeToShapeMap> XShapeToShapeMapSharedPtr;
/* Definition of Layermanager class */
/** This class manages all of a slide's layers (and shapes)
@@ -132,6 +143,13 @@ namespace slideshow
AttributableShapeSharedPtr getSubsetShape( const AttributableShapeSharedPtr& rOrigShape,
const DocTreeNode& rTreeNode );
+ /** Get a map that maps all Shapes with their XShape reference as the key
+ *
+ * @return an unordered map shared pointer that contains all shapes in the
+ * current page with their XShape reference as the key
+ */
+ XShapeToShapeMapSharedPtr getXShapeToShapeMapPtr() const;
+
/** Revoke a previously queried subset shape.
With this method, a previously requested subset shape
@@ -219,15 +237,7 @@ namespace slideshow
bool renderTo( const ::cppcanvas::CanvasSharedPtr& rTargetCanvas ) const;
private:
- /** A hash map which maps the XShape to the corresponding Shape object.
- Provides quicker lookup than ShapeSet for simple mappings
- */
- typedef std::unordered_map<
- css::uno::Reference< css::drawing::XShape >,
- ShapeSharedPtr,
- hash< css::uno::Reference< css::drawing::XShape > >
- > XShapeHash;
class ShapeComparator
{
@@ -311,7 +321,7 @@ namespace slideshow
/** Contains all shapes with their XShape reference as the key
*/
- XShapeHash maXShapeHash;
+ XShapeToShapeMapSharedPtr mpXShapeHash;
/** Set of shapes this LayerManager own
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx
index 7863f7e7412b..8db0f0d3c22c 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.cxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx
@@ -267,6 +267,14 @@ ShapeSharedPtr ShapeManagerImpl::lookupShape( uno::Reference< drawing::XShape >
return ShapeSharedPtr();
}
+XShapeToShapeMapSharedPtr ShapeManagerImpl::getXShapeToShapeMapPtr() const
+{
+ if( mpLayerManager )
+ return mpLayerManager->getXShapeToShapeMapPtr();
+
+ return XShapeToShapeMapSharedPtr();
+}
+
void ShapeManagerImpl::addHyperlinkArea( const HyperlinkAreaSharedPtr& rArea )
{
maHyperlinkShapes.insert(rArea);
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 9730975630b0..169bc885f18d 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -120,6 +120,7 @@ private:
virtual void notifyShapeUpdate( const ShapeSharedPtr& rShape ) override;
virtual ShapeSharedPtr lookupShape(
css::uno::Reference< css::drawing::XShape > const & xShape ) const override;
+ virtual XShapeToShapeMapSharedPtr getXShapeToShapeMapPtr() const override;
virtual void addHyperlinkArea( const HyperlinkAreaSharedPtr& rArea ) override;
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index 7a70b8b63352..b159bc6c2778 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -85,14 +85,14 @@ namespace slideshow::internal
};
// A hash map which maps a XShape to the corresponding vector of initial properties
- typedef std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeHash;
+ typedef std::unordered_map< ShapeHashKey, VectorOfNamedValues, ShapeKeyHasher > XShapeToNamedValuesMap;
class NodeFunctor
{
public:
explicit NodeFunctor(
- XShapeHash& rShapeHash,
+ XShapeToNamedValuesMap& rShapeHash,
bool bInitial )
: mrShapeHash( rShapeHash ),
mxTargetShape(),
@@ -101,7 +101,7 @@ namespace slideshow::internal
{
}
- NodeFunctor( XShapeHash& rShapeHash,
+ NodeFunctor( XShapeToNamedValuesMap& rShapeHash,
const uno::Reference< drawing::XShape >& rTargetShape,
sal_Int16 nParagraphIndex,
bool bInitial) :
@@ -307,7 +307,7 @@ namespace slideshow::internal
}
private:
- XShapeHash& mrShapeHash;
+ XShapeToNamedValuesMap& mrShapeHash;
uno::Reference< drawing::XShape > mxTargetShape;
sal_Int16 mnParagraphIndex;
@@ -324,7 +324,7 @@ namespace slideshow::internal
{
// scan all nodes for visibility changes, and record first
// 'visibility=true' for each shape
- XShapeHash aShapeHash( 101 );
+ XShapeToNamedValuesMap aShapeHash( 101 );
NodeFunctor aFunctor(
aShapeHash,
diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx
index ef2e40de6466..6931214ca644 100644
--- a/slideshow/source/inc/shapemanager.hxx
+++ b/slideshow/source/inc/shapemanager.hxx
@@ -23,6 +23,8 @@
#include "disposable.hxx"
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
+#include <unordered_map>
+#include "tools.hxx"
namespace com::sun::star::drawing { class XShape; }
@@ -35,9 +37,15 @@ namespace slideshow
class HyperlinkArea;
class AnimatableShape;
class Shape;
+ typedef std::unordered_map<
+ css::uno::Reference< css::drawing::XShape >,
+ ShapeSharedPtr,
+ hash< css::uno::Reference< css::drawing::XShape > >
+ > XShapeToShapeMap;
typedef ::std::shared_ptr< AnimatableShape > AnimatableShapeSharedPtr;
typedef ::std::shared_ptr< Shape > ShapeSharedPtr;
typedef std::shared_ptr< HyperlinkArea > HyperlinkAreaSharedPtr;
+ typedef std::shared_ptr<XShapeToShapeMap> XShapeToShapeMapSharedPtr;
/** ShapeManager interface
@@ -92,6 +100,13 @@ namespace slideshow
virtual ShapeSharedPtr lookupShape(
css::uno::Reference< css::drawing::XShape > const & xShape ) const = 0;
+ /** Get a map that maps all Shapes with their XShape reference as the key
+ *
+ * @return an unordered map shared pointer that contains all shapes in the
+ * current page with their XShape reference as the key
+ */
+ virtual XShapeToShapeMapSharedPtr getXShapeToShapeMapPtr() const = 0;
+
/** Register given shape as a hyperlink target
@param rArea
commit f15c17db9e8c8314c28141f67e2cd153b51616d5
Author: Sarper Akdemir <q.sarperakdemir at gmail.com>
AuthorDate: Fri Jun 5 20:23:21 2020 +0300
Commit: Sarper Akdemir <q.sarperakdemir at gmail.com>
CommitDate: Fri Jun 12 11:39:30 2020 +0300
box2d tools: initial work for physics based animation effects
Two new classes for managing box2d bodies(b2Body) and box2d worlds(b2World)
::box2d::utils::Box2DBody :
Since b2Body has a private constructor, it is forbidden to make a shared_ptr
out of it.
When there are multiple parallel physics based animation effects going on,
it will be useful to share b2Body pointers around.
This class will help with that and also has get methods that return LO types
instead of box2d ones.
::box2d::utils::Box2DWorld :
A class that manages b2World with convenient functions that will be needed
during animation effects.
Change-Id: Id02fefe937347029daddde043da2b8e8dba3acaf
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 55c531a86f43..53324ea25dcc 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_Library_set_precompiled_header,slideshow,slideshow/inc/pch/prec
$(eval $(call gb_Library_use_externals,slideshow,\
boost_headers \
+ box2d \
))
ifeq ($(DISABLE_GUI),)
$(eval $(call gb_Library_use_externals,slideshow,\
@@ -84,6 +85,7 @@ $(eval $(call gb_Library_add_exception_objects,slideshow,\
slideshow/source/engine/animationnodes/propertyanimationnode \
slideshow/source/engine/animationnodes/sequentialtimecontainer \
slideshow/source/engine/attributemap \
+ slideshow/source/engine/box2dtools \
slideshow/source/engine/color \
slideshow/source/engine/delayevent \
slideshow/source/engine/effectrewinder \
diff --git a/slideshow/source/engine/box2dtools.cxx b/slideshow/source/engine/box2dtools.cxx
new file mode 100644
index 000000000000..e10761804f0c
--- /dev/null
+++ b/slideshow/source/engine/box2dtools.cxx
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <box2dtools.hxx>
+#include <basegfx/numeric/ftools.hxx>
+#include <sal/log.hxx>
+
+namespace box2d::utils
+{
+double calculateScaleFactor(const ::basegfx::B2DVector& rSlideSize)
+{
+ double fWidth = rSlideSize.getX();
+ double fHeight = rSlideSize.getY();
+
+ if (fWidth > fHeight)
+ return BOX2D_SLIDE_SIZE_IN_METERS / fWidth;
+ else
+ return BOX2D_SLIDE_SIZE_IN_METERS / fHeight;
+}
+
+box2DWorld::box2DWorld(const ::basegfx::B2DVector& rSlideSize, const float fGravityX,
+ const float fGravityY)
+ : maBox2DWorld(b2Vec2(fGravityX, fGravityY))
+ , mfScaleFactor(calculateScaleFactor(rSlideSize))
+{
+ createStaticFrameAroundSlide(rSlideSize);
+}
+
+b2Body* box2DWorld::createStaticFrameAroundSlide(const ::basegfx::B2DVector& rSlideSize)
+{
+ float fWidth = static_cast<float>(rSlideSize.getX() * mfScaleFactor);
+
+ // temporary solution that assumes slide is in 16 / 9
+ // since rSlide appears to give a square
+ float fHeight = BOX2D_SLIDE_SIZE_IN_METERS * 9 / 16;
+
+ // static body for creating the frame made out of four walls
+ b2BodyDef aBodyDef;
+ aBodyDef.type = b2_staticBody;
+ aBodyDef.position.Set(0, 0);
+ b2Body* pStaticBody = maBox2DWorld.CreateBody(&aBodyDef);
+
+ b2PolygonShape aPolygonShape;
+
+ b2FixtureDef aFixtureDef;
+ aFixtureDef.shape = &aPolygonShape;
+
+ //add four walls to the static body
+ aPolygonShape.SetAsBox(fWidth / 2.0f, 1.0f / 10.0f, // ground wall
+ b2Vec2(fWidth / 2, -fHeight - 1.0f / 10.0f), 0);
+ pStaticBody->CreateFixture(&aFixtureDef);
+
+ aPolygonShape.SetAsBox(fWidth / 2.0f, 1.0f / 10.0f, // ceiling wall
+ b2Vec2(fWidth / 2, 1.0f / 10.0f), 0);
+ pStaticBody->CreateFixture(&aFixtureDef);
+
+ aPolygonShape.SetAsBox(1.0f / 10.0f, fHeight / 2, // left wall
+ b2Vec2(-1.0f / 10.0f, -fHeight / 2), 0);
+ pStaticBody->CreateFixture(&aFixtureDef);
+
+ aPolygonShape.SetAsBox(1.0f / 10.0f, fHeight / 2.0f, // right wall
+ b2Vec2(fWidth + 1.0f / 10.0f, -fHeight / 2), 0);
+ pStaticBody->CreateFixture(&aFixtureDef);
+
+ return pStaticBody;
+}
+
+void box2DWorld::step(const float fTimeStep, const int nVelocityIterations,
+ const int nPositionIterations)
+{
+ maBox2DWorld.Step(fTimeStep, nVelocityIterations, nPositionIterations);
+}
+
+b2Body* box2DWorld::createDynamicBodyFromBoundingBox(
+ const slideshow::internal::ShapeSharedPtr& rShape,
+ const slideshow::internal::ShapeAttributeLayerSharedPtr& rAttrLayer, const float fDensity,
+ const float fFriction)
+{
+ ::basegfx::B2DRectangle aShapeBounds = rShape->getBounds();
+ double fShapeWidth = aShapeBounds.getWidth() * mfScaleFactor;
+ double fShapeHeight = aShapeBounds.getHeight() * mfScaleFactor;
+
+ double fRotationAngle = ::basegfx::deg2rad(-rAttrLayer->getRotationAngle());
+
+ ::basegfx::B2DPoint aShapePosition = aShapeBounds.getCenter();
+ float fBodyPosX = aShapePosition.getX() * mfScaleFactor;
+ float fBodyPosY = aShapePosition.getY() * -mfScaleFactor;
+
+ b2BodyDef aBodyDef;
+ aBodyDef.type = b2_dynamicBody;
+ aBodyDef.position.Set(fBodyPosX, fBodyPosY);
+ aBodyDef.angle = static_cast<float>(fRotationAngle);
+
+ b2Body* pBody = maBox2DWorld.CreateBody(&aBodyDef);
+
+ b2PolygonShape aDynamicBox;
+ aDynamicBox.SetAsBox(static_cast<float>(fShapeWidth / 2), static_cast<float>(fShapeHeight / 2));
+
+ b2FixtureDef aFixtureDef;
+ aFixtureDef.shape = &aDynamicBox;
+ aFixtureDef.density = fDensity;
+ aFixtureDef.friction = fFriction;
+
+ pBody->CreateFixture(&aFixtureDef);
+ return pBody;
+}
+
+b2Body*
+box2DWorld::createStaticBodyFromBoundingBox(const slideshow::internal::ShapeSharedPtr& rShape,
+ const float fDensity, const float fFriction)
+{
+ ::basegfx::B2DRectangle aShapeBounds = rShape->getBounds();
+ double fShapeWidth = aShapeBounds.getWidth() * mfScaleFactor;
+ double fShapeHeight = aShapeBounds.getHeight() * mfScaleFactor;
+
+ ::basegfx::B2DPoint aShapePosition = aShapeBounds.getCenter();
+ float fBodyPosX = aShapePosition.getX() * mfScaleFactor;
+ float fBodyPosY = aShapePosition.getY() * -mfScaleFactor;
+
+ b2BodyDef aBodyDef;
+ aBodyDef.type = b2_staticBody;
+ aBodyDef.position.Set(fBodyPosX, fBodyPosY);
+
+ b2Body* pBody = maBox2DWorld.CreateBody(&aBodyDef);
+
+ b2PolygonShape aDynamicBox;
+ aDynamicBox.SetAsBox(static_cast<float>(fShapeWidth / 2), static_cast<float>(fShapeHeight / 2));
+
+ b2FixtureDef aFixtureDef;
+ aFixtureDef.shape = &aDynamicBox;
+ aFixtureDef.density = fDensity;
+ aFixtureDef.friction = fFriction;
+
+ pBody->CreateFixture(&aFixtureDef);
+ return pBody;
+}
+
+box2DBody::box2DBody(b2Body* pBox2DBody)
+ : mpBox2DBody(pBox2DBody){};
+
+::basegfx::B2DPoint box2DBody::getPosition(const ::basegfx::B2DVector& rSlideSize)
+{
+ double fScaleFactor = calculateScaleFactor(rSlideSize);
+ b2Vec2 aPosition = mpBox2DBody->GetPosition();
+ double fX = static_cast<double>(aPosition.x) / fScaleFactor;
+ double fY = static_cast<double>(aPosition.y) / -fScaleFactor;
+ return ::basegfx::B2DPoint(fX, fY);
+}
+
+double box2DBody::getAngle()
+{
+ double fAngle = static_cast<double>(mpBox2DBody->GetAngle());
+ return ::basegfx::rad2deg(-fAngle);
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/inc/box2dtools.hxx b/slideshow/source/inc/box2dtools.hxx
new file mode 100644
index 000000000000..105556be879c
--- /dev/null
+++ b/slideshow/source/inc/box2dtools.hxx
@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include <Box2D/Box2D.h>
+#include "animatableshape.hxx"
+#include "shapeattributelayer.hxx"
+
+#define BOX2D_SLIDE_SIZE_IN_METERS 100.00f
+
+namespace box2d::utils
+{
+double calculateScaleFactor(const ::basegfx::B2DVector& rSlideSize);
+
+class box2DWorld
+{
+private:
+ b2World maBox2DWorld;
+ double mfScaleFactor;
+
+ b2Body* createStaticFrameAroundSlide(const ::basegfx::B2DVector& rSlideSize);
+
+public:
+ box2DWorld(const ::basegfx::B2DVector& rSlideSize, const float fGravityX = 0.0f,
+ const float fGravityY = -10.0f);
+
+ box2DWorld(box2DWorld&) = delete;
+
+ void step(const float fTimeStep = 1.0f / 60.0f, const int nVelocityIterations = 6,
+ const int nPositionIterations = 2);
+
+ b2Body* createDynamicBodyFromBoundingBox(
+ const slideshow::internal::ShapeSharedPtr& rShape,
+ const slideshow::internal::ShapeAttributeLayerSharedPtr& rAttrLayer,
+ const float fDensity = 1.0f, const float fFriction = 0.3f);
+
+ b2Body* createStaticBodyFromBoundingBox(const slideshow::internal::ShapeSharedPtr& rShape,
+ const float fDensity = 1.0f,
+ const float fFriction = 0.3f);
+};
+
+class box2DBody
+{
+private:
+ b2Body* mpBox2DBody;
+
+public:
+ box2DBody(b2Body* pBox2DBody);
+
+ ::basegfx::B2DPoint getPosition(const ::basegfx::B2DVector& rSlideSize);
+ double getAngle();
+};
+
+typedef std::shared_ptr<box2DWorld> Box2DWorldSharedPtr;
+typedef std::shared_ptr<box2DBody> Box2DBodySharedPtr;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list