Merge "Changed Animation API enums to uppercase." into devel/master

diff --git a/automated-tests/src/dali/utc-Dali-Animation.cpp b/automated-tests/src/dali/utc-Dali-Animation.cpp
index 8d6b8d0..da1cd92 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Animation.cpp
+++ b/automated-tests/src/dali/utc-Dali-Animation.cpp
@@ -549,7 +549,7 @@ int UtcDaliAnimationSetLoopCountP2(void)
   Animation animation = Animation::New(durationSeconds);
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
-  animation.SetEndAction(Animation::Discard);
+  animation.SetEndAction(Animation::DISCARD);
 
   // Start the animation
   animation.SetLoopCount(3);
@@ -670,7 +670,7 @@ int UtcDaliAnimationSetLoopCountP3(void)
   Animation animation = Animation::New(durationSeconds);
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
-  animation.SetEndAction(Animation::Discard);
+  animation.SetEndAction(Animation::DISCARD);
 
   float intervalSeconds = 3.0f;
 
@@ -734,7 +734,7 @@ int UtcDaliAnimationSetLoopCountP4(void)
   Animation animation = Animation::New(durationSeconds);
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
-  animation.SetEndAction(Animation::Bake);
+  animation.SetEndAction(Animation::BAKE);
 
   float intervalSeconds = 3.0f;
 
@@ -902,7 +902,7 @@ int UtcDaliAnimationSetEndActionN(void)
   // Build the animation
   float durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::Bake);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BAKE);
 
   Vector3 targetPosition(10.0f, 10.0f, 10.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
@@ -930,8 +930,8 @@ int UtcDaliAnimationSetEndActionN(void)
 
   // Test BakeFinal, animate again, for half the duration
   finishCheck.Reset();
-  animation.SetEndAction(Animation::BakeFinal);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BakeFinal);
+  animation.SetEndAction(Animation::BAKE_FINAL);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BAKE_FINAL);
   animation.Play();
 
   application.SendNotification();
@@ -957,8 +957,8 @@ int UtcDaliAnimationSetEndActionN(void)
 
   // Test EndAction::Discard, animate again, but don't bake this time
   finishCheck.Reset();
-  animation.SetEndAction(Animation::Discard);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::Discard);
+  animation.SetEndAction(Animation::DISCARD);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::DISCARD);
   animation.Play();
 
   application.SendNotification();
@@ -986,13 +986,13 @@ int UtcDaliAnimationGetEndActionP(void)
   TestApplication application;
 
   Animation animation = Animation::New(1.0f);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::Bake);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BAKE);
 
-  animation.SetEndAction(Animation::Discard);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::Discard);
+  animation.SetEndAction(Animation::DISCARD);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::DISCARD);
 
-  animation.SetEndAction(Animation::BakeFinal);
-  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BakeFinal);
+  animation.SetEndAction(Animation::BAKE_FINAL);
+  DALI_TEST_CHECK(animation.GetEndAction() == Animation::BAKE_FINAL);
 
   END_TEST;
 }
@@ -1010,7 +1010,7 @@ int UtcDaliAnimationSetDisconnectActionP(void)
     // Build the animation
     float durationSeconds(1.0f);
     Animation animation = Animation::New(durationSeconds);
-    DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::BakeFinal);
+    DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::BAKE_FINAL);
 
     Vector3 targetPosition(10.0f, 10.0f, 10.0f);
     animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
@@ -1037,7 +1037,7 @@ int UtcDaliAnimationSetDisconnectActionP(void)
     // Build the animation
     float durationSeconds(1.0f);
     Animation animation = Animation::New(durationSeconds);
-    animation.SetDisconnectAction( Animation::Bake );
+    animation.SetDisconnectAction( Animation::BAKE );
 
     Vector3 targetPosition(10.0f, 10.0f, 10.0f);
     animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
@@ -1064,7 +1064,7 @@ int UtcDaliAnimationSetDisconnectActionP(void)
     // Build the animation
     float durationSeconds(1.0f);
     Animation animation = Animation::New(durationSeconds);
-    animation.SetDisconnectAction( Animation::Discard );
+    animation.SetDisconnectAction( Animation::DISCARD );
 
     Vector3 targetPosition(10.0f, 10.0f, 10.0f);
     animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
@@ -1113,13 +1113,13 @@ int UtcDaliAnimationGetDisconnectActionP(void)
 {
   TestApplication application;
   Animation animation = Animation::New(1.0f);
-  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::BakeFinal); // default!
+  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::BAKE_FINAL); // default!
 
-  animation.SetDisconnectAction(Animation::Discard);
-  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::Discard);
+  animation.SetDisconnectAction(Animation::DISCARD);
+  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::DISCARD);
 
-  animation.SetDisconnectAction(Animation::Bake);
-  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::Bake);
+  animation.SetDisconnectAction(Animation::BAKE);
+  DALI_TEST_CHECK(animation.GetDisconnectAction() == Animation::BAKE);
 
   END_TEST;
 }
@@ -2166,7 +2166,7 @@ int UtcDaliAnimationPlayOffSceneDiscardP(void)
   // Build the animation
   float durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
-  animation.SetDisconnectAction( Animation::Discard );
+  animation.SetDisconnectAction( Animation::DISCARD );
   Vector3 targetPosition(100.0f, 100.0f, 100.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
 
@@ -2343,7 +2343,7 @@ int UtcDaliAnimationPlayOffSceneBakeP(void)
   // Build the animation
   float durationSeconds(1.0f);
   Animation animation = Animation::New(durationSeconds);
-  animation.SetDisconnectAction( Animation::Bake );
+  animation.SetDisconnectAction( Animation::BAKE );
   Vector3 targetPosition(100.0f, 100.0f, 100.0f);
   animation.AnimateTo(Property(actor, Actor::Property::POSITION), targetPosition, AlphaFunction::LINEAR);
 
@@ -9160,7 +9160,7 @@ int UtcDaliAnimationAnimateBetweenActorColorAlphaCubicP(void)
   keyFrames.Add(0.8f, 0.7f);
   keyFrames.Add(1.0f, 0.9f);
 
-  animation.AnimateBetween( Property(actor, Actor::Property::COLOR_ALPHA), keyFrames, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::COLOR_ALPHA), keyFrames, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9335,7 +9335,7 @@ int UtcDaliAnimationAnimateBetweenActorColorCubicP(void)
   keyFrames.Add(0.5f, Vector4(0.9f, 0.8f, 0.7f, 0.6f));
   keyFrames.Add(1.0f, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
 
-  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9460,7 +9460,7 @@ int UtcDaliAnimationAnimateBetweenActorVisibleCubicP(void)
   keyFrames.Add(1.0f, true);
 
   //Cubic interpolation for boolean values should be ignored
-  animation.AnimateBetween( Property(actor, Actor::Property::VISIBLE), keyFrames, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::VISIBLE), keyFrames, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9613,7 +9613,7 @@ int UtcDaliAnimationAnimateBetweenActorOrientation01CubicP(void)
   keyFrames.Add(0.0f, AngleAxis(Degree(60), Vector3::ZAXIS));
 
   //Cubic interpolation should be ignored for quaternions
-  animation.AnimateBetween( Property(actor, Actor::Property::ORIENTATION), keyFrames, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::ORIENTATION), keyFrames, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9659,7 +9659,7 @@ int UtcDaliAnimationAnimateBetweenActorOrientation02CubicP(void)
   keyFrames.Add(1.0f, AngleAxis(Degree(120), Vector3::YAXIS));
 
   //Cubic interpolation should be ignored for quaternions
-  animation.AnimateBetween( Property(actor, Actor::Property::ORIENTATION), keyFrames, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::ORIENTATION), keyFrames, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9808,7 +9808,7 @@ int UtcDaliAnimationAnimateBetweenActorColorAlphaFunctionCubicP(void)
   keyFrames.Add(0.5f, Vector4(0.9f, 0.8f, 0.7f, 0.6f));
   keyFrames.Add(1.0f, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
 
-  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, AlphaFunction::LINEAR, Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, AlphaFunction::LINEAR, Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -9969,7 +9969,7 @@ int UtcDaliAnimationAnimateBetweenActorColorTimePeriodCubicP(void)
   keyFrames.Add(0.5f, Vector4(0.9f, 0.8f, 0.7f, 0.6f));
   keyFrames.Add(1.0f, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
 
-  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, TimePeriod( delay, durationSeconds - delay ), Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, TimePeriod( delay, durationSeconds - delay ), Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -10132,7 +10132,7 @@ int UtcDaliAnimationAnimateBetweenActorColorCubicWithDelayP(void)
   keyFrames.Add(0.5f, Vector4(0.9f, 0.8f, 0.7f, 0.6f));
   keyFrames.Add(1.0f, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
 
-  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, AlphaFunction::LINEAR, TimePeriod( delay, durationSeconds - delay ), Animation::Cubic );
+  animation.AnimateBetween( Property(actor, Actor::Property::COLOR), keyFrames, AlphaFunction::LINEAR, TimePeriod( delay, durationSeconds - delay ), Animation::CUBIC );
 
   // Start the animation
   animation.Play();
@@ -13418,9 +13418,9 @@ void CheckPropertyValuesWhenCallingAnimationMethod( TestFunction functionToTest,
 
   ExpectedValue expectedValueTable[] =
   {
-   { Animation::Bake,      halfWayToTarget  }, // When baking, the current value is the final value.
-   { Animation::BakeFinal, targetPosition   }, // When BakeFinal, we should jump to the final value when clearing or stopping.
-   { Animation::Discard,   originalPosition }, // When discarding, we should jump back to the original value when clearing or stopping.
+   { Animation::BAKE,      halfWayToTarget  }, // When baking, the current value is the final value.
+   { Animation::BAKE_FINAL, targetPosition   }, // When BakeFinal, we should jump to the final value when clearing or stopping.
+   { Animation::DISCARD,   originalPosition }, // When discarding, we should jump back to the original value when clearing or stopping.
   };
   const auto expectedValueTableCount = sizeof( expectedValueTable ) / sizeof( ExpectedValue );
 
@@ -13488,9 +13488,9 @@ int UtcDaliAnimationPausePropertyValue(void)
 
   Animation::EndAction endActions[] =
   {
-   Animation::Bake,
-   Animation::BakeFinal,
-   Animation::Discard,
+   Animation::BAKE,
+   Animation::BAKE_FINAL,
+   Animation::DISCARD,
   };
   const auto endActionCount = sizeof( endActions ) / sizeof( endActions[0] );
 
@@ -13700,7 +13700,7 @@ int UtcDaliAnimationSetEndActionNegative(void)
   Dali::Animation instance;
   try
   {
-    Dali::Animation::EndAction arg1(Animation::Bake);
+    Dali::Animation::EndAction arg1(Animation::BAKE);
     instance.SetEndAction(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }
@@ -13773,7 +13773,7 @@ int UtcDaliAnimationAnimateBetweenNegative02(void)
   {
     Dali::Property arg1(actor, Actor::Property::POSITION);
     Dali::KeyFrames arg2;
-    Dali::Animation::Interpolation arg3(Animation::Linear);
+    Dali::Animation::Interpolation arg3(Animation::LINEAR);
     instance.AnimateBetween(arg1,arg2,arg3);
     DALI_TEST_CHECK(false); // Should not get here
   }
@@ -13814,7 +13814,7 @@ int UtcDaliAnimationAnimateBetweenNegative04(void)
     Dali::Property arg1(actor, Actor::Property::POSITION);
     Dali::KeyFrames arg2;
     Dali::TimePeriod arg3(1.0f);
-    Dali::Animation::Interpolation arg4(Animation::Linear);
+    Dali::Animation::Interpolation arg4(Animation::LINEAR);
     instance.AnimateBetween(arg1,arg2,arg3,arg4);
     DALI_TEST_CHECK(false); // Should not get here
   }
@@ -13855,7 +13855,7 @@ int UtcDaliAnimationAnimateBetweenNegative06(void)
     Dali::Property arg1(actor, Actor::Property::POSITION);
     Dali::KeyFrames arg2;
     Dali::AlphaFunction arg3;
-    Dali::Animation::Interpolation arg4(Animation::Linear);
+    Dali::Animation::Interpolation arg4(Animation::LINEAR);
     instance.AnimateBetween(arg1,arg2,arg3,arg4);
     DALI_TEST_CHECK(false); // Should not get here
   }
@@ -13898,7 +13898,7 @@ int UtcDaliAnimationAnimateBetweenNegative08(void)
     Dali::KeyFrames arg2;
     Dali::AlphaFunction arg3;
     Dali::TimePeriod arg4(1.0f);
-    Dali::Animation::Interpolation arg5(Animation::Linear);
+    Dali::Animation::Interpolation arg5(Animation::LINEAR);
     instance.AnimateBetween(arg1,arg2,arg3,arg4,arg5);
     DALI_TEST_CHECK(false); // Should not get here
   }
@@ -14014,7 +14014,7 @@ int UtcDaliAnimationSetDisconnectActionNegative(void)
   Dali::Animation instance;
   try
   {
-    Dali::Animation::EndAction arg1(Animation::Bake);
+    Dali::Animation::EndAction arg1(Animation::BAKE);
     instance.SetDisconnectAction(arg1);
     DALI_TEST_CHECK(false); // Should not get here
   }

diff --git a/dali/internal/event/animation/animation-impl.cpp b/dali/internal/event/animation/animation-impl.cpp
index e82da5e..279874b 100644 (file)
--- a/dali/internal/event/animation/animation-impl.cpp
+++ b/dali/internal/event/animation/animation-impl.cpp
@@ -77,9 +77,9 @@ TypeAction action1( mType, ACTION_PLAY,  &Animation::DoAction );
 TypeAction action2( mType, ACTION_STOP,  &Animation::DoAction );
 TypeAction action3( mType, ACTION_PAUSE, &Animation::DoAction );
 
-const Dali::Animation::EndAction DEFAULT_END_ACTION( Dali::Animation::Bake );
-const Dali::Animation::EndAction DEFAULT_DISCONNECT_ACTION( Dali::Animation::BakeFinal );
-const Dali::Animation::Interpolation DEFAULT_INTERPOLATION( Dali::Animation::Linear );
+const Dali::Animation::EndAction DEFAULT_END_ACTION( Dali::Animation::BAKE );
+const Dali::Animation::EndAction DEFAULT_DISCONNECT_ACTION( Dali::Animation::BAKE_FINAL );
+const Dali::Animation::Interpolation DEFAULT_INTERPOLATION( Dali::Animation::LINEAR );
 const Dali::AlphaFunction DEFAULT_ALPHA_FUNCTION( Dali::AlphaFunction::DEFAULT );
 
 /**
@@ -389,7 +389,7 @@ void Animation::Stop()
   StopAnimationMessage( mEventThreadServices.GetUpdateManager(), *mAnimation );
 
   // Only notify the objects with the _stopped_, i.e. current values if the end action is set to BAKE
-  if( mEndAction == EndAction::Bake )
+  if( mEndAction == EndAction::BAKE )
   {
     NotifyObjects( Notify::USE_CURRENT_VALUE );
   }
@@ -400,7 +400,7 @@ void Animation::Clear()
   DALI_ASSERT_DEBUG(mAnimation);
 
   // Only notify the objects with the current values if the end action is set to BAKE
-  if( mEndAction == EndAction::Bake )
+  if( mEndAction == EndAction::BAKE )
   {
     NotifyObjects( Notify::USE_CURRENT_VALUE );
   }
@@ -1091,7 +1091,7 @@ bool Animation::CompareConnectorEndTimes( const Animation::ConnectorTargetValues
 void Animation::NotifyObjects( Animation::Notify notifyValueType )
 {
   // If the animation is discarded, then we do not want to change the target values unless we want to force the current values
-  if( mEndAction != EndAction::Discard || notifyValueType == Notify::FORCE_CURRENT_VALUE )
+  if( mEndAction != EndAction::DISCARD || notifyValueType == Notify::FORCE_CURRENT_VALUE )
   {
     // Sort according to end time with earlier end times coming first, if the end time is the same, then the connectors are not moved
     // Only do this if we're using the target value

diff --git a/dali/internal/event/animation/key-frame-channel.h b/dali/internal/event/animation/key-frame-channel.h
index 8cc482c..378f6a4 100644 (file)
--- a/dali/internal/event/animation/key-frame-channel.h
+++ b/dali/internal/event/animation/key-frame-channel.h
@@ -155,7 +155,7 @@ V KeyFrameChannel<V>::GetValue (float progress, Dali::Animation::Interpolation i
   {
     float frameProgress = (progress - start->GetProgress()) / (end->GetProgress() - start->GetProgress());
 
-    if( interpolation == Dali::Animation::Linear )
+    if( interpolation == Dali::Animation::LINEAR )
     {
       Interpolate(interpolatedV, start->GetValue(), end->GetValue(), frameProgress);
     }

diff --git a/dali/internal/update/animation/scene-graph-animation.cpp b/dali/internal/update/animation/scene-graph-animation.cpp
index 167dcaa..f0d961d 100644 (file)
--- a/dali/internal/update/animation/scene-graph-animation.cpp
+++ b/dali/internal/update/animation/scene-graph-animation.cpp
@@ -209,7 +209,7 @@ void Animation::Pause()
 
 void Animation::Bake(BufferIndex bufferIndex, EndAction action)
 {
-  if( action == Dali::Animation::BakeFinal )
+  if( action == Dali::Animation::BAKE_FINAL )
   {
     if( mSpeedFactor > 0.0f )
     {
@@ -240,7 +240,7 @@ bool Animation::Stop(BufferIndex bufferIndex)
   {
     animationFinished = true; // The actor-thread should be notified of this
 
-    if( mEndAction != Dali::Animation::Discard )
+    if( mEndAction != Dali::Animation::DISCARD )
     {
       Bake( bufferIndex, mEndAction );
 
@@ -266,7 +266,7 @@ void Animation::OnDestroy(BufferIndex bufferIndex)
 {
   if (mState == Playing || mState == Paused)
   {
-    if (mEndAction != Dali::Animation::Discard)
+    if (mEndAction != Dali::Animation::DISCARD)
     {
       Bake( bufferIndex, mEndAction );
 
@@ -378,7 +378,7 @@ void Animation::Update( BufferIndex bufferIndex, float elapsedSeconds, bool& loo
 
           // Make elapsed second as edge of range forcely.
           mElapsedSeconds = edgeRangeSeconds + signSpeedFactor * Math::MACHINE_EPSILON_10;
-          UpdateAnimators(bufferIndex, finished && (mEndAction != Dali::Animation::Discard), finished );
+          UpdateAnimators(bufferIndex, finished && (mEndAction != Dali::Animation::DISCARD), finished );
 
           // After update animation, mElapsedSeconds must be begin of value
           mElapsedSeconds = playRangeStartSeconds + playRangeEndSeconds - edgeRangeSeconds;

diff --git a/dali/internal/update/animation/scene-graph-animator.h b/dali/internal/update/animation/scene-graph-animator.h
index 2de0fd7..5e682da 100644 (file)
--- a/dali/internal/update/animation/scene-graph-animator.h
+++ b/dali/internal/update/animation/scene-graph-animator.h
@@ -147,7 +147,7 @@ public:
     mCurrentProgress( 0.f ),
     mLoopCount( 1 ),
     mAlphaFunction( alphaFunction ),
-    mDisconnectAction( Dali::Animation::BakeFinal ),
+    mDisconnectAction( Dali::Animation::BAKE_FINAL ),
     mAnimationPlaying( false ),
     mEnabled( true ),
     mConnectedToSceneGraph( false ),
@@ -197,10 +197,10 @@ private: // From PropertyOwner::Observer
   void PropertyOwnerDisconnected( BufferIndex bufferIndex, PropertyOwner& owner ) override final
   {
     // If we are active, then bake the value if required
-    if ( mAnimationPlaying && mDisconnectAction != Dali::Animation::Discard )
+    if ( mAnimationPlaying && mDisconnectAction != Dali::Animation::DISCARD )
     {
       // Bake to target-value if BakeFinal, otherwise bake current value
-      Update( bufferIndex, ( mDisconnectAction == Dali::Animation::Bake ? mCurrentProgress : 1.0f ), true );
+      Update( bufferIndex, ( mDisconnectAction == Dali::Animation::BAKE ? mCurrentProgress : 1.0f ), true );
     }
 
     mEnabled = false;
@@ -1038,7 +1038,7 @@ struct KeyFrameBooleanFunctor : public AnimatorFunctionBase
   {
     if(mKeyFrames->IsActive(progress))
     {
-      return mKeyFrames->GetValue(progress, Dali::Animation::Linear);
+      return mKeyFrames->GetValue(progress, Dali::Animation::LINEAR);
     }
     return property;
   }
@@ -1164,7 +1164,7 @@ struct KeyFrameQuaternionFunctor : public AnimatorFunctionBase
   {
     if(mKeyFrames->IsActive(progress))
     {
-      return mKeyFrames->GetValue(progress, Dali::Animation::Linear);
+      return mKeyFrames->GetValue(progress, Dali::Animation::LINEAR);
     }
     return property;
   }

diff --git a/dali/public-api/animation/animation.h b/dali/public-api/animation/animation.h
index 2fa2db1..644cfb5 100644 (file)
--- a/dali/public-api/animation/animation.h
+++ b/dali/public-api/animation/animation.h
@@ -134,9 +134,9 @@ public:
    */
   enum EndAction
   {
-    Bake,     ///< When the animation ends, the animated property values are saved. @SINCE_1_0.0
-    Discard,  ///< When the animation ends, the animated property values are forgotten. @SINCE_1_0.0
-    BakeFinal ///< If the animation is stopped, the animated property values are saved as if the animation had run to completion, otherwise behaves like Bake. @SINCE_1_0.0
+    BAKE,     ///< When the animation ends, the animated property values are saved. @SINCE_1_0.0
+    DISCARD,  ///< When the animation ends, the animated property values are forgotten. @SINCE_1_0.0
+    BAKE_FINAL ///< If the animation is stopped, the animated property values are saved as if the animation had run to completion, otherwise behaves like Bake. @SINCE_1_0.0
   };
 
   /**
@@ -145,8 +145,8 @@ public:
    */
   enum Interpolation
   {
-    Linear,   ///< Values in between key frames are interpolated using a linear polynomial. (Default) @SINCE_1_0.0
-    Cubic     ///< Values in between key frames are interpolated using a cubic polynomial. @SINCE_1_0.0
+    LINEAR,   ///< Values in between key frames are interpolated using a linear polynomial. (Default) @SINCE_1_0.0
+    CUBIC     ///< Values in between key frames are interpolated using a cubic polynomial. @SINCE_1_0.0
   };
 
   /**