X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fscrollable%2Fitem-view%2Fitem-layout.cpp;h=6b570ccf57fc15735d3fbf9a3927852205109fc6;hb=ac9c307fe5d0ab147938397a7d078fb858cc1f4b;hp=54809c32bbaf0ed7854d723ba28b54fe4365e763;hpb=d011049f576aaf534d52180829398b917e08de04;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp index 54809c3..6b570cc 100644 --- a/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp +++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-layout.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ #include // EXTERNAL INCLUDES -#include +#include #include #include @@ -29,82 +29,125 @@ namespace { - // Functors which wrap constraint functions with stored item IDs - struct WrappedQuaternionConstraint +// Lerps between initial and target using the progress +template< typename Type > +void Lerp( Type& current, const Type& initial, const Type& target, float progress ) +{ + current = initial + ((target - initial) * progress); +} + +// Functors which wrap constraint functions with stored item IDs +struct WrappedQuaternionConstraint +{ + WrappedQuaternionConstraint( Dali::Toolkit::ItemLayout::QuaternionFunction wrapMe, unsigned int itemId ) + :mWrapMe(wrapMe), + mItemId(itemId), + mInitialised( false ) { - WrappedQuaternionConstraint(Dali::Toolkit::ItemLayout::QuaternionFunction wrapMe, unsigned int itemId) - :mWrapMe(wrapMe), - mItemId(itemId) + } + + void operator()( Dali::Quaternion& current, const Dali::PropertyInputContainer& inputs ) + { + float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); + float weight = inputs[3]->GetFloat(); + + if( !mInitialised ) { + mInitialised = true; + mInitial = current; } - Dali::Quaternion operator()(const Dali::Quaternion& current, const Dali::PropertyInput& layoutPosition, const Dali::PropertyInput& scrollSpeed, const Dali::PropertyInput& layoutSize) - { - float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast(mItemId); + current = Dali::Quaternion::Slerp( mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); + } - return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3()); - } + Dali::Toolkit::ItemLayout::QuaternionFunction mWrapMe; + unsigned int mItemId; + Dali::Quaternion mInitial; + bool mInitialised:1; +}; - Dali::Toolkit::ItemLayout::QuaternionFunction mWrapMe; - unsigned int mItemId; - }; +struct WrappedVector3Constraint +{ + WrappedVector3Constraint( Dali::Toolkit::ItemLayout::Vector3Function wrapMe, unsigned int itemId ) + : mWrapMe(wrapMe), + mItemId(itemId), + mInitial(), + mInitialised( false ) + { + } - struct WrappedVector3Constraint + void operator()( Dali::Vector3& current, const Dali::PropertyInputContainer& inputs ) { - WrappedVector3Constraint(Dali::Toolkit::ItemLayout::Vector3Function wrapMe, unsigned int itemId) - : mWrapMe(wrapMe), - mItemId(itemId) + float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); + float weight = inputs[3]->GetFloat(); + + if( !mInitialised ) { + mInitialised = true; + mInitial = current; } - Dali::Vector3 operator()(const Dali::Vector3& current, const Dali::PropertyInput& layoutPosition, const Dali::PropertyInput& scrollSpeed, const Dali::PropertyInput& layoutSize) - { - float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast(mItemId); + Lerp( current, mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); + } - return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3()); - } + Dali::Toolkit::ItemLayout::Vector3Function mWrapMe; + unsigned int mItemId; + Dali::Vector3 mInitial; + bool mInitialised:1; +}; - Dali::Toolkit::ItemLayout::Vector3Function mWrapMe; - unsigned int mItemId; - }; +struct WrappedVector4Constraint +{ + WrappedVector4Constraint( Dali::Toolkit::ItemLayout::Vector4Function wrapMe, unsigned int itemId ) + : mWrapMe(wrapMe), + mItemId(itemId), + mInitial(), + mInitialised( false ) + { + } - struct WrappedVector4Constraint + void operator()( Dali::Vector4& current, const Dali::PropertyInputContainer& inputs ) { - WrappedVector4Constraint(Dali::Toolkit::ItemLayout::Vector4Function wrapMe, unsigned int itemId) - : mWrapMe(wrapMe), - mItemId(itemId) + float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); + float weight = inputs[3]->GetFloat(); + + if( !mInitialised ) { + mInitialised = true; + mInitial = current; } - Dali::Vector4 operator()(const Dali::Vector4& current, const Dali::PropertyInput& layoutPosition, const Dali::PropertyInput& scrollSpeed, const Dali::PropertyInput& layoutSize) - { - float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast(mItemId); + Lerp( current, mInitial, mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ), weight ); + } - return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3()); - } + Dali::Toolkit::ItemLayout::Vector4Function mWrapMe; + unsigned int mItemId; + Dali::Vector4 mInitial; + bool mInitialised:1; +}; - Dali::Toolkit::ItemLayout::Vector4Function mWrapMe; - unsigned int mItemId; - }; +struct WrappedBoolConstraint +{ + WrappedBoolConstraint( Dali::Toolkit::ItemLayout::BoolFunction wrapMe, unsigned int itemId ) + : mWrapMe(wrapMe), + mItemId(itemId) + { + } - struct WrappedBoolConstraint + void operator()( bool& current, const Dali::PropertyInputContainer& inputs ) { - WrappedBoolConstraint(Dali::Toolkit::ItemLayout::BoolFunction wrapMe, unsigned int itemId) - : mWrapMe(wrapMe), - mItemId(itemId) - { - } + float weight = inputs[3]->GetFloat(); - bool operator()(const bool& current, const Dali::PropertyInput& layoutPosition, const Dali::PropertyInput& scrollSpeed, const Dali::PropertyInput& layoutSize) + if ( weight >= 1.0f ) { - float offsetLayoutPosition = layoutPosition.GetFloat() + static_cast(mItemId); - - return mWrapMe(current, offsetLayoutPosition, scrollSpeed.GetFloat(), layoutSize.GetVector3()); + float offsetLayoutPosition = inputs[0]->GetFloat() + static_cast(mItemId); + current = mWrapMe( current, offsetLayoutPosition, inputs[1]->GetFloat(), inputs[2]->GetVector3() ); } + } - Dali::Toolkit::ItemLayout::BoolFunction mWrapMe; - unsigned int mItemId; - }; + Dali::Toolkit::ItemLayout::BoolFunction mWrapMe; + unsigned int mItemId; +}; } //Unnamed namespace @@ -115,8 +158,9 @@ namespace Toolkit { ItemLayout::ItemLayout() -: mOrientation(ControlOrientation::Up), - mAlphaFunction(Dali::Constraint::DEFAULT_ALPHA_FUNCTION) +: mOrientation( ControlOrientation::Up ), + mAlphaFunction( AlphaFunction::LINEAR ), + mWeightObject() { } @@ -196,18 +240,22 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d Property::Index scrollSpeedProperty = itemView.GetPropertyIndex("item-view-scroll-speed"); Property::Index scrollPositionProperty = scrollPositionObject.GetPropertyIndex("scroll-position"); + // We want to animate the layout in so use a weight object to do this + if ( !mWeightObject ) + { + mWeightObject = WeightObject::New(); + } + ItemLayout::Vector3Function positionConstraint; if (GetPositionConstraint(itemId, positionConstraint)) { WrappedVector3Constraint wrapped(positionConstraint, itemId); - Constraint constraint = Constraint::New( Actor::Property::POSITION, - Source( scrollPositionObject, scrollPositionProperty ), - ParentSource( scrollSpeedProperty ), - ParentSource( Actor::Property::SIZE ), - wrapped ); - constraint.SetApplyTime(durationSeconds); - constraint.SetAlphaFunction(mAlphaFunction); - actor.ApplyConstraint(constraint); + Constraint constraint = Constraint::New( actor, Actor::Property::POSITION, wrapped ); + constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); + constraint.AddSource( ParentSource( scrollSpeedProperty ) ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); + constraint.Apply(); } ItemLayout::QuaternionFunction rotationConstraint; @@ -215,15 +263,12 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedQuaternionConstraint wrapped(rotationConstraint, itemId); - Constraint constraint = Constraint::New( Actor::Property::ORIENTATION, - Source( scrollPositionObject, scrollPositionProperty ), - ParentSource( scrollSpeedProperty ), - ParentSource( Actor::Property::SIZE ), - wrapped ); - constraint.SetApplyTime(durationSeconds); - constraint.SetAlphaFunction(mAlphaFunction); - - actor.ApplyConstraint(constraint); + Constraint constraint = Constraint::New( actor, Actor::Property::ORIENTATION, wrapped ); + constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); + constraint.AddSource( ParentSource( scrollSpeedProperty ) ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); + constraint.Apply(); } ItemLayout::Vector3Function scaleConstraint; @@ -231,15 +276,12 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedVector3Constraint wrapped(scaleConstraint, itemId); - Constraint constraint = Constraint::New( Actor::Property::SCALE, - Source( scrollPositionObject, scrollPositionProperty ), - ParentSource( scrollSpeedProperty ), - ParentSource( Actor::Property::SIZE ), - wrapped ); - constraint.SetApplyTime(durationSeconds); - constraint.SetAlphaFunction(mAlphaFunction); - - actor.ApplyConstraint(constraint); + Constraint constraint = Constraint::New( actor, Actor::Property::SCALE, wrapped ); + constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); + constraint.AddSource( ParentSource( scrollSpeedProperty ) ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); + constraint.Apply(); } ItemLayout::Vector4Function colorConstraint; @@ -247,17 +289,13 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedVector4Constraint wrapped(colorConstraint, itemId); - Constraint constraint = Constraint::New( Actor::Property::COLOR, - Source( scrollPositionObject, scrollPositionProperty ), - ParentSource( scrollSpeedProperty ), - ParentSource( Actor::Property::SIZE ), - wrapped ); - - constraint.SetApplyTime(durationSeconds); - constraint.SetAlphaFunction(mAlphaFunction); + Constraint constraint = Constraint::New( actor, Actor::Property::COLOR, wrapped ); + constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); + constraint.AddSource( ParentSource( scrollSpeedProperty ) ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); constraint.SetRemoveAction(Dali::Constraint::Discard); - - actor.ApplyConstraint(constraint); + constraint.Apply(); } ItemLayout::BoolFunction visibilityConstraint; @@ -265,20 +303,25 @@ void ItemLayout::ApplyConstraints( Actor& actor, const int itemId, const float d { WrappedBoolConstraint wrapped(visibilityConstraint, itemId); - Constraint constraint = Constraint::New( Actor::Property::VISIBLE, - Source( scrollPositionObject, scrollPositionProperty ), - ParentSource( scrollSpeedProperty ), - ParentSource( Actor::Property::SIZE ), - wrapped ); - - constraint.SetApplyTime(durationSeconds); - constraint.SetAlphaFunction(mAlphaFunction); + Constraint constraint = Constraint::New( actor, Actor::Property::VISIBLE, wrapped ); + constraint.AddSource( Source( scrollPositionObject, scrollPositionProperty ) ); + constraint.AddSource( ParentSource( scrollSpeedProperty ) ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.AddSource( Source( mWeightObject, WeightObject::WEIGHT ) ); // Release visibility constraints the same time as the color constraint constraint.SetRemoveAction(Dali::Constraint::Discard); - actor.ApplyConstraint(constraint); + constraint.Apply(); } + + KeyFrames keyFrames = KeyFrames::New(); + keyFrames.Add( 0.0f, 0.0f ); + keyFrames.Add( 1.0f, 1.0f ); + + Animation applyAnimation = Dali::Animation::New( durationSeconds ); + applyAnimation.AnimateBetween( Property( mWeightObject, WeightObject::WEIGHT ), keyFrames, mAlphaFunction, TimePeriod(durationSeconds) ); + applyAnimation.Play(); } }