Merge "Removing unused variables" into devel/master

[platform/core/uifw/dali-demo.git] / examples / bloom-view / bloom-view-example.cpp

diff --git a/examples/bloom-view/bloom-view-example.cpp b/examples/bloom-view/bloom-view-example.cpp
index 8859b94..870c62c 100644 (file)
--- a/examples/bloom-view/bloom-view-example.cpp
+++ b/examples/bloom-view/bloom-view-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -72,14 +72,14 @@ public:
 
   void Create( Application& application )
   {
-    Stage stage = Stage::GetCurrent();
-    Vector2 stageSize = stage.GetSize();
-    Vector2 viewSize( stageSize );
+    Window window = application.GetWindow();
+    Vector2 windowSize = window.GetSize();
+    Vector2 viewSize( windowSize );
 
     mRootActor = Actor::New();
     mRootActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    mRootActor.SetProperty( Actor::Property::SIZE, stageSize );
-    stage.Add( mRootActor );
+    mRootActor.SetProperty( Actor::Property::SIZE, windowSize );
+    window.Add( mRootActor );
 
     // Create the object that will perform the blooming work
     mBloomView = Dali::Toolkit::BloomView::New();
@@ -117,7 +117,7 @@ public:
 
     imageView = ImageView::New( UI_DIFFUSE_IMAGE );
     imageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    imageView.SetProperty( Actor::Property::SIZE, stageSize * 0.5f );
+    imageView.SetProperty( Actor::Property::SIZE, windowSize * 0.5f );
     imageView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 100.0f ) );
     mObjectRootActor.Add( imageView );
 
@@ -125,12 +125,12 @@ public:
     PulseBloomIntensity();
 
     // Respond to key events
-    stage.KeyEventSignal().Connect( this, &BloomExample::OnKeyEvent );
+    window.KeyEventSignal().Connect( this, &BloomExample::OnKeyEvent );
   }
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.state == KeyEvent::Down )
+    if( event.GetState() == KeyEvent::DOWN )
     {
       if ( IsKey( event, Dali::DALI_KEY_ESCAPE ) || IsKey( event, Dali::DALI_KEY_BACK ) )
       {
@@ -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();
   }