projects / platform / core / uifw / dali-demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b07c888)
Changed Animation API enums to uppercase. 68/242168/2
authoradam.b <adam.b@samsung.com>
Mon, 24 Aug 2020 15:03:43 +0000 (16:03 +0100)
committeradam.b <adam.b@samsung.com>
Mon, 24 Aug 2020 17:13:05 +0000 (18:13 +0100)
Change-Id: I07578655e65a50135b43e42272d4b1e410177df0

examples/bloom-view/bloom-view-example.cpp patch | blob | history
examples/motion-blur/motion-blur-example.cpp patch | blob | history
examples/motion-stretch/motion-stretch-example.cpp patch | blob | history
shared/dali-table-view.cpp patch | blob | history

diff --git a/examples/bloom-view/bloom-view-example.cpp b/examples/bloom-view/bloom-view-example.cpp
index 5ec9ce5..a8d0feb 100644 (file)
--- a/examples/bloom-view/bloom-view-example.cpp
+++ b/examples/bloom-view/bloom-view-example.cpp
@@ -161,7 +161,7 @@ public:
     // ROTATE
     mRotationAnimation = Animation::New( 5.0f );
     mRotationAnimation.AnimateBy( Property( mObjectRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
-    mRotationAnimation.SetEndAction( Animation::Discard );
+    mRotationAnimation.SetEndAction( Animation::DISCARD );
     mRotationAnimation.SetLooping( true );
     mRotationAnimation.Play();
 
@@ -170,7 +170,7 @@ public:
     mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(100.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f) );
     mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(300.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f, 2.5f) );
     mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f),   AlphaFunction::BOUNCE, TimePeriod(5.0f, 2.5f) );
-    mTranslationAnimation.SetEndAction( Animation::Discard );
+    mTranslationAnimation.SetEndAction( Animation::DISCARD );
     mTranslationAnimation.SetLooping( true );
     //mTranslationAnimation.Play();
 
@@ -178,7 +178,7 @@ public:
     mBlurAnimation = Animation::New( 4.0f );
     mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 0.0f, AlphaFunction::LINEAR, TimePeriod(0.0f, 0.5f) );
     mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 1.0f, AlphaFunction::LINEAR, TimePeriod(2.0f, 0.5f) );
-    mBlurAnimation.SetEndAction( Animation::Discard );
+    mBlurAnimation.SetEndAction( Animation::DISCARD );
     mBlurAnimation.SetLooping( true );
     mBlurAnimation.Play();
   }
@@ -187,7 +187,7 @@ public:
   {
     mPulseBloomIntensityAnim = Animation::New( 2.5f );
     mPulseBloomIntensityAnim.AnimateTo( Property(mBloomView, mBloomView.GetBloomIntensityPropertyIndex()), 3.0f, AlphaFunction::BOUNCE, TimePeriod(2.5f) );
-    mPulseBloomIntensityAnim.SetEndAction( Animation::Discard );
+    mPulseBloomIntensityAnim.SetEndAction( Animation::DISCARD );
     mPulseBloomIntensityAnim.SetLooping( true );
     mPulseBloomIntensityAnim.Play();
   }
diff --git a/examples/motion-blur/motion-blur-example.cpp b/examples/motion-blur/motion-blur-example.cpp
index 7f2c733..504311e 100644 (file)
--- a/examples/motion-blur/motion-blur-example.cpp
+++ b/examples/motion-blur/motion-blur-example.cpp
@@ -295,7 +295,7 @@ public:
     {
       mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
     }
-    mActorTapMovementAnimation.SetEndAction( Animation::Bake );
+    mActorTapMovementAnimation.SetEndAction( Animation::BAKE );
     mActorTapMovementAnimation.Play();
 
 
@@ -310,7 +310,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -321,7 +321,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -333,7 +333,7 @@ public:
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
           mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -344,7 +344,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index be2e9fa..d1b8458 100644 (file)
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -267,7 +267,7 @@ public:
     {
       mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
     }
-    mActorTapMovementAnimation.SetEndAction( Animation::Bake );
+    mActorTapMovementAnimation.SetEndAction( Animation::BAKE );
     mActorTapMovementAnimation.Play();
 
 
@@ -282,7 +282,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -293,7 +293,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -305,7 +305,7 @@ public:
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
           mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
@@ -316,7 +316,7 @@ public:
           float animDuration = 1.0f;
           mActorAnimation = Animation::New(animDuration);
           mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
-          mActorAnimation.SetEndAction( Animation::Bake );
+          mActorAnimation.SetEndAction( Animation::BAKE );
           mActorAnimation.Play();
         }
         break;
diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 869bc7b..689211e 100644 (file)
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -596,7 +596,7 @@ bool DaliTableView::DoTilePress( Actor actor, PointState::Type pointState )
     if( consumed )
     {
       mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME );
-      mPressedAnimation.SetEndAction( Animation::Discard );
+      mPressedAnimation.SetEndAction( Animation::DISCARD );
 
       // scale the content actor within the Tile, as to not affect the placement within the Table.
       Actor content = actor.GetChildAt(0);
Domain: Graphics System / DALi;