Peter M. Groen / dali-demo

Commit 8aaddfc4374f4499d1ba13314b87967fcf1ec412

Authored by adam.b
1 parent b07c8884

Changed Animation API enums to uppercase. 

Change-Id: I07578655e65a50135b43e42272d4b1e410177df0
Inline Side-by-side
Showing 4 changed files with 15 additions and 15 deletions
examples/bloom-view/bloom-view-example.cpp
  View file @8aaddfc
@@ -161,7 +161,7 @@ public: @@ -161,7 +161,7 @@ public:
161 // ROTATE 161 // ROTATE
162 mRotationAnimation = Animation::New( 5.0f ); 162 mRotationAnimation = Animation::New( 5.0f );
163 mRotationAnimation.AnimateBy( Property( mObjectRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); 163 mRotationAnimation.AnimateBy( Property( mObjectRootActor, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( 360 )), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
164 - mRotationAnimation.SetEndAction( Animation::Discard ); 164 + mRotationAnimation.SetEndAction( Animation::DISCARD );
165 mRotationAnimation.SetLooping( true ); 165 mRotationAnimation.SetLooping( true );
166 mRotationAnimation.Play(); 166 mRotationAnimation.Play();
167 167
@@ -170,7 +170,7 @@ public: @@ -170,7 +170,7 @@ public:
170 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(100.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f) ); 170 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(100.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f) );
171 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(300.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f, 2.5f) ); 171 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(300.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(2.5f, 2.5f) );
172 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(5.0f, 2.5f) ); 172 mTranslationAnimation.AnimateBy( Property(mObjectRootActor, Actor::Property::POSITION), Vector3(0.0f, 0.0f, 0.0f), AlphaFunction::BOUNCE, TimePeriod(5.0f, 2.5f) );
173 - mTranslationAnimation.SetEndAction( Animation::Discard ); 173 + mTranslationAnimation.SetEndAction( Animation::DISCARD );
174 mTranslationAnimation.SetLooping( true ); 174 mTranslationAnimation.SetLooping( true );
175 //mTranslationAnimation.Play(); 175 //mTranslationAnimation.Play();
176 176
@@ -178,7 +178,7 @@ public: @@ -178,7 +178,7 @@ public:
178 mBlurAnimation = Animation::New( 4.0f ); 178 mBlurAnimation = Animation::New( 4.0f );
179 mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 0.0f, AlphaFunction::LINEAR, TimePeriod(0.0f, 0.5f) ); 179 mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 0.0f, AlphaFunction::LINEAR, TimePeriod(0.0f, 0.5f) );
180 mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 1.0f, AlphaFunction::LINEAR, TimePeriod(2.0f, 0.5f) ); 180 mBlurAnimation.AnimateTo( Property( mBloomView, mBloomView.GetBlurStrengthPropertyIndex() ), 1.0f, AlphaFunction::LINEAR, TimePeriod(2.0f, 0.5f) );
181 - mBlurAnimation.SetEndAction( Animation::Discard ); 181 + mBlurAnimation.SetEndAction( Animation::DISCARD );
182 mBlurAnimation.SetLooping( true ); 182 mBlurAnimation.SetLooping( true );
183 mBlurAnimation.Play(); 183 mBlurAnimation.Play();
184 } 184 }
@@ -187,7 +187,7 @@ public: @@ -187,7 +187,7 @@ public:
187 { 187 {
188 mPulseBloomIntensityAnim = Animation::New( 2.5f ); 188 mPulseBloomIntensityAnim = Animation::New( 2.5f );
189 mPulseBloomIntensityAnim.AnimateTo( Property(mBloomView, mBloomView.GetBloomIntensityPropertyIndex()), 3.0f, AlphaFunction::BOUNCE, TimePeriod(2.5f) ); 189 mPulseBloomIntensityAnim.AnimateTo( Property(mBloomView, mBloomView.GetBloomIntensityPropertyIndex()), 3.0f, AlphaFunction::BOUNCE, TimePeriod(2.5f) );
190 - mPulseBloomIntensityAnim.SetEndAction( Animation::Discard ); 190 + mPulseBloomIntensityAnim.SetEndAction( Animation::DISCARD );
191 mPulseBloomIntensityAnim.SetLooping( true ); 191 mPulseBloomIntensityAnim.SetLooping( true );
192 mPulseBloomIntensityAnim.Play(); 192 mPulseBloomIntensityAnim.Play();
193 } 193 }
examples/motion-blur/motion-blur-example.cpp
  View file @8aaddfc
@@ -295,7 +295,7 @@ public: @@ -295,7 +295,7 @@ public:
295 { 295 {
296 mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); 296 mActorTapMovementAnimation.AnimateTo( Property(mMotionBlurImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
297 } 297 }
298 - mActorTapMovementAnimation.SetEndAction( Animation::Bake ); 298 + mActorTapMovementAnimation.SetEndAction( Animation::BAKE );
299 mActorTapMovementAnimation.Play(); 299 mActorTapMovementAnimation.Play();
300 300
301 301
@@ -310,7 +310,7 @@ public: @@ -310,7 +310,7 @@ public:
310 float animDuration = 1.0f; 310 float animDuration = 1.0f;
311 mActorAnimation = Animation::New(animDuration); 311 mActorAnimation = Animation::New(animDuration);
312 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); 312 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
313 - mActorAnimation.SetEndAction( Animation::Bake ); 313 + mActorAnimation.SetEndAction( Animation::BAKE );
314 mActorAnimation.Play(); 314 mActorAnimation.Play();
315 } 315 }
316 break; 316 break;
@@ -321,7 +321,7 @@ public: @@ -321,7 +321,7 @@ public:
321 float animDuration = 1.0f; 321 float animDuration = 1.0f;
322 mActorAnimation = Animation::New(animDuration); 322 mActorAnimation = Animation::New(animDuration);
323 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); 323 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
324 - mActorAnimation.SetEndAction( Animation::Bake ); 324 + mActorAnimation.SetEndAction( Animation::BAKE );
325 mActorAnimation.Play(); 325 mActorAnimation.Play();
326 } 326 }
327 break; 327 break;
@@ -333,7 +333,7 @@ public: @@ -333,7 +333,7 @@ public:
333 mActorAnimation = Animation::New(animDuration); 333 mActorAnimation = Animation::New(animDuration);
334 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); 334 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
335 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); 335 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
336 - mActorAnimation.SetEndAction( Animation::Bake ); 336 + mActorAnimation.SetEndAction( Animation::BAKE );
337 mActorAnimation.Play(); 337 mActorAnimation.Play();
338 } 338 }
339 break; 339 break;
@@ -344,7 +344,7 @@ public: @@ -344,7 +344,7 @@ public:
344 float animDuration = 1.0f; 344 float animDuration = 1.0f;
345 mActorAnimation = Animation::New(animDuration); 345 mActorAnimation = Animation::New(animDuration);
346 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); 346 mActorAnimation.AnimateBy( Property( mMotionBlurImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
347 - mActorAnimation.SetEndAction( Animation::Bake ); 347 + mActorAnimation.SetEndAction( Animation::BAKE );
348 mActorAnimation.Play(); 348 mActorAnimation.Play();
349 } 349 }
350 break; 350 break;
examples/motion-stretch/motion-stretch-example.cpp
  View file @8aaddfc
@@ -267,7 +267,7 @@ public: @@ -267,7 +267,7 @@ public:
267 { 267 {
268 mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) ); 268 mActorTapMovementAnimation.AnimateTo( Property(mMotionStretchImageView, Actor::Property::POSITION), destPos, AlphaFunction::EASE_IN_OUT_SINE, TimePeriod(animDuration) );
269 } 269 }
270 - mActorTapMovementAnimation.SetEndAction( Animation::Bake ); 270 + mActorTapMovementAnimation.SetEndAction( Animation::BAKE );
271 mActorTapMovementAnimation.Play(); 271 mActorTapMovementAnimation.Play();
272 272
273 273
@@ -282,7 +282,7 @@ public: @@ -282,7 +282,7 @@ public:
282 float animDuration = 1.0f; 282 float animDuration = 1.0f;
283 mActorAnimation = Animation::New(animDuration); 283 mActorAnimation = Animation::New(animDuration);
284 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); 284 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
285 - mActorAnimation.SetEndAction( Animation::Bake ); 285 + mActorAnimation.SetEndAction( Animation::BAKE );
286 mActorAnimation.Play(); 286 mActorAnimation.Play();
287 } 287 }
288 break; 288 break;
@@ -293,7 +293,7 @@ public: @@ -293,7 +293,7 @@ public:
293 float animDuration = 1.0f; 293 float animDuration = 1.0f;
294 mActorAnimation = Animation::New(animDuration); 294 mActorAnimation = Animation::New(animDuration);
295 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); 295 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
296 - mActorAnimation.SetEndAction( Animation::Bake ); 296 + mActorAnimation.SetEndAction( Animation::BAKE );
297 mActorAnimation.Play(); 297 mActorAnimation.Play();
298 } 298 }
299 break; 299 break;
@@ -305,7 +305,7 @@ public: @@ -305,7 +305,7 @@ public:
305 mActorAnimation = Animation::New(animDuration); 305 mActorAnimation = Animation::New(animDuration);
306 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT ); 306 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::YAXIS ), AlphaFunction::EASE_IN_OUT );
307 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT ); 307 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree(360.0f) ), Vector3::ZAXIS ), AlphaFunction::EASE_IN_OUT );
308 - mActorAnimation.SetEndAction( Animation::Bake ); 308 + mActorAnimation.SetEndAction( Animation::BAKE );
309 mActorAnimation.Play(); 309 mActorAnimation.Play();
310 } 310 }
311 break; 311 break;
@@ -316,7 +316,7 @@ public: @@ -316,7 +316,7 @@ public:
316 float animDuration = 1.0f; 316 float animDuration = 1.0f;
317 mActorAnimation = Animation::New(animDuration); 317 mActorAnimation = Animation::New(animDuration);
318 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) ); 318 mActorAnimation.AnimateBy( Property( mMotionStretchImageView, Actor::Property::SCALE ), Vector3(2.0f, 2.0f, 2.0f), AlphaFunction::BOUNCE, TimePeriod( 0.0f, 1.0f ) );
319 - mActorAnimation.SetEndAction( Animation::Bake ); 319 + mActorAnimation.SetEndAction( Animation::BAKE );
320 mActorAnimation.Play(); 320 mActorAnimation.Play();
321 } 321 }
322 break; 322 break;
shared/dali-table-view.cpp
  View file @8aaddfc
@@ -596,7 +596,7 @@ bool DaliTableView::DoTilePress( Actor actor, PointState::Type pointState ) @@ -596,7 +596,7 @@ bool DaliTableView::DoTilePress( Actor actor, PointState::Type pointState )
596 if( consumed ) 596 if( consumed )
597 { 597 {
598 mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME ); 598 mPressedAnimation = Animation::New( BUTTON_PRESS_ANIMATION_TIME );
599 - mPressedAnimation.SetEndAction( Animation::Discard ); 599 + mPressedAnimation.SetEndAction( Animation::DISCARD );
600 600
601 // scale the content actor within the Tile, as to not affect the placement within the Table. 601 // scale the content actor within the Tile, as to not affect the placement within the Table.
602 Actor content = actor.GetChildAt(0); 602 Actor content = actor.GetChildAt(0);