Peter M. Groen / dali-demo

Commit c9273e4023e21144a0b609aa090fe51ec706a45f

Authored by Ferran Sole
1 parent f44aff0b

Alpha function changes 

Change-Id: Iaaea70d0620aa122139ab40f8a00f94493677ac3
Inline Side-by-side
Showing 21 changed files with 90 additions and 88 deletions
demo/dali-table-view.cpp
  View file @c9273e4
... ... @@ -479,8 +479,8 @@ void DaliTableView::Rotate( unsigned int degrees )
479 479 }
480 480  
481 481 mRotateAnimation = Animation::New( ROTATE_ANIMATION_TIME );
482   - mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 - degrees ) ), Vector3::ZAXIS ), AlphaFunctions::EaseOut );
483   - mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::SIZE ), targetSize, AlphaFunctions::EaseOut );
  482 + mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 - degrees ) ), Vector3::ZAXIS ), AlphaFunction::EASE_OUT );
  483 + mRotateAnimation.AnimateTo( Property( mRootActor, Actor::Property::SIZE ), targetSize, AlphaFunction::EASE_OUT );
484 484 mRotateAnimation.Play();
485 485 }
486 486  
... ... @@ -592,9 +592,9 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
592 592  
593 593 // scale the content actor within the Tile, as to not affect the placement within the Table.
594 594 Actor content = actor.GetChildAt(0);
595   - mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3( 0.9f, 0.9f, 1.0f ), AlphaFunctions::EaseInOut,
  595 + mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3( 0.9f, 0.9f, 1.0f ), AlphaFunction::EASE_IN_OUT,
596 596 TimePeriod( 0.0f, BUTTON_PRESS_ANIMATION_TIME * 0.5f ) );
597   - mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3::ONE, AlphaFunctions::EaseInOut,
  597 + mPressedAnimation.AnimateTo( Property( content, Actor::Property::SCALE ), Vector3::ONE, AlphaFunction::EASE_IN_OUT,
598 598 TimePeriod( BUTTON_PRESS_ANIMATION_TIME * 0.5f, BUTTON_PRESS_ANIMATION_TIME * 0.5f ) );
599 599 mPressedAnimation.Play();
600 600 mPressedAnimation.FinishedSignal().Connect( this, &DaliTableView::OnPressedAnimationFinished );
... ... @@ -759,7 +759,7 @@ void DaliTableView::InitialiseBackgroundActors( Actor actor )
759 759  
760 760 // Kickoff animation
761 761 Animation animation = Animation::New( Random::Range( 40.0f, 80.0f ) );
762   - animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunctions::Linear );
  762 + animation.AnimateBy( Property( child, Actor::Property::POSITION ), Vector3( 0.0f, -1.0f, 0.0f ), AlphaFunction::LINEAR );
763 763 animation.SetLooping( true );
764 764 animation.Play();
765 765 mBackgroundAnimations.push_back( animation );
... ...
examples/animated-shapes/animated-shapes-example.cpp
  View file @c9273e4
... ... @@ -143,25 +143,25 @@ public:
143 143 k0.Add( 0.0f, Vector3( 0.0f,-radius, 0.0f) );
144 144 k0.Add( 0.5f, Vector3(0.0f, -radius*4.0f, 0.0f));
145 145 k0.Add( 1.0f, Vector3( 0.0f,-radius, 0.0f) );
146   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunctions::EaseInOutSine );
  146 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunction::EASE_IN_OUT );
147 147  
148 148 k0 = KeyFrames::New();
149 149 k0.Add( 0.0f, Vector3( radius, 0.0f, 0.0f) );
150 150 k0.Add( 0.5f, Vector3(radius*4.0f,0.0f, 0.0f));
151 151 k0.Add( 1.0f, Vector3( radius,0.0f, 0.0f));
152   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunctions::EaseInOutSine );
  152 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunction::EASE_IN_OUT );
153 153  
154 154 k0 = KeyFrames::New();
155 155 k0.Add( 0.0f, Vector3(0.0f,radius, 0.0f) );
156 156 k0.Add( 0.5f, Vector3(0.0f,radius*4.0f, 0.0f));
157 157 k0.Add( 1.0f, Vector3(0.0f,radius, 0.0f) );
158   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunctions::EaseInOutSine );
  158 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunction::EASE_IN_OUT );
159 159  
160 160 k0 = KeyFrames::New();
161 161 k0.Add( 0.0f, Vector3( -radius, 0.0f, 0.0f) );
162 162 k0.Add( 0.5f, Vector3(-radius*4.0f,0.0f, 0.0f));
163 163 k0.Add( 1.0f, Vector3( -radius, 0.0f, 0.0f) );
164   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(10)),k0,AlphaFunctions::EaseInOutSine );
  164 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(10)),k0,AlphaFunction::EASE_IN_OUT );
165 165  
166 166 animation.AnimateBy( Property( meshActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(90.0f) ), Vector3::ZAXIS ) );
167 167 animation.SetLooping( true );
... ... @@ -244,19 +244,19 @@ public:
244 244 k0.Add( 0.0f,v3 );
245 245 k0.Add( 0.5f, v3 + Vector3(-200.0f,-200.0f,0.0f));
246 246 k0.Add( 1.0f, v3 );
247   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunctions::EaseInOutSine );
  247 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunction::EASE_IN_OUT );
248 248  
249 249 k0 = KeyFrames::New();
250 250 k0.Add( 0.0f,v4 );
251 251 k0.Add( 0.5f, v4 + Vector3(200.0f,-200.0f,0.0f));
252 252 k0.Add( 1.0f, v4 );
253   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunctions::EaseInOutSine );
  253 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunction::EASE_IN_OUT );
254 254  
255 255 k0 = KeyFrames::New();
256 256 k0.Add( 0.0f,v5 );
257 257 k0.Add( 0.5f, v5 + Vector3(0.0,200.0f,0.0f));
258 258 k0.Add( 1.0f, v5 );
259   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunctions::EaseInOutSine );
  259 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunction::EASE_IN_OUT );
260 260 animation.SetLooping( true );
261 261 animation.Play();
262 262 }
... ... @@ -324,25 +324,25 @@ public:
324 324 k0.Add( 0.0f, Vector3( 0.0f,-radius*2.0, 0.0f) );
325 325 k0.Add( 0.5f, Vector3(-radius*2.0, -radius*3.0f, 0.0f));
326 326 k0.Add( 1.0f, Vector3( 0.0f,-radius*2.0, 0.0f) );
327   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunctions::EaseInOutSine );
  327 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(1)),k0,AlphaFunction::EASE_IN_OUT );
328 328  
329 329 k0 = KeyFrames::New();
330 330 k0.Add( 0.0f, Vector3( radius*2.0, 0.0f, 0.0f) );
331 331 k0.Add( 0.5f, Vector3(radius*3.0f,-radius*2.0, 0.0f));
332 332 k0.Add( 1.0f, Vector3( radius*2.0,0.0f, 0.0f));
333   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunctions::EaseInOutSine );
  333 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(4)),k0,AlphaFunction::EASE_IN_OUT );
334 334  
335 335 k0 = KeyFrames::New();
336 336 k0.Add( 0.0f, Vector3(0.0f,radius*2.0, 0.0f) );
337 337 k0.Add( 0.5f, Vector3(radius*2.0,radius*3.0f, 0.0f));
338 338 k0.Add( 1.0f, Vector3(0.0f,radius*2.0, 0.0f) );
339   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunctions::EaseInOutSine );
  339 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(7)),k0,AlphaFunction::EASE_IN_OUT );
340 340  
341 341 k0 = KeyFrames::New();
342 342 k0.Add( 0.0f, Vector3( -radius*2.0, 0.0f, 0.0f) );
343 343 k0.Add( 0.5f, Vector3(-radius*3.0f,radius*2.0, 0.0f));
344 344 k0.Add( 1.0f, Vector3( -radius*2.0, 0.0f, 0.0f) );
345   - animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(10)),k0,AlphaFunctions::EaseInOutSine );
  345 + animation.AnimateBetween( Property(shader, shader.GetPointPropertyName(10)),k0,AlphaFunction::EASE_IN_OUT );
346 346  
347 347 animation.AnimateBy( Property( meshActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(-90.0f) ), Vector3::ZAXIS ) );
348 348 animation.SetLooping( true );
... ...
examples/blocks/blocks-example.cpp
  View file @c9273e4
... ... @@ -595,8 +595,8 @@ private:
595 595  
596 596 mDragActor = actor;
597 597 mDragAnimation = Animation::New(0.25f);
598   - mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.1f, 1.1f, 1.0f), AlphaFunctions::EaseOut);
599   - mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunctions::EaseOut);
  598 + mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.1f, 1.1f, 1.0f), AlphaFunction::EASE_OUT);
  599 + mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 0.0f), AlphaFunction::EASE_OUT);
600 600 mDragAnimation.Play();
601 601 }
602 602 }
... ... @@ -621,8 +621,8 @@ private:
621 621 if(point.state==TouchPoint::Up) // Stop dragging
622 622 {
623 623 mDragAnimation = Animation::New(0.25f);
624   - mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunctions::EaseIn);
625   - mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunctions::EaseOut);
  624 + mDragAnimation.AnimateTo( Property(mDragActor, Actor::Property::SCALE), Vector3(1.0f, 1.0f, 1.0f), AlphaFunction::EASE_IN);
  625 + mDragAnimation.AnimateTo( Property(mPaddleHandle, Actor::Property::COLOR), Vector4(1.0f, 1.0f, 1.0f, 1.0f), AlphaFunction::EASE_OUT);
626 626 mDragAnimation.Play();
627 627 mDragActor.Reset();
628 628 }
... ... @@ -764,7 +764,7 @@ private:
764 764  
765 765 // fade brick (destroy)
766 766 Animation destroyAnimation = Animation::New(0.5f);
767   - destroyAnimation.AnimateTo( Property( brick, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunctions::EaseIn );
  767 + destroyAnimation.AnimateTo( Property( brick, Actor::Property::COLOR_ALPHA ), 0.0f, AlphaFunction::EASE_IN );
768 768 destroyAnimation.Play();
769 769 destroyAnimation.FinishedSignal().Connect( this, &ExampleController::OnBrickDestroyed );
770 770 mDestroyAnimationMap[destroyAnimation] = brick;
... ...
examples/buttons/buttons-example.cpp
  View file @c9273e4
... ... @@ -484,7 +484,7 @@ class ButtonsController: public ConnectionTracker
484 484 {
485 485 if( mAnimation )
486 486 {
487   - mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
  487 + mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
488 488 mAnimation.Play();
489 489 mLastPoint = localPoint;
490 490 }
... ...
examples/cluster/cluster-impl.cpp
  View file @c9273e4
... ... @@ -104,8 +104,8 @@ void Cluster::OnControlSizeSet( const Vector3& targetSize )
104 104 {
105 105 mClusterStyle.ApplyStyle( (*iter).mActor,
106 106 (*iter).mPositionIndex,
107   - AlphaFunctions::EaseOut,
108   - 0.f );
  107 + AlphaFunction::EASE_OUT,
  108 + TimePeriod(0.f) );
109 109 }
110 110 }
111 111  
... ... @@ -175,7 +175,7 @@ void Cluster::AddChildInfoAt( ChildInfo childInfo, unsigned int index )
175 175 child.RemoveConstraints();
176 176  
177 177 // apply new constraints to the child
178   - mClusterStyle.ApplyStyle(child, childInfo.mPositionIndex, AlphaFunctions::EaseOut, 0.0f);
  178 + mClusterStyle.ApplyStyle(child, childInfo.mPositionIndex, AlphaFunction::EASE_OUT, TimePeriod(0.0f));
179 179 }
180 180 else
181 181 {
... ... @@ -293,8 +293,8 @@ void Cluster::ExpandChild( unsigned int index )
293 293 position,
294 294 Vector3::ONE * scale,
295 295 Quaternion(rotate, Vector3::ZAXIS),
296   - AlphaFunctions::EaseOut,
297   - 0.5f);
  296 + AlphaFunction::EASE_OUT,
  297 + TimePeriod(0.5f));
298 298 }
299 299 }
300 300 }
... ... @@ -312,8 +312,8 @@ void Cluster::CollapseChild( unsigned int index, bool front )
312 312 if( index < mChildren.size() )
313 313 {
314 314 RestoreChild(index,
315   - AlphaFunctions::EaseOut,
316   - 0.25f,
  315 + AlphaFunction::EASE_OUT,
  316 + TimePeriod(0.25f),
317 317 front);
318 318 }
319 319 }
... ... @@ -323,8 +323,8 @@ void Cluster::CollapseAllChildren( bool front )
323 323 for(unsigned int index = 0;index < mChildren.size(); index++)
324 324 {
325 325 RestoreChild(index,
326   - AlphaFunctions::EaseOut,
327   - 0.25f,
  326 + AlphaFunction::EASE_OUT,
  327 + TimePeriod(0.25f),
328 328 front);
329 329 }
330 330 }
... ... @@ -344,9 +344,9 @@ void Cluster::TransformChild( unsigned int index, const Vector3&amp; position, const
344 344  
345 345 child.RemoveConstraints();
346 346 Animation animation = Animation::New(period.delaySeconds + period.durationSeconds);
347   - animation.AnimateTo( Property(child, Actor::Property::POSITION), position, AlphaFunctions::EaseOut, period);
348   - animation.AnimateTo( Property(child, Actor::Property::SCALE), scale, AlphaFunctions::EaseOut, period);
349   - animation.AnimateTo( Property(child, Actor::Property::ORIENTATION), rotation, AlphaFunctions::EaseOut, period);
  347 + animation.AnimateTo( Property(child, Actor::Property::POSITION), position, AlphaFunction::EASE_OUT, period);
  348 + animation.AnimateTo( Property(child, Actor::Property::SCALE), scale, AlphaFunction::EASE_OUT, period);
  349 + animation.AnimateTo( Property(child, Actor::Property::ORIENTATION), rotation, AlphaFunction::EASE_OUT, period);
350 350 animation.Play();
351 351 }
352 352 }
... ... @@ -435,8 +435,8 @@ void Cluster::SetStyle(Demo::ClusterStyle style)
435 435 {
436 436 mClusterStyle.ApplyStyle( (*iter).mActor,
437 437 (*iter).mPositionIndex,
438   - AlphaFunctions::EaseOut,
439   - CLUSTER_STYLE_CONSTRAINT_DURATION );
  438 + AlphaFunction::EASE_OUT,
  439 + TimePeriod(CLUSTER_STYLE_CONSTRAINT_DURATION) );
440 440 }
441 441 }
442 442  
... ... @@ -463,7 +463,7 @@ void Cluster::UpdateBackground(float duration)
463 463 {
464 464 if (mBackgroundImage)
465 465 {
466   - mClusterStyle.ApplyStyleToBackground(mBackgroundImage, AlphaFunctions::EaseOut, duration);
  466 + mClusterStyle.ApplyStyleToBackground(mBackgroundImage, AlphaFunction::EASE_OUT, TimePeriod(duration));
467 467 }
468 468 }
469 469  
... ... @@ -471,7 +471,7 @@ void Cluster::UpdateTitle(float duration)
471 471 {
472 472 if (mTitle)
473 473 {
474   - mClusterStyle.ApplyStyleToTitle(mTitle, AlphaFunctions::EaseOut, duration);
  474 + mClusterStyle.ApplyStyleToTitle(mTitle, AlphaFunction::EASE_OUT, TimePeriod(duration));
475 475 }
476 476 }
477 477  
... ... @@ -539,7 +539,7 @@ void Cluster::DoTransformAction(const PropertyValueContainer&amp; attributes)
539 539 // wrap index around -1 => size - 1
540 540 index%= mChildren.size();
541 541  
542   - TransformChild(index, position, scale, rotation, AlphaFunctions::EaseOut, 0.5f);
  542 + TransformChild(index, position, scale, rotation, AlphaFunction::EASE_OUT, TimePeriod(0.5f));
543 543 }
544 544  
545 545 void Cluster::OnControlChildRemove(Actor& child)
... ...
examples/cluster/cluster-style.cpp
  View file @c9273e4
... ... @@ -57,17 +57,17 @@ unsigned int ClusterStyle::GetMaximumNumberOfChildren() const
57 57  
58 58 void ClusterStyle::ApplyStyle(Actor child, unsigned int index, AlphaFunction alpha, const TimePeriod& durationSeconds)
59 59 {
60   - GetImpl(*this).ApplyStyle(child, index, alpha, durationSeconds);
  60 + GetImpl(*this).ApplyStyle(child, index, alpha, TimePeriod(durationSeconds));
61 61 }
62 62  
63 63 void ClusterStyle::ApplyStyleToBackground(Actor background, AlphaFunction alpha, const TimePeriod& durationSeconds)
64 64 {
65   - GetImpl(*this).ApplyStyleToBackground(background, alpha, durationSeconds);
  65 + GetImpl(*this).ApplyStyleToBackground(background, alpha, TimePeriod(durationSeconds));
66 66 }
67 67  
68 68 void ClusterStyle::ApplyStyleToTitle(Actor title, AlphaFunction alpha, const TimePeriod& durationSeconds)
69 69 {
70   - GetImpl(*this).ApplyStyleToTitle(title, alpha, durationSeconds);
  70 + GetImpl(*this).ApplyStyleToTitle(title, alpha, TimePeriod(durationSeconds));
71 71 }
72 72  
73 73 // ClusterStyleStandard ///////////////////////////////////////////////////////
... ...
examples/cluster/cluster-style.h
  View file @c9273e4
... ... @@ -20,7 +20,7 @@
20 20  
21 21 // EXTERNAL INCLUDES
22 22 #include <dali/public-api/actors/actor.h>
23   -#include <dali/public-api/animation/alpha-functions.h>
  23 +#include <dali/public-api/animation/alpha-function.h>
24 24 #include <dali/public-api/animation/time-period.h>
25 25 #include <dali/public-api/common/dali-common.h>
26 26 #include <dali/public-api/object/base-handle.h>
... ...
examples/cluster/cluster.h
  View file @c9273e4
... ... @@ -19,7 +19,7 @@
19 19 */
20 20  
21 21 // EXTERNAL INCLUDES
22   -#include <dali/public-api/animation/alpha-functions.h>
  22 +#include <dali/public-api/animation/alpha-function.h>
23 23 #include <dali/public-api/animation/time-period.h>
24 24  
25 25 // INTERNAL INCLUDES
... ...
examples/dissolve-effect/dissolve-effect-example.cpp
  View file @c9273e4
... ... @@ -297,21 +297,21 @@ void DissolveEffectApp::StartTransition(Vector2 position, Vector2 displacement)
297 297 mCurrentImageEffect.SetCentralLine(position,displacement);
298 298 mCurrentImageEffect.SetDistortion(0.0f);
299 299 mCurrentImage.SetShaderEffect(mCurrentImageEffect);
300   - mAnimation.AnimateTo( Property(mCurrentImageEffect, mCurrentImageEffect.GetDistortionPropertyName()), 1.0f, AlphaFunctions::Linear );
  300 + mAnimation.AnimateTo( Property(mCurrentImageEffect, mCurrentImageEffect.GetDistortionPropertyName()), 1.0f, AlphaFunction::LINEAR );
301 301  
302 302 mNextImage.SetOpacity(0.0f);
303   - mAnimation.AnimateTo( Property( mNextImage, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::Linear );
  303 + mAnimation.AnimateTo( Property( mNextImage, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::LINEAR );
304 304  
305 305 if(mUseHighPrecision)
306 306 {
307 307 mNextImageEffect.SetCentralLine(position,-displacement);
308 308 mNextImageEffect.SetDistortion(1.0f);
309 309 mNextImage.SetShaderEffect(mNextImageEffect);
310   - mAnimation.AnimateTo( Property(mNextImageEffect, mNextImageEffect.GetDistortionPropertyName()), 0.0f, AlphaFunctions::Linear );
  310 + mAnimation.AnimateTo( Property(mNextImageEffect, mNextImageEffect.GetDistortionPropertyName()), 0.0f, AlphaFunction::LINEAR );
311 311 }
312 312 else
313 313 {
314   - mAnimation.AnimateTo( Property( mNextImage, Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), AlphaFunctions::Linear );
  314 + mAnimation.AnimateTo( Property( mNextImage, Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), AlphaFunction::LINEAR );
315 315 }
316 316  
317 317 mAnimation.FinishedSignal().Connect( this, &DissolveEffectApp::OnTransitionCompleted );
... ...
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @c9273e4
... ... @@ -465,7 +465,7 @@ public:
465 465 {
466 466 // Spin the image a few times:
467 467 Animation animation = Animation::New(SPIN_DURATION);
468   - animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunctions::EaseOut );
  468 + animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT );
469 469 animation.Play();
470 470  
471 471 // Change the scaling mode:
... ...
examples/item-view/item-view-example.cpp
  View file @c9273e4
... ... @@ -103,9 +103,9 @@ const unsigned int IMAGE_WIDTH = 256;
103 103 const unsigned int IMAGE_HEIGHT = 256;
104 104 const unsigned int NUM_IMAGE_PER_ROW_IN_ATLAS = 8;
105 105  
106   -AlphaFunction ALPHA_FUNCTIONS[] = { AlphaFunctions::Linear,
107   - AlphaFunctions::EaseIn,
108   - AlphaFunctions::EaseOut };
  106 +AlphaFunction ALPHA_FUNCTIONS[] = { AlphaFunction(AlphaFunction::LINEAR),
  107 + AlphaFunction(AlphaFunction::EASE_IN),
  108 + AlphaFunction(AlphaFunction::EASE_OUT) };
109 109  
110 110 const unsigned int NUM_ALPHA_FUNCTIONS = sizeof(ALPHA_FUNCTIONS) / sizeof(AlphaFunction);
111 111  
... ...
examples/logging/logging-example.cpp
  View file @c9273e4
... ... @@ -700,7 +700,7 @@ class LoggingController: public ConnectionTracker
700 700 {
701 701 if( mAnimation )
702 702 {
703   - mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
  703 + mAnimation.AnimateBy( Property(actor, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
704 704 mAnimation.Play();
705 705 mLastPoint = localPoint;
706 706 }
... ...
examples/magnifier/magnifier-example.cpp
  View file @c9273e4
... ... @@ -344,7 +344,7 @@ public:
344 344 if(!mMagnifierShown)
345 345 {
346 346 Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
347   - animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunctions::EaseIn);
  347 + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ONE, AlphaFunction::EASE_IN);
348 348 animation.Play();
349 349 mMagnifierShown = true;
350 350 }
... ... @@ -358,7 +358,7 @@ public:
358 358 if(mMagnifierShown)
359 359 {
360 360 Animation animation = Animation::New(MAGNIFIER_DISPLAY_DURATION);
361   - animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunctions::EaseOut);
  361 + animation.AnimateTo(Property(mMagnifier, Actor::Property::SCALE), Vector3::ZERO, AlphaFunction::EASE_OUT);
362 362 animation.Play();
363 363 mMagnifierShown = false;
364 364 }
... ...
examples/motion-blur/motion-blur-example.cpp
  View file @c9273e4
... ... @@ -322,7 +322,7 @@ public:
322 322 {
323 323 // has parent so we expect it to be on stage, start animation
324 324 mRotateAnimation = Animation::New( ORIENTATION_DURATION );
325   - mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunctions::EaseOut );
  325 + mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunction::EASE_OUT );
326 326 mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width );
327 327 mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height );
328 328 mRotateAnimation.Play();
... ... @@ -367,7 +367,7 @@ public:
367 367 mActorTapMovementAnimation = Animation::New( animDuration );
368 368 if ( mMotionBlurImageActor )
369 369 {
370   - mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
  370 + mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageActor, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
371 371 }
372 372 mActorTapMovementAnimation.SetEndAction( Animation::Bake );
373 373 mActorTapMovementAnimation.Play();
... ... @@ -383,7 +383,7 @@ public:
383 383 {
384 384 float animDuration = 1.0f;
385 385 mActorAnimation = Animation::New(animDuration);
386   - mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
  386 + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
387 387 mActorAnimation.SetEndAction( Animation::Bake );
388 388 mActorAnimation.Play();
389 389 }
... ... @@ -394,7 +394,7 @@ public:
394 394 {
395 395 float animDuration = 1.0f;
396 396 mActorAnimation = Animation::New(animDuration);
397   - mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
  397 + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
398 398 mActorAnimation.SetEndAction( Animation::Bake );
399 399 mActorAnimation.Play();
400 400 }
... ... @@ -405,8 +405,8 @@ public:
405 405 {
406 406 float animDuration = 1.0f;
407 407 mActorAnimation = Animation::New(animDuration);
408   - mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
409   - mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
  408 + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
  409 + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
410 410 mActorAnimation.SetEndAction( Animation::Bake );
411 411 mActorAnimation.Play();
412 412 }
... ... @@ -417,7 +417,7 @@ public:
417 417 {
418 418 float animDuration = 1.0f;
419 419 mActorAnimation = Animation::New(animDuration);
420   - mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, TimePeriod( 0.0f, 1.0f ) );
  420 + mActorAnimation.AnimateBy( Property( mMotionBlurImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
421 421 mActorAnimation.SetEndAction( Animation::Bake );
422 422 mActorAnimation.Play();
423 423 }
... ...
examples/motion-stretch/motion-stretch-example.cpp
  View file @c9273e4
... ... @@ -220,7 +220,7 @@ public:
220 220 {
221 221 // has parent so we expect it to be on stage, start animation
222 222 mRotateAnimation = Animation::New( ORIENTATION_DURATION );
223   - mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunctions::EaseOut );
  223 + mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunction::EASE_OUT );
224 224 mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width );
225 225 mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height );
226 226 mRotateAnimation.Play();
... ... @@ -264,7 +264,7 @@ public:
264 264 mActorTapMovementAnimation = Animation::New( animDuration );
265 265 if ( mMotionStretchImageActor )
266 266 {
267   - mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunctions::EaseInOutSine, TimePeriod(animDuration) );
  267 + mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageActor, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
268 268 }
269 269 mActorTapMovementAnimation.SetEndAction( Animation::Bake );
270 270 mActorTapMovementAnimation.Play();
... ... @@ -280,7 +280,7 @@ public:
280 280 {
281 281 float animDuration = 1.0f;
282 282 mActorAnimation = Animation::New(animDuration);
283   - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
  283 + mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
284 284 mActorAnimation.SetEndAction( Animation::Bake );
285 285 mActorAnimation.Play();
286 286 }
... ... @@ -291,7 +291,7 @@ public:
291 291 {
292 292 float animDuration = 1.0f;
293 293 mActorAnimation = Animation::New(animDuration);
294   - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
  294 + mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
295 295 mActorAnimation.SetEndAction( Animation::Bake );
296 296 mActorAnimation.Play();
297 297 }
... ... @@ -302,8 +302,8 @@ public:
302 302 {
303 303 float animDuration = 1.0f;
304 304 mActorAnimation = Animation::New(animDuration);
305   - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunctions::EaseInOut );
306   - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunctions::EaseInOut );
  305 + mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
  306 + mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
307 307 mActorAnimation.SetEndAction( Animation::Bake );
308 308 mActorAnimation.Play();
309 309 }
... ... @@ -314,7 +314,7 @@ public:
314 314 {
315 315 float animDuration = 1.0f;
316 316 mActorAnimation = Animation::New(animDuration);
317   - mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunctions::Bounce, TimePeriod( 0.0f, 1.0f ) );
  317 + mActorAnimation.AnimateBy( Property( mMotionStretchImageActor, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
318 318 mActorAnimation.SetEndAction( Animation::Bake );
319 319 mActorAnimation.Play();
320 320 }
... ...
examples/radial-menu/radial-menu-example.cpp
  View file @c9273e4
... ... @@ -194,8 +194,8 @@ void RadialMenuExample::StartAnimation()
194 194 mRadialSweepView1.Activate(mAnimation, 0.0f, 3.0f);
195 195 mRadialSweepView2.Activate(mAnimation, 1.5f, 3.0f);
196 196 mRadialSweepView3.Activate(mAnimation, 3.0f, 3.0f);
197   - mAnimation.AnimateTo( Property( mDialActor, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::EaseIn, TimePeriod( 0.0f, 0.8f ) );
198   - mAnimation.AnimateTo( Property( mRadialSweepView1, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunctions::EaseIn, TimePeriod( 0.0f, 0.5f ) );
  197 + mAnimation.AnimateTo( Property( mDialActor, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN, TimePeriod( 0.0f, 0.8f ) );
  198 + mAnimation.AnimateTo( Property( mRadialSweepView1, Actor::Property::COLOR_ALPHA ), 1.0f, AlphaFunction::EASE_IN, TimePeriod( 0.0f, 0.5f ) );
199 199 mAnimation.FinishedSignal().Connect( this, &RadialMenuExample::OnAnimationFinished );
200 200  
201 201 mAnimationState = PLAYING;
... ... @@ -259,7 +259,7 @@ RadialSweepView RadialMenuExample::CreateSweepView( std::string imageName,
259 259 radialSweepView.SetInitialSector( Degree(0.0f) );
260 260 radialSweepView.SetFinalSector( Degree(359.999f) );
261 261 radialSweepView.SetSize( Stage::GetCurrent().GetSize());
262   - radialSweepView.SetEasingFunction( Dali::AlphaFunctions::EaseInOut );
  262 + radialSweepView.SetEasingFunction( Dali::AlphaFunction::EASE_IN_OUT );
263 263 radialSweepView.SetPositionInheritanceMode(USE_PARENT_POSITION);
264 264 mContents.Add(radialSweepView);
265 265 radialSweepView.Add( mImageActor );
... ...
examples/radial-menu/radial-sweep-view-impl.cpp
  View file @c9273e4
... ... @@ -67,11 +67,13 @@ float HoldZeroFastEaseInOutHoldOne(float progress)
67 67 }
68 68 else if(progress < 0.5f)
69 69 {
70   - return AlphaFunctions::EaseIn((progress-0.2) / 0.3f) * 0.5f;
  70 + progress = (progress-0.2) / 0.3f;
  71 + return progress*progress*progress*0.5f;
71 72 }
72 73 else if(progress < 0.8f)
73 74 {
74   - return AlphaFunctions::EaseOut((progress - 0.5f) / 0.3f) * 0.5f + 0.5f;
  75 + progress = ((progress - 0.5f) / 0.3f) - 1.0f;
  76 + return (progress*progress*progress+1.0f) * 0.5f + 0.5f;
75 77 }
76 78 else
77 79 {
... ...
examples/scroll-view/scroll-view-example.cpp
  View file @c9273e4
... ... @@ -353,8 +353,8 @@ private:
353 353 mScrollViewEffect = ScrollViewDepthEffect::New();
354 354 mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION);
355 355 mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION);
356   - mScrollView.SetScrollSnapAlphaFunction(AlphaFunctions::EaseOut);
357   - mScrollView.SetScrollFlickAlphaFunction(AlphaFunctions::EaseOut);
  356 + mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT);
  357 + mScrollView.SetScrollFlickAlphaFunction(AlphaFunction::EASE_OUT);
358 358 mScrollView.RemoveConstraintsFromChildren();
359 359 break;
360 360 }
... ... @@ -364,8 +364,8 @@ private:
364 364 mScrollViewEffect = ScrollViewCubeEffect::New();
365 365 mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION);
366 366 mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION);
367   - mScrollView.SetScrollSnapAlphaFunction(AlphaFunctions::EaseOutBack);
368   - mScrollView.SetScrollFlickAlphaFunction(AlphaFunctions::EaseOutBack);
  367 + mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT_BACK);
  368 + mScrollView.SetScrollFlickAlphaFunction(AlphaFunction::EASE_OUT_BACK);
369 369 mScrollView.RemoveConstraintsFromChildren();
370 370 break;
371 371 }
... ... @@ -375,8 +375,8 @@ private:
375 375 mScrollViewEffect = ScrollViewPageCarouselEffect::New();
376 376 mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION);
377 377 mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION);
378   - mScrollView.SetScrollSnapAlphaFunction(AlphaFunctions::EaseOut);
379   - mScrollView.SetScrollFlickAlphaFunction(AlphaFunctions::EaseOut);
  378 + mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT);
  379 + mScrollView.SetScrollFlickAlphaFunction(AlphaFunction::EASE_OUT);
380 380 mScrollView.RemoveConstraintsFromChildren();
381 381 break;
382 382 }
... ... @@ -386,8 +386,8 @@ private:
386 386 mScrollViewEffect = ScrollViewPageCubeEffect::New();
387 387 mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION);
388 388 mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION);
389   - mScrollView.SetScrollSnapAlphaFunction(AlphaFunctions::EaseOut);
390   - mScrollView.SetScrollFlickAlphaFunction(AlphaFunctions::EaseOut);
  389 + mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT);
  390 + mScrollView.SetScrollFlickAlphaFunction(AlphaFunction::EASE_OUT);
391 391 mScrollView.RemoveConstraintsFromChildren();
392 392 break;
393 393 }
... ... @@ -397,8 +397,8 @@ private:
397 397 mScrollViewEffect = ScrollViewPageSpiralEffect::New();
398 398 mScrollView.SetScrollSnapDuration(EFFECT_SNAP_DURATION);
399 399 mScrollView.SetScrollFlickDuration(EFFECT_FLICK_DURATION);
400   - mScrollView.SetScrollSnapAlphaFunction(AlphaFunctions::EaseOut);
401   - mScrollView.SetScrollFlickAlphaFunction(AlphaFunctions::EaseOut);
  400 + mScrollView.SetScrollSnapAlphaFunction(AlphaFunction::EASE_OUT);
  401 + mScrollView.SetScrollFlickAlphaFunction(AlphaFunction::EASE_OUT);
402 402 mScrollView.RemoveConstraintsFromChildren();
403 403 break;
404 404 }
... ... @@ -607,7 +607,7 @@ private:
607 607 {
608 608 // Spin the Image a few times.
609 609 Animation animation = Animation::New(SPIN_DURATION);
610   - animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunctions::EaseOut );
  610 + animation.AnimateBy( Property( actor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f * SPIN_DURATION) ), Vector3::XAXIS ), AlphaFunction::EASE_OUT );
611 611 animation.Play();
612 612 }
613 613 }
... ...
examples/shadow-bone-lighting/shadow-bone-lighting-example.cpp
  View file @c9273e4
... ... @@ -277,7 +277,7 @@ public:
277 277  
278 278 // Want to animate angle from 30 => -30 and back again smoothly.
279 279  
280   - mSceneAnimation.AnimateTo( Property( mImageActor2, angleIndex ), Property::Value(-Dali::ANGLE_30), AlphaFunctions::Sin );
  280 + mSceneAnimation.AnimateTo( Property( mImageActor2, angleIndex ), Property::Value(-Dali::ANGLE_30), AlphaFunction::SIN );
281 281  
282 282 mSceneAnimation.SetLooping(true);
283 283 mSceneAnimation.Play();
... ...
examples/text-label-emojis/text-label-emojis.cpp
  View file @c9273e4
... ... @@ -99,7 +99,7 @@ public:
99 99 {
100 100 if( mAnimation )
101 101 {
102   - mAnimation.AnimateBy( Property(mTableView, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
  102 + mAnimation.AnimateBy( Property(mTableView, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
103 103 mAnimation.Play();
104 104 mLastPoint = localPoint;
105 105 }
... ...
examples/text-label-multi-language/text-label-multi-language-example.cpp
  View file @c9273e4
... ... @@ -104,7 +104,7 @@ public:
104 104 {
105 105 if( mAnimation )
106 106 {
107   - mAnimation.AnimateBy( Property(mTableView, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunctions::Linear );
  107 + mAnimation.AnimateBy( Property(mTableView, Actor::Property::POSITION), Vector3( 0.f, localPoint - mLastPoint, 0.f ), AlphaFunction::LINEAR );
108 108 mAnimation.Play();
109 109 mLastPoint = localPoint;
110 110 }
... ...