Revert "[Tizen] Adds transition effect"
authorSunghyun Kim <scholb.kim@samsung.com>
Mon, 26 Apr 2021 06:49:19 +0000 (15:49 +0900)
committerSunghyun Kim <scholb.kim@samsung.com>
Mon, 26 Apr 2021 06:49:19 +0000 (15:49 +0900)
This reverts commit 68864af60b18a5473a5f49328738facb1b5827e9.

28 files changed:
automated-tests/src/dali-toolkit/CMakeLists.txt
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor-impl.h
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-adaptor.cpp
automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp [deleted file]
dali-toolkit/internal/controls/canvas-view/canvas-view-impl.cpp
dali-toolkit/internal/controls/canvas-view/canvas-view-impl.h
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
dali-toolkit/internal/controls/image-view/image-view-impl.h
dali-toolkit/internal/file.list
dali-toolkit/internal/transition/transition-base-impl.cpp [deleted file]
dali-toolkit/internal/transition/transition-base-impl.h [deleted file]
dali-toolkit/internal/transition/transition-impl.cpp [deleted file]
dali-toolkit/internal/transition/transition-impl.h [deleted file]
dali-toolkit/internal/transition/transition-set-impl.cpp [deleted file]
dali-toolkit/internal/transition/transition-set-impl.h [deleted file]
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.cpp
dali-toolkit/internal/visuals/animated-vector-image/vector-animation-manager.h
dali-toolkit/internal/visuals/svg/svg-rasterize-thread.cpp
dali-toolkit/internal/visuals/svg/svg-rasterize-thread.h
dali-toolkit/public-api/controls/control-impl.cpp
dali-toolkit/public-api/controls/control-impl.h
dali-toolkit/public-api/file.list
dali-toolkit/public-api/transition/transition-base.cpp [deleted file]
dali-toolkit/public-api/transition/transition-base.h [deleted file]
dali-toolkit/public-api/transition/transition-set.cpp [deleted file]
dali-toolkit/public-api/transition/transition-set.h [deleted file]
dali-toolkit/public-api/transition/transition.cpp [deleted file]
dali-toolkit/public-api/transition/transition.h [deleted file]

index ce8e39b..c3ab255 100755 (executable)
@@ -44,7 +44,6 @@ SET(TC_SOURCES
   utc-Dali-TextureManager.cpp
   utc-Dali-ToolBar.cpp
   utc-Dali-Tooltip.cpp
-  utc-Dali-Transition.cpp
   utc-Dali-TransitionData.cpp
   utc-Dali-Button.cpp
   utc-Dali-CameraView.cpp
index 4970dc4..c3616b2 100644 (file)
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_ADAPTOR_IMPL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -84,8 +84,8 @@ public:
   void AddWindow( Internal::Adaptor::SceneHolder* window );
   void RemoveWindow( Internal::Adaptor::SceneHolder* window );
 
-  void RegisterProcessor( Integration::Processor& processor, bool postProcessor = false);
-  void UnregisterProcessor( Integration::Processor& processor, bool postProcessor = false);
+  void RegisterProcessor( Integration::Processor& processor );
+  void UnregisterProcessor( Integration::Processor& processor );
 
   void SetApplication( Dali::TestApplication& testApplication );
 
index 8f3095f..1fe86c3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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.
@@ -172,16 +172,16 @@ void Adaptor::RemoveWindow( Internal::Adaptor::SceneHolder* window )
   }
 }
 
-void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor )
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
 {
   Integration::Core& core = mTestApplication->GetCore();
-  core.RegisterProcessor( processor, postProcessor );
+  core.RegisterProcessor( processor );
 }
 
-void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor )
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
 {
   Integration::Core& core = mTestApplication->GetCore();
-  core.UnregisterProcessor( processor, postProcessor );
+  core.UnregisterProcessor( processor );
 }
 
 void Adaptor::SetApplication( Dali::TestApplication& testApplication )
@@ -368,14 +368,14 @@ const LogFactoryInterface& Adaptor::GetLogFactory()
   return *gLogFactory;
 }
 
-void Adaptor::RegisterProcessor( Integration::Processor& processor, bool postProcessor)
+void Adaptor::RegisterProcessor( Integration::Processor& processor )
 {
-  mImpl->RegisterProcessor( processor, postProcessor );
+  mImpl->RegisterProcessor( processor );
 }
 
-void Adaptor::UnregisterProcessor( Integration::Processor& processor, bool postProcessor)
+void Adaptor::UnregisterProcessor( Integration::Processor& processor )
 {
-  mImpl->UnregisterProcessor( processor, postProcessor );
+  mImpl->UnregisterProcessor( processor );
 }
 
 } // namespace Dali
diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Transition.cpp
deleted file mode 100755 (executable)
index 4830727..0000000
+++ /dev/null
@@ -1,837 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include <iostream>
-#include <stdlib.h>
-#include <dali-toolkit-test-suite-utils.h>
-#include <dali-toolkit/dali-toolkit.h>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
-#include <dali-toolkit/public-api/transition/transition.h>
-
-using namespace Dali;
-using namespace Dali::Toolkit;
-namespace
-{
-
-const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg";
-
-}
-
-// Functor to test whether a Finish signal is emitted
-struct TransitionFinishCheck
-{
-  TransitionFinishCheck(bool& signalReceived)
-  : mSignalReceived(signalReceived)
-  {
-  }
-
-  void operator()(TransitionSet& transitionSet)
-  {
-    mSignalReceived = true;
-  }
-
-  void Reset()
-  {
-    mSignalReceived = false;
-  }
-
-  void CheckSignalReceived()
-  {
-    if(!mSignalReceived)
-    {
-      tet_printf("Expected Finish signal was not received\n");
-      tet_result(TET_FAIL);
-    }
-    else
-    {
-      tet_result(TET_PASS);
-    }
-  }
-
-  void CheckSignalNotReceived()
-  {
-    if(mSignalReceived)
-    {
-      tet_printf("Unexpected Finish signal was received\n");
-      tet_result(TET_FAIL);
-    }
-    else
-    {
-      tet_result(TET_PASS);
-    }
-  }
-
-  bool& mSignalReceived; // owned by individual tests
-};
-
-int UtcDaliTransitionSetGetProperty01(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionSetGetProperty01");
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  controlProperty1.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, 50.f);
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.0f, 0.5f));
-  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, 30.f);
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(-0.1f));
-  transition.ShowSourceAfterFinished(true);
-  DALI_TEST_EQUALS(0.0f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.0f, transition.GetDelay(), TEST_LOCATION);
-
-  transition.SetDuration(0.5f);
-  transition.SetDelay(0.2f);
-  DALI_TEST_EQUALS(0.5f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.2f, transition.GetDelay(), TEST_LOCATION);
-
-  transition.SetTimePeriod(TimePeriod(0.5f, 1.0f));
-  DALI_TEST_EQUALS(1.0f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.5f, transition.GetDelay(), TEST_LOCATION);
-
-  DALI_TEST_EQUALS(Dali::AlphaFunction::DEFAULT, transition.GetAlphaFunction().GetBuiltinFunction(), TEST_LOCATION);
-  transition.SetAlphaFunction(Dali::AlphaFunction::EASE_IN_OUT);
-  DALI_TEST_EQUALS(Dali::AlphaFunction::EASE_IN_OUT, transition.GetAlphaFunction().GetBuiltinFunction(), TEST_LOCATION);
-
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-
-  DALI_TEST_EQUALS(1, transitionSet.GetTransitionCount(), TEST_LOCATION);
-  DALI_TEST_EQUALS(transition, transitionSet.GetTransitionAt(0), TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionSetGetProperty02(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionSetGetProperty02");
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  controlProperty1.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, Vector4(50.0f, 30.0f, 40.0f, 20.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.0f, 0.5f));
-  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, Vector4(32.f, 54.0f, 24.0f, 42.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(-0.1f));
-  transition.ShowSourceAfterFinished(true);
-  DALI_TEST_EQUALS(0.0f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.0f, transition.GetDelay(), TEST_LOCATION);
-
-  transition.SetDuration(0.5f);
-  transition.SetDelay(0.2f);
-  DALI_TEST_EQUALS(0.5f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.2f, transition.GetDelay(), TEST_LOCATION);
-
-  transition.SetTimePeriod(TimePeriod(0.5f, 1.0f));
-  DALI_TEST_EQUALS(1.0f, transition.GetDuration(), TEST_LOCATION);
-  DALI_TEST_EQUALS(0.5f, transition.GetDelay(), TEST_LOCATION);
-
-  DALI_TEST_EQUALS(Dali::AlphaFunction::DEFAULT, transition.GetAlphaFunction().GetBuiltinFunction(), TEST_LOCATION);
-  transition.SetAlphaFunction(Dali::AlphaFunction::EASE_IN_OUT);
-  DALI_TEST_EQUALS(Dali::AlphaFunction::EASE_IN_OUT, transition.GetAlphaFunction().GetBuiltinFunction(), TEST_LOCATION);
-
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-
-  DALI_TEST_EQUALS(1, transitionSet.GetTransitionCount(), TEST_LOCATION);
-  DALI_TEST_EQUALS(transition, transitionSet.GetTransitionAt(0), TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPair(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPair");
-
-  Vector3 destinationPosition(50, 50, 0);
-  Vector3 destinationSize(120, 120, 0);
-  Vector3 destinationScale(2, 1, 0);
-  Vector4 destinationColor(1.0f, 0.5f, 1.0f, 0.8f);
-  float destinationOpacity(0.8f);
-  float destinationRadius(50.f);
-  Vector4 destinationRadiusV4 = Vector4(destinationRadius, destinationRadius, destinationRadius, destinationRadius);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  control1.SetProperty(Actor::Property::SCALE, Vector3(1, 2, 0));
-  control1.SetProperty(Actor::Property::COLOR, Vector4(1.0f, 1.0f, 1.0f, 0.5f));
-  control1.SetProperty(Actor::Property::OPACITY, 0.5f);
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  controlProperty1.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, 30.f);
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, destinationPosition);
-  control2.SetProperty(Actor::Property::SIZE, destinationSize);
-  control2.SetProperty(Actor::Property::SCALE, destinationScale);
-  control2.SetProperty(Actor::Property::COLOR, destinationColor);
-  control2.SetProperty(Actor::Property::OPACITY, destinationOpacity);
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.0f, 0.5f));
-  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, destinationRadius);
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  DALI_TEST_EQUALS(destinationPosition, control2.GetProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
-  Property::Map backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-  DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(50);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalNotReceived();
-
-  DALI_TEST_NOT_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), 0.00001f, TEST_LOCATION);
-  DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION);
-  Dali::Renderer renderer = control2.GetRendererAt(0);
-  Property::Index index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS);
-  cornerRadius = renderer.GetCurrentProperty<Vector4>(index);
-  DALI_TEST_NOT_EQUALS(destinationRadiusV4, cornerRadius, 0.00001f, TEST_LOCATION);
-
-  application.SendNotification();
-  application.Render(700);
-
-  // We did expect the animation to finish
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  DALI_TEST_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
-  DALI_TEST_EQUALS(destinationSize, control2.GetCurrentProperty<Vector3>(Actor::Property::SIZE), TEST_LOCATION);
-  DALI_TEST_EQUALS(destinationScale, control2.GetCurrentProperty<Vector3>(Actor::Property::SCALE), TEST_LOCATION);
-  DALI_TEST_EQUALS(destinationColor, control2.GetCurrentProperty<Vector4>(Actor::Property::COLOR), TEST_LOCATION);
-  DALI_TEST_EQUALS(destinationOpacity, control2.GetCurrentProperty<float>(Actor::Property::OPACITY), TEST_LOCATION);
-  DALI_TEST_EQUALS(1, control2.GetRendererCount(), TEST_LOCATION);
-  renderer = control2.GetRendererAt(0);
-  index = renderer.GetPropertyIndex(DevelVisual::Property::CORNER_RADIUS);
-  cornerRadius = renderer.GetCurrentProperty<Vector4>(index);
-  DALI_TEST_EQUALS(destinationRadiusV4, cornerRadius, TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithoutEmptySourceBackground(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPair");
-
-  Vector4 destinationRadius(50.f, 30.f, 40.f, 0.f);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.0f, 0.5f));
-  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, destinationRadius);
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Property::Map backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  Vector4 cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-  DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(50);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalNotReceived();
-
-  backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-  DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
-
-  application.SendNotification();
-  application.Render(700);
-
-  // We did expect the animation to finish
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  backgroundMap = control2.GetProperty<Property::Map>(Toolkit::Control::Property::BACKGROUND);
-  cornerRadius = backgroundMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-  DALI_TEST_EQUALS(destinationRadius, cornerRadius, TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenImageViewPair(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPair");
-
-  Vector3 destinationPosition(50, 50, 0);
-
-  ImageView control1 = ImageView::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
-  controlProperty1.Insert(Toolkit::ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
-  controlProperty1.Insert(Toolkit::Visual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 0.5f, 0.5f));
-  controlProperty1.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, 50.f);
-  control1.SetProperty(Toolkit::ImageView::Property::IMAGE, controlProperty1);
-
-  ImageView control2 = ImageView::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, destinationPosition);
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::IMAGE);
-  controlProperty2.Insert(Toolkit::ImageVisual::Property::URL, TEST_IMAGE_FILE_NAME);
-  controlProperty2.Insert(Toolkit::Visual::Property::MIX_COLOR, Vector4(1.0f, 1.0f, 1.0f, 1.0f));
-  controlProperty2.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, 30.f);
-  control2.SetProperty(Toolkit::ImageView::Property::IMAGE, controlProperty2);
-
-  DALI_TEST_EQUALS(destinationPosition, control2.GetProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(400);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalNotReceived();
-
-  DALI_TEST_NOT_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), 0.00001f, TEST_LOCATION);
-
-  application.SendNotification();
-  application.Render(200);
-
-  // We did expect the animation to finish
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  DALI_TEST_NOT_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), 0.00001f, TEST_LOCATION);
-
-  application.SendNotification();
-  application.Render(20);
-
-  DALI_TEST_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithTree(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPairWithTree");
-
-  Vector3 destinationPosition(50, 50, 0);
-  Vector3 destinationWorldPosition(-130, -290, 0);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, destinationPosition);
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Control control3 = Control::New();
-  control3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control3.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  control3.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty3;
-  controlProperty3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control3.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty3);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-  control2.Add(control3);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(600);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  DALI_TEST_EQUALS(destinationPosition, control2.GetCurrentProperty<Vector3>(Actor::Property::POSITION), TEST_LOCATION);
-  DALI_TEST_EQUALS(destinationWorldPosition, control2.GetProperty<Vector3>(Actor::Property::WORLD_POSITION), TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithTreeWithChild(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithChild");
-
-  Vector3 destinationWorldPosition(-80, -240, 0);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::POSITION, Vector3(100, 200, 0));
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
-  control2.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Control control3 = Control::New();
-  control3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control3.SetProperty(Actor::Property::POSITION, Vector3(50, 50, 0));
-  control3.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty3;
-  controlProperty3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control3.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty3);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-  control2.Add(control3);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition = Transition::New(control1, control2, TimePeriod(0.5f));
-  transition.TransitionWithChild(true);
-  TransitionSet transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(600);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  DALI_TEST_EQUALS(destinationWorldPosition, control3.GetProperty<Vector3>(Actor::Property::WORLD_POSITION), TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithoutPositionInheritance");
-
-  Vector3 sourcePosition(50, 50, 0);
-  Vector3 destinationPosition(100, 100, 0);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control1.SetProperty(Actor::Property::POSITION, sourcePosition);
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control2.SetProperty(Actor::Property::POSITION, Vector3(150, 150, 0));
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Control control3 = Control::New();
-  control3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control3.SetProperty(Actor::Property::POSITION, destinationPosition);
-  control3.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty3;
-  controlProperty3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control3.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty3);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-  control2.Add(control3);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-
-  // not inherit Position.
-  control3.SetProperty(Actor::Property::INHERIT_POSITION, false);
-  control3.SetProperty(Actor::Property::INHERIT_ORIENTATION, true);
-  control3.SetProperty(Actor::Property::INHERIT_SCALE, true);
-
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
-  transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(300);
-
-  Vector3 currentPosition = control3.GetProperty<Vector3>(Actor::Property::WORLD_POSITION);
-  DALI_TEST_CHECK(currentPosition.x <= destinationPosition.x && currentPosition.x >= sourcePosition.x);
-  DALI_TEST_CHECK(currentPosition.y <= destinationPosition.y && currentPosition.y >= sourcePosition.y);
-  DALI_TEST_CHECK(currentPosition.z <= destinationPosition.z && currentPosition.z >= sourcePosition.z);
-
-  application.SendNotification();
-  application.Render(300);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  DALI_TEST_EQUALS(destinationPosition, control3.GetProperty<Vector3>(Actor::Property::WORLD_POSITION), TEST_LOCATION);
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance");
-
-  Radian sourceAngle(1.0f);
-  Radian destinationAngle(2.0f);
-  Quaternion sourceOrientation(sourceAngle, Vector3::XAXIS);
-  Quaternion destinationOrientation(destinationAngle, Vector3::XAXIS);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control1.SetProperty(Actor::Property::ORIENTATION, sourceOrientation);
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control2.SetProperty(Actor::Property::ORIENTATION, Quaternion(Radian(2.0f), Vector3::XAXIS));
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Control control3 = Control::New();
-  control3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control3.SetProperty(Actor::Property::ORIENTATION, destinationOrientation);
-  control3.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty3;
-  controlProperty3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control3.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty3);
-
-  // not inherit Orientation.
-  control3.SetProperty(Actor::Property::INHERIT_POSITION, true);
-  control3.SetProperty(Actor::Property::INHERIT_ORIENTATION, false);
-  control3.SetProperty(Actor::Property::INHERIT_SCALE, true);
-
-  Vector3 currentAxis;
-  Radian currentRadian;
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-  control2.Add(control3);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Quaternion currentOrientation = control3.GetProperty<Quaternion>(Actor::Property::WORLD_ORIENTATION);
-  DALI_TEST_EQUALS(currentOrientation, destinationOrientation, 0.0001f, TEST_LOCATION);
-
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
-  transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(300);
-
-  currentOrientation = control3.GetProperty<Quaternion>(Actor::Property::WORLD_ORIENTATION);
-  DALI_TEST_NOT_EQUALS(currentOrientation, destinationOrientation, 0.0001f, TEST_LOCATION);
-
-  application.SendNotification();
-  application.Render(300);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  currentOrientation = control3.GetProperty<Quaternion>(Actor::Property::WORLD_ORIENTATION);
-  DALI_TEST_EQUALS(currentOrientation, destinationOrientation, 0.0001f, TEST_LOCATION);
-
-  END_TEST;
-}
-
-int UtcDaliTransitionBetweenControlPairWithTreeWithoutScaleInheritance(void)
-{
-  ToolkitTestApplication application;
-  tet_infoline(" UtcDaliTransitionBetweenControlPairWithTreeWithoutOrientationInheritance");
-
-  Vector3 sourceScale(1, 1, 1);
-  Vector3 destinationScale(2, 2, 1);
-
-  Control control1 = Control::New();
-  control1.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control1.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control1.SetProperty(Actor::Property::SCALE, sourceScale);
-  control1.SetProperty(Actor::Property::SIZE, Vector3(150, 150, 0));
-  Property::Map controlProperty1;
-  controlProperty1.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty1.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control1.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty1);
-
-  Control control2 = Control::New();
-  control2.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control2.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control2.SetProperty(Actor::Property::SCALE, Vector3(3, 3, 1));
-  control2.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty2;
-  controlProperty2.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty2.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control2.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty2);
-
-  Control control3 = Control::New();
-  control3.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
-  control3.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER);
-  control3.SetProperty(Actor::Property::SCALE, destinationScale);
-  control3.SetProperty(Actor::Property::SIZE, Vector3(120, 120, 0));
-  Property::Map controlProperty3;
-  controlProperty3.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-  controlProperty3.Insert(Toolkit::ColorVisual::Property::MIX_COLOR, Vector4(1.0f, 0.0f, 0.0f, 1.0f));
-  control3.SetProperty(Toolkit::Control::Property::BACKGROUND, controlProperty3);
-
-  // not inherit Orientation.
-  control3.SetProperty(Actor::Property::INHERIT_POSITION, true);
-  control3.SetProperty(Actor::Property::INHERIT_ORIENTATION, true);
-  control3.SetProperty(Actor::Property::INHERIT_SCALE, false);
-
-  application.GetScene().Add(control1);
-  application.GetScene().Add(control2);
-  control2.Add(control3);
-
-  application.SendNotification();
-  application.Render(20);
-
-  Vector3 currentScale = control3.GetProperty<Vector3>(Actor::Property::WORLD_SCALE);
-  DALI_TEST_EQUALS(currentScale, destinationScale, 0.0001f, TEST_LOCATION);
-
-  Transition transition;
-  TransitionSet transitionSet;
-  bool signalReceived(false);
-  TransitionFinishCheck finishCheck(signalReceived);
-
-  transition = Transition::New(control1, control3, TimePeriod(0.5f));
-  transitionSet = TransitionSet::New();
-  transitionSet.AddTransition(transition);
-  transitionSet.Play();
-  transitionSet.FinishedSignal().Connect(&application, finishCheck);
-
-  application.SendNotification();
-  application.Render(300);
-
-  currentScale = control3.GetProperty<Vector3>(Actor::Property::WORLD_SCALE);
-  DALI_TEST_CHECK(currentScale.x <= destinationScale.x && currentScale.x >= sourceScale.x);
-  DALI_TEST_CHECK(currentScale.y <= destinationScale.y && currentScale.y >= sourceScale.y);
-  DALI_TEST_CHECK(currentScale.z <= destinationScale.z && currentScale.z >= sourceScale.z);
-
-  application.SendNotification();
-  application.Render(300);
-
-  // We didn't expect the animation to finish yet
-  application.SendNotification();
-  finishCheck.CheckSignalReceived();
-
-  application.SendNotification();
-  application.Render(20);
-
-  currentScale = control3.GetProperty<Vector3>(Actor::Property::WORLD_SCALE);
-  DALI_TEST_EQUALS(currentScale, destinationScale, 0.0001f, TEST_LOCATION);
-
-  END_TEST;
-}
index 342784a..07c77d9 100644 (file)
@@ -120,7 +120,7 @@ void CanvasView::OnSizeSet(const Vector3& targetSize)
   mChanged = true;
 }
 
-void CanvasView::Process(bool postProcessor)
+void CanvasView::Process()
 {
   if(!mCanvasRenderer)
   {
index b2d5775..bc5c708 100644 (file)
@@ -82,7 +82,7 @@ protected: // Implementation of Processor
   /**
    * @copydoc Dali::Integration::Processor::Process()
    */
-  void Process(bool postProcessor) override;
+  void Process() override;
 
 private:
   /**
index 7d287a2..513960f 100644 (file)
@@ -247,65 +247,6 @@ float ImageView::GetWidthForHeight(float height)
   }
 }
 
-void ImageView::CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod period)
-{
-  Control::CreateTransitions(animation, source, alphaFunction, period);
-
-  Dali::Toolkit::ImageView destinationHandle = Toolkit::ImageView(GetOwner());
-  Toolkit::Visual::Base    destinationVisual = DevelControl::GetVisual(GetImplementation(destinationHandle), Toolkit::ImageView::Property::IMAGE);
-  Property::Map            destinationMap;
-
-  if(!destinationVisual)
-  {
-    return;
-  }
-
-  destinationVisual.CreatePropertyMap(destinationMap);
-
-  Vector4 sourceMixColor(0.0f, 0.0f, 0.0f, 0.0f);
-  Vector4 sourceCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
-  Vector4 destinationMixColor     = destinationMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>();
-  Vector4 destinationCornerRadius = destinationMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-
-  Dali::Toolkit::ImageView sourceHandle = Dali::Toolkit::ImageView::DownCast(source);
-  Toolkit::Visual::Base    sourceVisual;
-  Property::Map            sourceMap;
-
-  if(sourceHandle)
-  {
-    sourceVisual = DevelControl::GetVisual(GetImplementation(sourceHandle), Toolkit::ImageView::Property::IMAGE);
-  }
-
-  if(sourceVisual)
-  {
-    sourceVisual.CreatePropertyMap(sourceMap);
-    sourceMixColor     = sourceMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>();
-    sourceCornerRadius = sourceMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-  }
-
-  if(Vector3(sourceMixColor) != Vector3(destinationMixColor))
-  {
-    Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-    keyframes.Add(0.0f, Vector3(sourceMixColor));
-    keyframes.Add(1.0f, Vector3(destinationMixColor));
-    animation.AnimateBetween(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::Visual::Property::MIX_COLOR), keyframes, alphaFunction, period);
-  }
-  if(std::abs(sourceMixColor.a - destinationMixColor.a) > Math::MACHINE_EPSILON_1)
-  {
-    Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-    keyframes.Add(0.0f, sourceMixColor.a);
-    keyframes.Add(1.0f, destinationMixColor.a);
-    animation.AnimateBetween(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::Visual::Property::OPACITY), keyframes, alphaFunction, period);
-  }
-  if(sourceCornerRadius != destinationCornerRadius)
-  {
-    Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-    keyframes.Add(0.0f, sourceCornerRadius);
-    keyframes.Add(1.0f, destinationCornerRadius);
-    animation.AnimateBetween(DevelControl::GetVisualProperty(destinationHandle, Toolkit::ImageView::Property::IMAGE, Toolkit::DevelVisual::Property::CORNER_RADIUS), keyframes, alphaFunction, period);
-  }
-}
-
 void ImageView::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
   Control::OnRelayout(size, container);
index 39337b0..90dc192 100644 (file)
@@ -107,17 +107,6 @@ public:
    */
   void SetDepthIndex(int depthIndex);
 
-  /**
-   * @brief Retrieve visual property animations.
-   * This ImageView is a destination.
-   *
-   * @param[in] animation generated animation
-   * @param[in] source source control of the animation.
-   * @param[in] alphaFunction AlphaFunction of the animation
-   * @param[in] TimePeriod TimePeriod of the animation
-   */
-  void CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod period) override;
-
 private: // From Control
   /**
    * @copydoc Toolkit::Control::OnInitialize
index a2086d8..b3ac24b 100644 (file)
@@ -177,9 +177,6 @@ SET( toolkit_src_files
    ${toolkit_src_dir}/text/rendering/text-backend-impl.cpp
    ${toolkit_src_dir}/text/rendering/text-typesetter.cpp
    ${toolkit_src_dir}/text/rendering/view-model.cpp
-   ${toolkit_src_dir}/transition/transition-base-impl.cpp
-   ${toolkit_src_dir}/transition/transition-impl.cpp
-   ${toolkit_src_dir}/transition/transition-set-impl.cpp
    ${toolkit_src_dir}/transition-effects/cube-transition-effect-impl.cpp
    ${toolkit_src_dir}/transition-effects/cube-transition-cross-effect-impl.cpp
    ${toolkit_src_dir}/transition-effects/cube-transition-fold-effect-impl.cpp
diff --git a/dali-toolkit/internal/transition/transition-base-impl.cpp b/dali-toolkit/internal/transition/transition-base-impl.cpp
deleted file mode 100644 (file)
index 6f02525..0000000
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/transition/transition-base-impl.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/animation/key-frames.h>
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/object/type-registry.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-namespace
-{
-const Dali::AlphaFunction DEFAULT_ALPHA_FUNCTION(Dali::AlphaFunction::DEFAULT);
-
-} // anonymous namespace
-
-TransitionBasePtr TransitionBase::New()
-{
-  TransitionBasePtr transition = new TransitionBase();
-
-  // Second-phase construction
-  transition->Initialize();
-
-  return transition;
-}
-
-TransitionBase::TransitionBase()
-: mAlphaFunction(DEFAULT_ALPHA_FUNCTION),
-  mDurationSeconds(0.0f),
-  mDelaySeconds(0.0f),
-  mTransitionWithChild(false)
-{
-}
-
-void TransitionBase::Initialize()
-{
-  RegisterObject();
-}
-
-void TransitionBase::SetDuration(float seconds)
-{
-  if(seconds < 0.0f)
-  {
-    DALI_LOG_WARNING("duration should be greater than 0.0f.\n");
-    return;
-  }
-
-  mDurationSeconds = seconds;
-}
-
-float TransitionBase::GetDuration() const
-{
-  // This is not animatable; the cached value is up-to-date.
-  return mDurationSeconds;
-}
-
-void TransitionBase::SetDelay(float seconds)
-{
-  if(seconds < 0.0f)
-  {
-    DALI_LOG_WARNING("delay should be greater than 0.0f.\n");
-    return;
-  }
-
-  mDelaySeconds = seconds;
-}
-
-float TransitionBase::GetDelay() const
-{
-  // This is not animatable; the cached value is up-to-date.
-  return mDelaySeconds;
-}
-
-void TransitionBase::SetTimePeriod(const Dali::TimePeriod& timePeriod)
-{
-  if(timePeriod.durationSeconds <= 0.0f || timePeriod.delaySeconds <= 0.0f)
-  {
-    DALI_LOG_WARNING("duration and delay should be greater than 0.0f.\n");
-    return;
-  }
-
-  SetDuration(timePeriod.durationSeconds);
-  SetDelay(timePeriod.delaySeconds);
-}
-
-void TransitionBase::TransitionWithChild(bool transitionWithChild)
-{
-  mTransitionWithChild = transitionWithChild;
-}
-
-void TransitionBase::SetPlay(Dali::Toolkit::TransitionSet transitionSet)
-{
-  mTransitionSet = transitionSet;
-}
-
-void TransitionBase::PreProcess(Dali::Animation animation)
-{
-  mAnimation            = animation;
-  mOriginialPropertyMap = GetProperties(mTargetView);
-  mMoveTargetChildren   = false;
-  if(!mTransitionWithChild && mTargetView.GetChildCount() > 0)
-  {
-    mMoveTargetChildren = true;
-    CopyTarget();
-  }
-  GetImplementation(mTargetView).SetTransparent(false);
-}
-
-void TransitionBase::Play()
-{
-  if(!mTargetView[Dali::Actor::Property::CONNECTED_TO_SCENE])
-  {
-    DALI_LOG_ERROR("The target view is not added on the window\n");
-    return;
-  }
-
-  OnPlay();
-
-  SetAnimation();
-}
-
-Property::Map TransitionBase::GetProperties(Dali::Toolkit::Control control)
-{
-  Property::Map propertyMap;
-  propertyMap.Insert(Dali::Actor::Property::ANCHOR_POINT, control[Dali::Actor::Property::ANCHOR_POINT]);
-  propertyMap.Insert(Dali::Actor::Property::PARENT_ORIGIN, control[Dali::Actor::Property::PARENT_ORIGIN]);
-  propertyMap.Insert(Dali::Actor::Property::POSITION_USES_ANCHOR_POINT, control[Dali::Actor::Property::POSITION_USES_ANCHOR_POINT]);
-  propertyMap.Insert(Dali::Actor::Property::INHERIT_POSITION, control[Dali::Actor::Property::INHERIT_POSITION]);
-  propertyMap.Insert(Dali::Actor::Property::INHERIT_ORIENTATION, control[Dali::Actor::Property::INHERIT_ORIENTATION]);
-  propertyMap.Insert(Dali::Actor::Property::INHERIT_SCALE, control[Dali::Actor::Property::INHERIT_SCALE]);
-  propertyMap.Insert(Dali::Actor::Property::COLOR_MODE, control[Dali::Actor::Property::COLOR_MODE]);
-  propertyMap.Insert(Dali::Actor::Property::POSITION, control[Dali::Actor::Property::POSITION]);
-  propertyMap.Insert(Dali::Actor::Property::ORIENTATION, control[Dali::Actor::Property::ORIENTATION]);
-  propertyMap.Insert(Dali::Actor::Property::SCALE, control[Dali::Actor::Property::SCALE]);
-  propertyMap.Insert(Dali::Actor::Property::COLOR, control[Dali::Actor::Property::COLOR]);
-
-  return propertyMap;
-}
-
-void TransitionBase::SetAnimation()
-{
-  if(!mAnimation)
-  {
-    DALI_LOG_ERROR("animation is not initialized\n");
-    return;
-  }
-
-  for(uint32_t i = 0; i < mStartPropertyMap.Count(); ++i)
-  {
-    Property::Value* finishValue = mFinishPropertyMap.Find(mStartPropertyMap.GetKeyAt(i).indexKey);
-    if(finishValue)
-    {
-      AnimateBetween(mTargetView, mStartPropertyMap.GetKeyAt(i).indexKey, mStartPropertyMap.GetValue(i), *finishValue);
-    }
-  }
-}
-
-void TransitionBase::AnimateBetween(Dali::Toolkit::Control target, Property::Index index, Property::Value sourceValue, Property::Value destinationValue)
-{
-  if(mAnimation)
-  {
-    Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-    keyframes.Add(0.0f, sourceValue);
-    keyframes.Add(1.0f, destinationValue);
-    mAnimation.AnimateBetween(Property(target, index), keyframes, mAlphaFunction, TimePeriod(mDelaySeconds, mDurationSeconds));
-  }
-}
-
-void TransitionBase::CopyTarget()
-{
-  mCopiedActor = Dali::Actor::New();
-  mTargetView.GetParent().Add(mCopiedActor);
-  mCopiedActor[Dali::DevelActor::Property::SIBLING_ORDER] = static_cast<int32_t>(mTargetView[Dali::DevelActor::Property::SIBLING_ORDER]) + 1;
-  for(uint32_t i = 0; i < mTargetView.GetChildCount(); ++i)
-  {
-    Dali::Actor child = mTargetView.GetChildAt(i);
-    Dali::DevelActor::SwitchParent(child, mCopiedActor);
-  }
-
-  // Animation to set property instantly without SetProperty.
-  mCopiedActor[Dali::Actor::Property::SIZE] = mTargetView.GetProperty<Vector3>(Dali::Actor::Property::SIZE);
-  mCopiedActor.SetProperties(mOriginialPropertyMap);
-}
-
-void TransitionBase::TransitionFinished()
-{
-  OnFinished();
-
-  mTargetView.SetProperties(mOriginialPropertyMap);
-  if(mMoveTargetChildren)
-  {
-    for(uint32_t i = 0; i < mCopiedActor.GetChildCount(); ++i)
-    {
-      Dali::Actor child = mCopiedActor.GetChildAt(i);
-      Dali::DevelActor::SwitchParent(child, mTargetView);
-    }
-    mCopiedActor.Unparent();
-    mCopiedActor.Reset();
-  }
-  mTransitionSet.Reset();
-  mAnimation.Reset();
-}
-
-Matrix TransitionBase::GetWorldTransform(Dali::Actor actor)
-{
-  enum InheritanceMode
-  {
-    DONT_INHERIT_TRANSFORM = 0,
-    INHERIT_POSITION       = 1,
-    INHERIT_SCALE          = 2,
-    INHERIT_ORIENTATION    = 4,
-    INHERIT_ALL            = INHERIT_POSITION | INHERIT_SCALE | INHERIT_ORIENTATION,
-  };
-
-  std::vector<Dali::Actor>     descentList;
-  std::vector<InheritanceMode> inheritanceModeList;
-  Dali::Actor                  currentActor = actor;
-  int                          inheritance  = 0;
-  do
-  {
-    inheritance = (static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_ORIENTATION)) << 2) +
-                  (static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_SCALE)) << 1) +
-                  static_cast<int>(currentActor.GetProperty<bool>(Dali::Actor::Property::INHERIT_POSITION));
-    inheritanceModeList.push_back(static_cast<InheritanceMode>(inheritance));
-    descentList.push_back(currentActor);
-    currentActor = currentActor.GetParent();
-  } while(inheritance != DONT_INHERIT_TRANSFORM && currentActor);
-
-  Matrix  worldMatrix;
-  Vector3 localPosition;
-  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
-  {
-    Vector3    anchorPoint             = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::ANCHOR_POINT);
-    Vector3    parentOrigin            = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::PARENT_ORIGIN);
-    bool       positionUsesAnchorPoint = descentList[i].GetProperty<bool>(Dali::Actor::Property::POSITION_USES_ANCHOR_POINT);
-    Vector3    size                    = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::SIZE);
-    Vector3    actorPosition           = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::POSITION);
-    Quaternion localOrientation        = descentList[i].GetProperty<Quaternion>(Dali::Actor::Property::ORIENTATION);
-    Vector3    localScale              = descentList[i].GetProperty<Vector3>(Dali::Actor::Property::SCALE);
-
-    Vector3 centerPosition = CalculateCenterPosition(anchorPoint, positionUsesAnchorPoint, size, localScale, localOrientation);
-    if(inheritanceModeList[i] != DONT_INHERIT_TRANSFORM && descentList[i].GetParent())
-    {
-      Matrix  localMatrix;
-      Vector3 parentSize = descentList[i + 1].GetProperty<Vector3>(Dali::Actor::Property::SIZE);
-      if(inheritanceModeList[i] == INHERIT_ALL)
-      {
-        localPosition = actorPosition + centerPosition + (parentOrigin - Vector3(0.5f, 0.5f, 0.5f)) * parentSize;
-        localMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-
-        //Update the world matrix
-        Matrix tempMatrix;
-        Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-        worldMatrix = tempMatrix;
-      }
-      else
-      {
-        Vector3    parentPosition, parentScale;
-        Quaternion parentOrientation;
-        worldMatrix.GetTransformComponents(parentPosition, parentOrientation, parentScale);
-
-        if((inheritanceModeList[i] & INHERIT_SCALE) == 0)
-        {
-          //Don't inherit scale
-          localScale /= parentScale;
-        }
-
-        if((inheritanceModeList[i] & INHERIT_ORIENTATION) == 0)
-        {
-          //Don't inherit orientation
-          parentOrientation.Invert();
-          localOrientation = parentOrientation * localOrientation;
-        }
-
-        if((inheritanceModeList[i] & INHERIT_POSITION) == 0)
-        {
-          localMatrix.SetTransformComponents(localScale, localOrientation, Vector3::ZERO);
-          Matrix tempMatrix;
-          Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-          worldMatrix = tempMatrix;
-          worldMatrix.SetTranslation(actorPosition + centerPosition);
-        }
-        else
-        {
-          localPosition = actorPosition + centerPosition + (parentOrigin - Vector3(0.5f, 0.5f, 0.5f)) * parentSize;
-          localMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-          Matrix tempMatrix;
-          Matrix::Multiply(tempMatrix, localMatrix, worldMatrix);
-          worldMatrix = tempMatrix;
-        }
-      }
-    }
-    else
-    {
-      localPosition = actorPosition + centerPosition;
-      worldMatrix.SetTransformComponents(localScale, localOrientation, localPosition);
-    }
-  }
-
-  return worldMatrix;
-}
-
-Vector4 TransitionBase::GetWorldColor(Dali::Actor actor)
-{
-  std::vector<Dali::Actor>     descentList;
-  std::vector<Dali::ColorMode> inheritanceModeList;
-  Dali::Actor                  currentActor = actor;
-  Dali::ColorMode              inheritance  = Dali::ColorMode::USE_OWN_MULTIPLY_PARENT_ALPHA;
-  do
-  {
-    inheritance = currentActor.GetProperty<Dali::ColorMode>(Dali::Actor::Property::COLOR_MODE);
-    inheritanceModeList.push_back(inheritance);
-    descentList.push_back(currentActor);
-    currentActor = currentActor.GetParent();
-  } while(inheritance != Dali::ColorMode::USE_OWN_COLOR && currentActor);
-
-  Vector4 worldColor;
-  for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i)
-  {
-    if(inheritanceModeList[i] == USE_OWN_COLOR || i == descentList.size() - 1)
-    {
-      worldColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-    }
-    else if(inheritanceModeList[i] == USE_OWN_MULTIPLY_PARENT_ALPHA)
-    {
-      Vector4 ownColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-      worldColor       = Vector4(ownColor.r, ownColor.g, ownColor.b, ownColor.a * worldColor.a);
-    }
-    else if(inheritanceModeList[i] == USE_OWN_MULTIPLY_PARENT_COLOR)
-    {
-      Vector4 ownColor = descentList[i].GetProperty<Vector4>(Dali::Actor::Property::COLOR);
-      worldColor *= ownColor;
-    }
-  }
-
-  return worldColor;
-}
-
-Vector3 TransitionBase::CalculateCenterPosition(
-  const Vector3&    anchorPoint,
-  const bool        positionUsesAnchorPoint,
-  const Vector3&    size,
-  const Vector3&    scale,
-  const Quaternion& orientation)
-{
-  Vector3       centerPosition;
-  const Vector3 half(0.5f, 0.5f, 0.5f);
-  const Vector3 topLeft(0.0f, 0.0f, 0.5f);
-  // Calculate the center-point by applying the scale and rotation on the anchor point.
-  centerPosition = (half - anchorPoint) * size * scale;
-  centerPosition *= orientation;
-
-  // If the position is ignoring the anchor-point, then remove the anchor-point shift from the position.
-  if(!positionUsesAnchorPoint)
-  {
-    centerPosition -= (topLeft - anchorPoint) * size;
-  }
-  return centerPosition;
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/transition/transition-base-impl.h b/dali-toolkit/internal/transition/transition-base-impl.h
deleted file mode 100644 (file)
index 76ab1d8..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-#ifndef DALI_INTERNAL_TRANSITION_BASE_H
-#define DALI_INTERNAL_TRANSITION_BASE_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/animation/animation.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/object/property-map.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-using TransitionBasePtr = IntrusivePtr<TransitionBase>;
-
-class TransitionBase : public BaseObject
-{
-public:
-  /**
-   * @brief Create a new TransitionBase object.
-   * @return A smart-pointer to the newly allocated TransitionBase.
-   */
-  static TransitionBasePtr New();
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::SetDuration()
-   */
-  void SetDuration(float seconds);
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::GetDuration()
-   */
-  float GetDuration() const;
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::SetDelay()
-   */
-  void SetDelay(float seconds);
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::GetDelay()
-   */
-  float GetDelay() const;
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::SetTimePeriod()
-   */
-  void SetTimePeriod(const Dali::TimePeriod& timePeriod);
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::SetAlphaFunction()
-   */
-  void SetAlphaFunction(AlphaFunction alphaFunction)
-  {
-    mAlphaFunction = alphaFunction;
-  }
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::GetAlphaFunction()
-   */
-  AlphaFunction GetAlphaFunction() const
-  {
-    return mAlphaFunction;
-  }
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionBase::TransitionWithChild()
-   */
-  void TransitionWithChild(bool transitionWithChild);
-
-  /**
-   * @brief Request to play this transition.
-   * @param[in] transitionSet transitionSet that this transitionBase is added.
-   */
-  void SetPlay(Dali::Toolkit::TransitionSet transitionSet);
-
-  /**
-   * @brief Run processes those are required done before size/position negotiation.
-   * @param[in] animation animation for the transition
-   */
-  void PreProcess(Dali::Animation animation);
-
-  /**
-   * @brief Make property animation for Transition
-   */
-  void Play();
-
-  /**
-   * Emit the Finished signal
-   */
-  void TransitionFinished();
-
-protected:
-  /**
-   * @brief Set property map which will be used ad a animation start properties.
-   * @param[in] propertyMap propertyMap that will be used as a start value of transition.
-   */
-  void SetStartPropertyMap(Property::Map propertyMap)
-  {
-    mStartPropertyMap = propertyMap;
-  }
-
-  /**
-   * @brief Set property map which will be used ad a animation finish properties.
-   * @param[in] propertyMap propertyMap that will be used as a finish value of transition.
-   */
-  void SetFinishPropertyMap(Property::Map propertyMap)
-  {
-    mFinishPropertyMap = propertyMap;
-  }
-
-  /**
-   * @brief Retrieve animation.
-   */
-  Dali::Animation GetAnimation()
-  {
-    return mAnimation;
-  }
-
-  /**
-   * @brief Set target view which will be transition.
-   * @param[in] targetView control that will be transition.
-   */
-  void SetTargetView(Dali::Toolkit::Control targetView)
-  {
-    mTargetView = targetView;
-  }
-
-  /**
-   * @brief Gets world transform of input Actor.
-   * @param[in] actor actor for get world transform.
-   */
-  Matrix GetWorldTransform(Dali::Actor actor);
-
-  /**
-   * @brief Gets world color of input Actor.
-   * @param[in] actor actor for get world color.
-   */
-  Vector4 GetWorldColor(Dali::Actor actor);
-
-protected:
-  /**
-   * Construct a new TransitionBase.
-   */
-  TransitionBase();
-
-  /**
-   * Second-phase constructor.
-   */
-  void Initialize();
-
-  /**
-   * Destructor
-   */
-  ~TransitionBase() = default;
-
-private:
-  // Undefined
-  TransitionBase(const TransitionBase&);
-
-  // Undefined
-  TransitionBase& operator=(const TransitionBase& rhs);
-
-private:
-  /**
-   * @brief Computes and center position by using transform properties.
-   * @param[in] anchorPoint anchorPoint of an actor.
-   * @param[in] positionUsesAnchorPoint positionUsesAnchorPoint of an actor.
-   * @param[in] size size of an actor.
-   * @param[in] scale scale of an actor.
-   * @param[in] orientation orientation of an actor.
-   */
-  Vector3 CalculateCenterPosition(
-    const Vector3&    anchorPoint,
-    const bool        positionUsesAnchorPoint,
-    const Vector3&    size,
-    const Vector3&    scale,
-    const Quaternion& orientation);
-
-  /**
-   * @brief Makes property animation for transition.
-   */
-  void SetAnimation();
-
-  /**
-   * @brief Gets Properties of input control.
-   * @param[in] control control to get properties.
-   */
-  Property::Map GetProperties(Dali::Toolkit::Control control);
-
-  /**
-   * @brief Adds a property on an animation between sourceValue and destimationValue.
-   * @param[in] target target control to be animated.
-   * @param[in] index property index for animation.
-   * @param[in] sourceValue source value of animation.
-   * @param[in] destinationValue destination value of animation.
-   */
-  void AnimateBetween(Dali::Toolkit::Control target, Property::Index index, Property::Value sourceValue, Property::Value destinationValue);
-
-  /**
-   * @brief Copy target view to make clone for the child Actors
-   */
-  void CopyTarget();
-
-  /**
-   * @brief Make animators for Transform.
-   * If the transition requires the information of world transform, let them be in this method.
-   *
-   * @note Do not set any properties in this methods.
-   */
-  virtual void OnPlay()
-  {
-  }
-
-  /**
-   * @brief Make animators for Transform.
-   * If the transition requires the information of world transform, let them be in this method.
-   *
-   * @note Do not set any properties in this methods.
-   */
-  virtual void OnFinished()
-  {
-  }
-
-private:
-  Dali::Toolkit::Control       mTargetView;           ///< Target View that will be animated.
-  Dali::Actor                  mCopiedActor;          ///< Copied View that will replace mTargetView during transition
-  Dali::Animation              mAnimation;            ///< Property animations for the transition of mTargetView
-  Dali::Toolkit::TransitionSet mTransitionSet;        ///< Handle of TransitionSet
-  AlphaFunction                mAlphaFunction;        ///< Alpha function that will applied for the property animation
-  Property::Map                mStartPropertyMap;     ///< Start properties to be animated. (world transform)
-  Property::Map                mFinishPropertyMap;    ///< Finish properties to be animated. (world transform)
-  Property::Map                mOriginialPropertyMap; ///< Original properties of mTargetView to be used to restore after the transition is finished.
-  float                        mDurationSeconds;      ///< Duration of transition (seconds)
-  float                        mDelaySeconds;         ///< Delay to be started to play transition (seconds)
-  bool                         mTransitionWithChild;  ///< True, if mTargetView transition is inherit to its child Actors.
-                                                      ///< If this is false, the child Actors are moved to the child of mCopiedActor that will have original properties of target Actor during Transition.
-  bool mMoveTargetChildren;                           ///< Flag, if mTransitionWithChild is false and mTargetView has children than True.
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::TransitionBase& GetImplementation(Dali::Toolkit::TransitionBase& animation)
-{
-  DALI_ASSERT_ALWAYS(animation && "TransitionBase handle is empty");
-
-  BaseObject& handle = animation.GetBaseObject();
-
-  return static_cast<Internal::TransitionBase&>(handle);
-}
-
-inline const Internal::TransitionBase& GetImplementation(const Dali::Toolkit::TransitionBase& animation)
-{
-  DALI_ASSERT_ALWAYS(animation && "TransitionBase handle is empty");
-
-  const BaseObject& handle = animation.GetBaseObject();
-
-  return static_cast<const Internal::TransitionBase&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_TRANSITION_BASE_H
diff --git a/dali-toolkit/internal/transition/transition-impl.cpp b/dali-toolkit/internal/transition/transition-impl.cpp
deleted file mode 100644 (file)
index f771585..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/transition/transition-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/common/dali-common.h>
-#include <dali/public-api/object/type-registry.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-namespace
-{
-const Dali::AlphaFunction DEFAULT_ALPHA_FUNCTION(Dali::AlphaFunction::DEFAULT);
-
-} // anonymous namespace
-
-TransitionPtr Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
-{
-  float durationSeconds = timePeriod.durationSeconds;
-  if(durationSeconds < 0.0f)
-  {
-    DALI_LOG_WARNING("duration should be greater than 0.0f.\n");
-    durationSeconds = 0.0f;
-  }
-
-  TransitionPtr transition = new Transition(source, destination, timePeriod);
-
-  // Second-phase construction
-  transition->Initialize();
-
-  return transition;
-}
-
-Transition::Transition(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
-: TransitionBase(),
-  mSourceView(source),
-  mDestinationView(destination),
-  mShowSourceAfterFinished(true)
-{
-  SetTargetView(destination);
-  SetDuration(timePeriod.durationSeconds);
-  SetDelay(timePeriod.delaySeconds);
-}
-
-Transition::~Transition()
-{
-}
-
-void Transition::OnPlay()
-{
-  if(!mSourceView[Dali::Actor::Property::CONNECTED_TO_SCENE] ||
-     !mDestinationView[Dali::Actor::Property::CONNECTED_TO_SCENE])
-  {
-    DALI_LOG_ERROR("The source or destination is not added on the window\n");
-    return;
-  }
-
-  //Make startPropertyMap and finishPropertyMap to use for property animation.
-  Matrix     sourceWorldTransform = mSourceView[Dali::Actor::Property::WORLD_MATRIX];
-  Vector3    sourcePosition, sourceScale;
-  Quaternion sourceOrientation;
-  sourceWorldTransform.GetTransformComponents(sourcePosition, sourceOrientation, sourceScale);
-
-  Matrix     destinationWorldTransform = GetWorldTransform(mDestinationView);
-  Vector3    destinationPosition, destinationScale;
-  Quaternion destinationOrientation;
-  destinationWorldTransform.GetTransformComponents(destinationPosition, destinationOrientation, destinationScale);
-
-  Vector3       targetSize  = mDestinationView[Dali::Actor::Property::SIZE];
-  Vector4       targetColor = GetWorldColor(mDestinationView);
-  Property::Map startPropertyMap;
-  Property::Map finishPropertyMap;
-
-  // Use world transform if this transition requires animation of transform.
-  mDestinationView[Dali::Actor::Property::ANCHOR_POINT]               = AnchorPoint::CENTER;
-  mDestinationView[Dali::Actor::Property::PARENT_ORIGIN]              = ParentOrigin::CENTER;
-  mDestinationView[Dali::Actor::Property::POSITION_USES_ANCHOR_POINT] = true;
-  mDestinationView[Dali::Actor::Property::INHERIT_POSITION]           = false;
-  mDestinationView[Dali::Actor::Property::INHERIT_ORIENTATION]        = false;
-  mDestinationView[Dali::Actor::Property::INHERIT_SCALE]              = false;
-  mDestinationView[Dali::Actor::Property::COLOR_MODE]                 = Dali::ColorMode::USE_OWN_COLOR;
-
-  // Set animation of Transform
-  startPropertyMap.Insert(Dali::Actor::Property::POSITION, sourcePosition);
-  finishPropertyMap.Insert(Dali::Actor::Property::POSITION, destinationPosition);
-
-  startPropertyMap.Insert(Dali::Actor::Property::ORIENTATION, sourceOrientation);
-  finishPropertyMap.Insert(Dali::Actor::Property::ORIENTATION, destinationOrientation);
-
-  startPropertyMap.Insert(Dali::Actor::Property::SCALE, sourceScale);
-  finishPropertyMap.Insert(Dali::Actor::Property::SCALE, destinationScale);
-
-  Vector4 sourceColor = mSourceView.GetCurrentProperty<Vector4>(Dali::Actor::Property::WORLD_COLOR);
-  startPropertyMap.Insert(Dali::Actor::Property::COLOR, sourceColor);
-  finishPropertyMap.Insert(Dali::Actor::Property::COLOR, targetColor);
-
-  // Set animation for other properties if source and destination is different.
-  Vector3 sourceSize = mSourceView.GetCurrentProperty<Vector3>(Dali::Actor::Property::SIZE);
-  if(sourceSize != targetSize)
-  {
-    startPropertyMap.Insert(Dali::Actor::Property::SIZE, sourceSize);
-    finishPropertyMap.Insert(Dali::Actor::Property::SIZE, targetSize);
-  }
-
-  SetStartPropertyMap(startPropertyMap);
-  SetFinishPropertyMap(finishPropertyMap);
-
-  // source View becomes transparent during transition.
-  GetImplementation(mSourceView).SetTransparent(true);
-
-  Dali::Animation animation = GetAnimation();
-  if(!animation)
-  {
-    DALI_LOG_ERROR("animation is still not initialized\n");
-    return;
-  }
-  GetImplementation(mDestinationView).CreateTransitions(animation, mSourceView, GetAlphaFunction(), TimePeriod(GetDelay(), GetDuration()));
-}
-
-void Transition::OnFinished()
-{
-  if(mShowSourceAfterFinished)
-  {
-    GetImplementation(mSourceView).SetTransparent(false);
-  }
-}
-
-void Transition::ShowSourceAfterFinished(bool showSourceAfterFinished)
-{
-  mShowSourceAfterFinished = showSourceAfterFinished;
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/transition/transition-impl.h b/dali-toolkit/internal/transition/transition-impl.h
deleted file mode 100644 (file)
index 7692368..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-#ifndef DALI_INTERNAL_TRANSITION_H
-#define DALI_INTERNAL_TRANSITION_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/transition/transition-base-impl.h>
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/transition/transition.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-using TransitionPtr = IntrusivePtr<Transition>;
-
-class Transition : public TransitionBase
-{
-public:
-  /**
-   * @brief Create a new Transition object.
-   * @param[in] source A source control of this transition.
-   * @param[in] destination A destination control of this transition.
-   * @param[in] durationSeconds The duration of the animation.
-   * @return A smart-pointer to the newly allocated Transition.
-   */
-  static TransitionPtr New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod);
-
-  /**
-   * @copydoc Dali::Toolkit::Transition::ShowSourceAfterFinished()
-   */
-  void ShowSourceAfterFinished(bool showSourceAfterFinished);
-
-protected:
-  /**
-   * @copydoc Dali::Toolkit::Transition::OnPlay()
-   */
-  void OnPlay() override;
-
-  /**
-   * @brief Emit the Finished signal
-   */
-  void OnFinished() override;
-
-protected:
-  /**
-   * @brief Construct a new Transition.
-   */
-  Transition(Dali::Toolkit::Control source,
-             Dali::Toolkit::Control destination,
-             TimePeriod             timePeriod);
-
-  /**
-   * @brief A reference counted object may only be deleted by calling Unreference()
-   */
-  ~Transition() override;
-
-private:
-  // Undefined
-  Transition(const Transition&);
-
-  // Undefined
-  Transition& operator=(const Transition& rhs);
-
-private:
-  Dali::Toolkit::Control mSourceView;
-  Dali::Toolkit::Control mDestinationView;
-  bool                   mShowSourceAfterFinished;
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::Transition& GetImplementation(Dali::Toolkit::Transition& transition)
-{
-  DALI_ASSERT_ALWAYS(transition && "Transition handle is empty");
-
-  BaseObject& handle = transition.GetBaseObject();
-
-  return static_cast<Internal::Transition&>(handle);
-}
-
-inline const Internal::Transition& GetImplementation(const Dali::Toolkit::Transition& transition)
-{
-  DALI_ASSERT_ALWAYS(transition && "Transition handle is empty");
-
-  const BaseObject& handle = transition.GetBaseObject();
-
-  return static_cast<const Internal::Transition&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_TRANSITION_H
diff --git a/dali-toolkit/internal/transition/transition-set-impl.cpp b/dali-toolkit/internal/transition/transition-set-impl.cpp
deleted file mode 100644 (file)
index a7148df..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/internal/transition/transition-set-impl.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/adaptor-framework/adaptor.h>
-#include <dali/integration-api/debug.h>
-#include <dali/public-api/object/type-registry.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-namespace
-{
-// Signals
-static constexpr std::string_view SIGNAL_FINISHED = "finished";
-
-BaseHandle Create()
-{
-  return Dali::Toolkit::TransitionSet::New();
-}
-
-TypeRegistration mType(typeid(Dali::Toolkit::TransitionSet), typeid(Dali::BaseHandle), Create);
-
-SignalConnectorType signalConnector1(mType, std::string(SIGNAL_FINISHED), &TransitionSet::DoConnectSignal);
-
-} // anonymous namespace
-
-TransitionSetPtr TransitionSet::New()
-{
-  TransitionSetPtr transitionSet = new TransitionSet();
-
-  return transitionSet;
-}
-
-TransitionSet::TransitionSet()
-{
-}
-
-TransitionSet::~TransitionSet()
-{
-  mTransitions.clear();
-  mPlaylist.clear();
-}
-
-void TransitionSet::AddTransition(TransitionBasePtr transition)
-{
-  mTransitions.push_back(transition);
-}
-
-TransitionBase* TransitionSet::GetTransitionAt(uint32_t index) const
-{
-  TransitionBase* result(nullptr);
-  if(index < GetTransitionCount())
-  {
-    result = mTransitions[index].Get();
-  }
-  else
-  {
-    DALI_LOG_ERROR("Error: Invalid index to TextureSet::GetTexture\n");
-  }
-
-  return result;
-}
-
-uint32_t TransitionSet::GetTransitionCount() const
-{
-  return mTransitions.size();
-}
-
-void TransitionSet::QueueToPlay()
-{
-  for(auto&& transition : mTransitions)
-  {
-    transition->SetPlay(Dali::Toolkit::TransitionSet(this));
-  }
-
-  Adaptor::Get().RegisterProcessor(*this, true);
-  Adaptor::Get().RegisterProcessor(*this, false);
-}
-
-void TransitionSet::TransitionPreProcess()
-{
-  float lastDuration = 0.0f;
-  for(auto&& transition : mTransitions)
-  {
-    if(lastDuration <= transition->GetDuration() + transition->GetDelay())
-    {
-      lastDuration = transition->GetDuration() + transition->GetDelay();
-    }
-  }
-  mAnimation = Dali::Animation::New(lastDuration);
-
-  for(auto&& transition : mTransitions)
-  {
-    transition->PreProcess(mAnimation);
-  }
-}
-
-void TransitionSet::TransitionStart()
-{
-  mPlaylist.clear();
-  for(auto&& transition : mTransitions)
-  {
-    mPlaylist.push_back(transition);
-    transition->Play();
-  }
-
-  mAnimation.FinishedSignal().Connect(this, &TransitionSet::TransitionFinished);
-  mAnimation.Play();
-}
-
-void TransitionSet::TransitionFinished(Dali::Animation& source)
-{
-  for(auto&& transition : mTransitions)
-  {
-    transition->TransitionFinished();
-  }
-
-  mPlaylist.clear();
-  EmitSignalFinish();
-}
-
-Dali::Toolkit::TransitionSet::TransitionSetSignalType& TransitionSet::FinishedSignal()
-{
-  return mFinishedSignal;
-}
-
-void TransitionSet::EmitSignalFinish()
-{
-  if(!mFinishedSignal.Empty())
-  {
-    Dali::Toolkit::TransitionSet handle(this);
-    mFinishedSignal.Emit(handle);
-  }
-}
-
-bool TransitionSet::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor)
-{
-  bool           connected(false);
-  TransitionSet* transitionSet = static_cast<TransitionSet*>(object); // TypeRegistry guarantees that this is the correct type.
-
-  if(SIGNAL_FINISHED == signalName)
-  {
-    transitionSet->FinishedSignal().Connect(tracker, functor);
-    connected = true;
-  }
-
-  return connected;
-}
-
-void TransitionSet::Process(bool postProcessor)
-{
-  if(!postProcessor)
-  {
-    TransitionPreProcess();
-  }
-  else
-  {
-    TransitionStart();
-  }
-
-  if(Adaptor::IsAvailable())
-  {
-    Adaptor::Get().UnregisterProcessor(*this, postProcessor);
-  }
-}
-
-} // namespace Internal
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/internal/transition/transition-set-impl.h b/dali-toolkit/internal/transition/transition-set-impl.h
deleted file mode 100644 (file)
index 8135978..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-#ifndef DALI_INTERNAL_TRANSITION_SET_H
-#define DALI_INTERNAL_TRANSITION_SET_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/transition/transition-impl.h>
-#include <dali-toolkit/public-api/transition/transition-set.h>
-
-// EXTERNAL INCLUDES
-#include <dali/integration-api/processor-interface.h>
-#include <dali/public-api/object/base-object.h>
-#include <dali/public-api/signals/connection-tracker.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal
-{
-using TransitionSetPtr = IntrusivePtr<TransitionSet>;
-
-class TransitionSet : public BaseObject, public ConnectionTracker, public Integration::Processor
-{
-public:
-  /**
-   * Create a new TransitionSet object.
-   * @return A smart-pointer to the newly allocated TransitionSet.
-   */
-  static TransitionSetPtr New();
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionSet::AddTransition(TransitionPtr transition)
-   */
-  void AddTransition(TransitionBasePtr transition);
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionSet::GetTransitionAt(uint32_t index)
-   */
-  TransitionBase* GetTransitionAt(uint32_t index) const;
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionSet::GetTransitionCount()
-   */
-  uint32_t GetTransitionCount() const;
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionSet::QueueToPlay()
-   */
-  void QueueToPlay();
-
-  /**
-   * @brief Set pre process of each transition.
-   */
-  void TransitionPreProcess();
-
-  /**
-   * @brief Start to play each of Transition.
-   * This method called at the end of event thread tick, and this method call OnPlay method of TransitionBase internally.
-   */
-  void TransitionStart();
-
-  /**
-   * @brief Remove each finished TransitionBase from play list.
-   * If all transitions are finished emit Finished signal.
-   */
-  void TransitionFinished(Dali::Animation& source);
-
-  /**
-   * @copydoc Dali::Toolkit::TransitionSet::FinishedSignal()
-   */
-  Dali::Toolkit::TransitionSet::TransitionSetSignalType& FinishedSignal();
-
-  /**
-   * Emit the Finished signal
-   */
-  void EmitSignalFinish();
-
-  /**
-   * Connects a callback function with the object's signals.
-   * @param[in] object The object providing the signal.
-   * @param[in] tracker Used to disconnect the signal.
-   * @param[in] signalName The signal to connect to.
-   * @param[in] functor A newly allocated FunctorDelegate.
-   * @return True if the signal was connected.
-   * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor.
-   */
-  static bool DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor);
-
-protected: // Implementation of Processor
-  /**
-   * @copydoc Dali::Integration::Processor::Process()
-   */
-  void Process(bool postProcessor) override;
-
-protected:
-  /**
-   * Construct a new TransitionSet.
-   */
-  TransitionSet();
-
-  /**
-   * A reference counted object may only be deleted by calling Unreference()
-   */
-  ~TransitionSet() override;
-
-private:
-  // Undefined
-  TransitionSet(const TransitionSet&);
-
-  // Undefined
-  TransitionSet& operator=(const TransitionSet& rhs);
-
-private:
-  Dali::Toolkit::TransitionSet::TransitionSetSignalType mFinishedSignal{};
-  std::vector<TransitionBasePtr>                        mTransitions;
-  std::vector<TransitionBasePtr>                        mPlaylist;
-  Dali::Animation                                       mAnimation;
-};
-
-} // namespace Internal
-
-// Helpers for public-api forwarding methods
-
-inline Internal::TransitionSet& GetImplementation(Dali::Toolkit::TransitionSet& transitionSet)
-{
-  DALI_ASSERT_ALWAYS(transitionSet && "TransitionSet handle is empty");
-
-  BaseObject& handle = transitionSet.GetBaseObject();
-
-  return static_cast<Internal::TransitionSet&>(handle);
-}
-
-inline const Internal::TransitionSet& GetImplementation(const Dali::Toolkit::TransitionSet& transitionSet)
-{
-  DALI_ASSERT_ALWAYS(transitionSet && "TransitionSet handle is empty");
-
-  const BaseObject& handle = transitionSet.GetBaseObject();
-
-  return static_cast<const Internal::TransitionSet&>(handle);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_INTERNAL_TRANSITION_H
index f23439d..2286ea0 100644 (file)
@@ -120,7 +120,7 @@ void VectorAnimationManager::UnregisterEventCallback(CallbackBase* callback)
   }
 }
 
-void VectorAnimationManager::Process(bool postProcessor)
+void VectorAnimationManager::Process()
 {
   for(auto&& iter : mEventCallbacks)
   {
index fe6b87a..c52b800 100644 (file)
@@ -92,7 +92,7 @@ protected: // Implementation of Processor
   /**
    * @copydoc Dali::Integration::Processor::Process()
    */
-  void Process(bool postProcessor) override;
+  void Process() override;
 
 private:
   // Undefined
index b11ac2f..34baffe 100644 (file)
@@ -280,7 +280,7 @@ void SvgRasterizeThread::ApplyRasterizedSVGToSampler()
   UnregisterProcessor();
 }
 
-void SvgRasterizeThread::Process(bool postProcessor)
+void SvgRasterizeThread::Process()
 {
   ApplyRasterizedSVGToSampler();
 }
index 0204bef..b915b13 100644 (file)
@@ -166,7 +166,7 @@ public:
   /**
    * @copydoc Dali::Integration::Processor::Process()
    */
-  void Process(bool postProcessor) override;
+  void Process() override;
 
 private:
   /**
index b989941..62b1079 100644 (file)
@@ -758,78 +758,6 @@ float Control::GetWidthForHeight(float height)
   return GetWidthForHeightBase(height);
 }
 
-void Control::CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod)
-{
-  if(animation)
-  {
-    MakeVisualTransition(animation, source, Toolkit::Control::Property::BACKGROUND, alphaFunction, timePeriod);
-    MakeVisualTransition(animation, source, Toolkit::DevelControl::Property::SHADOW, alphaFunction, timePeriod);
-  }
-}
-
-void Control::SetTransparent(bool transparent)
-{
-  CustomActorImpl::SetTransparent(transparent);
-}
-
-bool Control::GetTransparent() const
-{
-  return CustomActorImpl::GetTransparent();
-}
-
-void Control::MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index index, AlphaFunction alphaFunction, TimePeriod timePeriod)
-{
-  Dali::Toolkit::Control sourceHandle      = Dali::Toolkit::Control::DownCast(source);
-  Property::Map          sourceMap         = sourceHandle.GetProperty<Property::Map>(index);
-  Dali::Toolkit::Control destinationHandle = Toolkit::Control(GetOwner());
-  Property::Map          destinationMap    = destinationHandle.GetProperty<Property::Map>(index);
-
-  Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(*this);
-  Vector4                  mixColor(1.0f, 1.0f, 1.0f, 1.0f);
-  Vector4                  cornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
-
-  if(!destinationMap.Empty())
-  {
-    mixColor     = destinationMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>();
-    cornerRadius = destinationMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-
-    if(sourceMap.Empty())
-    {
-      sourceMap.Insert(Toolkit::Visual::Property::TYPE, Toolkit::Visual::COLOR);
-      sourceMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
-      sourceMap.Insert(Toolkit::DevelVisual::Property::CORNER_RADIUS, cornerRadius);
-    }
-
-    Vector4 sourceMixColor     = sourceMap.Find(Dali::Toolkit::Visual::Property::MIX_COLOR)->Get<Vector4>();
-    Vector4 sourceCornerRadius = sourceMap.Find(Toolkit::DevelVisual::Property::CORNER_RADIUS)->Get<Vector4>();
-
-    if(Vector3(sourceMixColor) != Vector3(mixColor))
-    {
-      Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-      keyframes.Add(0.0f, Vector3(sourceMixColor));
-      keyframes.Add(1.0f, Vector3(mixColor));
-      animation.AnimateBetween(controlDataImpl.GetVisualProperty(index, Dali::Toolkit::Visual::Property::MIX_COLOR), keyframes, alphaFunction, timePeriod);
-    }
-
-    if(std::abs(sourceMixColor.a - mixColor.a) > Math::MACHINE_EPSILON_1)
-    {
-      Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-      keyframes.Add(0.0f, sourceMixColor.a);
-      keyframes.Add(1.0f, mixColor.a);
-      animation.AnimateBetween(controlDataImpl.GetVisualProperty(index, Dali::Toolkit::Visual::Property::OPACITY), keyframes, alphaFunction, timePeriod);
-    }
-
-    if(sourceCornerRadius != cornerRadius)
-    {
-      Dali::KeyFrames keyframes = Dali::KeyFrames::New();
-      keyframes.Add(0.0f, sourceCornerRadius);
-      keyframes.Add(1.0f, cornerRadius);
-      // TODO: check corner radius policy
-      animation.AnimateBetween(controlDataImpl.GetVisualProperty(index, Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS), keyframes, alphaFunction, timePeriod);
-    }
-  }
-}
-
 bool Control::RelayoutDependentOnChildren(Dimension::Type dimension)
 {
   return RelayoutDependentOnChildrenBase(dimension);
index b3d542f..6717f5b 100644 (file)
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_CONTROL_IMPL_H
 
 /*
- * Copyright (c) 2021 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.
@@ -20,8 +20,6 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/style-change.h>
-#include <dali/public-api/animation/alpha-function.h>
-#include <dali/public-api/animation/time-period.h>
 #include <dali/public-api/events/long-press-gesture.h>
 #include <dali/public-api/events/pan-gesture.h>
 #include <dali/public-api/events/pinch-gesture.h>
@@ -253,27 +251,6 @@ public:
   DALI_INTERNAL void KeyboardEnter();
   /// @endcond
 
-  /**
-   * @brief Retrieve visual property animations.
-   * This Control is a destination.
-   *
-   * @param[in] animation generated animation
-   * @param[in] source source control of the animation.
-   * @param[in] alphaFunction AlphaFunction of the animation
-   * @param[in] timePeriod TimePeriod of the animation
-   */
-  virtual void CreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod);
-
-  /**
-   * @brief Set this Control is transparent or not without any affection on the child Actors.
-   */
-  void SetTransparent(bool transparent) override;
-
-  /**
-   * @brief Get this Control is transparent or not.
-   */
-  bool GetTransparent() const override;
-
   // Signals
 
   /**
@@ -302,9 +279,6 @@ public:
   DALI_INTERNAL bool EmitKeyEventSignal(const KeyEvent& event);
   /// @endcond
 
-private: // For utility method
-  void MakeVisualTransition(Dali::Animation& animation, Dali::Toolkit::Control source, Dali::Property::Index index, AlphaFunction alphaFunction, TimePeriod timePeriod);
-
 protected: // For derived classes to call
   /**
    * @brief Emits KeyInputFocusGained signal if true else emits KeyInputFocusLost signal.
index 071b602..76863a7 100644 (file)
@@ -31,9 +31,6 @@ SET( public_api_src_files
   ${public_api_src_dir}/image-loader/async-image-loader.cpp
   ${public_api_src_dir}/image-loader/sync-image-loader.cpp
   ${public_api_src_dir}/styling/style-manager.cpp
-  ${public_api_src_dir}/transition/transition-base.cpp
-  ${public_api_src_dir}/transition/transition-set.cpp
-  ${public_api_src_dir}/transition/transition.cpp
   ${public_api_src_dir}/focus-manager/keyboard-focus-manager.cpp
   ${public_api_src_dir}/dali-toolkit-version.cpp
   ${public_api_src_dir}/enums.cpp
@@ -146,12 +143,6 @@ SET( public_api_visuals_header_files
   ${public_api_src_dir}/visuals/text-visual-properties.h
 )
 
-SET( public_api_transition_header_files
-  ${public_api_src_dir}/transition/transition-base.h
-  ${public_api_src_dir}/transition/transition-set.h
-  ${public_api_src_dir}/transition/transition.h
-)
-
 SET( SOURCES ${SOURCES}
   ${public_api_src_files}
 )
@@ -171,7 +162,6 @@ SET( PUBLIC_API_HEADERS ${PUBLIC_API_HEADERS}
   ${public_api_slider_header_files}
   ${public_api_styling_header_files}
   ${public_api_text_controls_header_files}
-  ${public_api_transition_header_files}
   ${public_api_focus_manager_header_files}
   ${public_api_text_header_files}
   ${public_api_video_view_header_files}
diff --git a/dali-toolkit/public-api/transition/transition-base.cpp b/dali-toolkit/public-api/transition/transition-base.cpp
deleted file mode 100644 (file)
index 389107d..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/public-api/transition/transition-base.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/transition/transition-base-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-TransitionBase::TransitionBase() = default;
-
-TransitionBase::TransitionBase(Internal::TransitionBase* transitionBase)
-: BaseHandle(transitionBase)
-{
-}
-
-TransitionBase TransitionBase::New()
-{
-  Internal::TransitionBasePtr internal = Dali::Toolkit::Internal::TransitionBase::New();
-
-  return TransitionBase(internal.Get());
-}
-
-TransitionBase TransitionBase::DownCast(BaseHandle handle)
-{
-  return TransitionBase(dynamic_cast<Dali::Toolkit::Internal::TransitionBase*>(handle.GetObjectPtr()));
-}
-
-TransitionBase::~TransitionBase() = default;
-
-TransitionBase::TransitionBase(const TransitionBase& handle) = default;
-
-TransitionBase& TransitionBase::operator=(const TransitionBase& rhs) = default;
-
-TransitionBase::TransitionBase(TransitionBase&& rhs) = default;
-
-TransitionBase& TransitionBase::operator=(TransitionBase&& rhs) = default;
-
-void TransitionBase::SetDuration(float seconds)
-{
-  GetImplementation(*this).SetDuration(seconds);
-}
-
-float TransitionBase::GetDuration() const
-{
-  return GetImplementation(*this).GetDuration();
-}
-
-void TransitionBase::SetDelay(float seconds)
-{
-  GetImplementation(*this).SetDelay(seconds);
-}
-
-float TransitionBase::GetDelay() const
-{
-  return GetImplementation(*this).GetDelay();
-}
-
-void TransitionBase::SetTimePeriod(TimePeriod timePeriod)
-{
-  GetImplementation(*this).SetTimePeriod(timePeriod);
-}
-
-void TransitionBase::SetAlphaFunction(AlphaFunction alphaFunction)
-{
-  GetImplementation(*this).SetAlphaFunction(alphaFunction);
-}
-
-AlphaFunction TransitionBase::GetAlphaFunction() const
-{
-  return GetImplementation(*this).GetAlphaFunction();
-}
-
-void TransitionBase::TransitionWithChild(bool transitionWithChild)
-{
-  return GetImplementation(*this).TransitionWithChild(transitionWithChild);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/public-api/transition/transition-base.h b/dali-toolkit/public-api/transition/transition-base.h
deleted file mode 100644 (file)
index 3832509..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-#ifndef DALI_TRANSITION_BASE_H
-#define DALI_TRANSITION_BASE_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/dali-toolkit-common.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/animation/alpha-function.h>
-#include <dali/public-api/animation/time-period.h>
-#include <dali/public-api/object/base-handle.h>
-#include <cstdint> // uint32_t, uint8_t
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal DALI_INTERNAL
-{
-class TransitionBase;
-}
-
-/**
- * @brief
- *
- * Transition provides continuous and seamless motions for the visually plausible scene change.
- * And, TransitionBase is a base class for every Transition cases.
- */
-class DALI_TOOLKIT_API TransitionBase : public BaseHandle
-{
-public:
-  /**
-   * @brief Creates an uninitialized TransitionBase; this can be initialized with TransitionBase::New().
-   *
-   * Calling member functions with an uninitialized TransitionBase handle is not allowed.
-   */
-  TransitionBase();
-
-  /**
-   * @brief Creates an initialized TransitionBase.
-   */
-  static TransitionBase New();
-
-  /**
-   * @brief Downcasts a handle to TransitionBase handle.
-   *
-   * If handle points to an TransitionBase object, the downcast produces valid handle.
-   * If not, the returned handle is left uninitialized.
-   *
-   * @param[in] handle Handle to an object
-   * @return Handle to an TransitionBase object or an uninitialized handle
-   */
-  static TransitionBase DownCast(BaseHandle handle);
-
-  /**
-   * @brief Destructor.
-   *
-   * This is non-virtual since derived Handle types must not contain data or virtual methods.
-   */
-  ~TransitionBase();
-
-  /**
-   * @brief This copy constructor is required for (smart) pointer semantics.
-   *
-   * @param[in] handle A reference to the copied handle
-   */
-  TransitionBase(const TransitionBase& handle);
-
-  /**
-   * @brief This assignment operator is required for (smart) pointer semantics.
-   *
-   * @param[in] rhs A reference to the copied handle
-   * @return A reference to this
-   */
-  TransitionBase& operator=(const TransitionBase& rhs);
-
-  /**
-   * @brief Move constructor.
-   *
-   * @param[in] rhs A reference to the moved handle
-   */
-  TransitionBase(TransitionBase&& rhs);
-
-  /**
-   * @brief Move assignment operator.
-   *
-   * @param[in] rhs A reference to the moved handle
-   * @return A reference to this handle
-   */
-  TransitionBase& operator=(TransitionBase&& rhs);
-
-  /**
-   * @brief Sets the duration of an transition.
-   *
-   * @param[in] seconds The duration in seconds
-   * @pre DurationSeconds must be greater than zero.
-   */
-  void SetDuration(float seconds);
-
-  /**
-   * @brief Retrieves the duration of an transition.
-   *
-   * @return The duration in seconds
-   */
-  float GetDuration() const;
-
-  /**
-   * @brief Sets the delay of an transition.
-   *
-   * @param[in] seconds The delay in seconds
-   * @pre DelaySeconds must be greater than zero.
-   */
-  void SetDelay(float seconds);
-
-  /**
-   * @brief Retrieves the delay of an transition.
-   *
-   * @return The delay in seconds
-   */
-  float GetDelay() const;
-
-  /**
-   * Set time period that contains delay and duration
-   * @param[in] timePeriod The time period for an animator.
-   */
-  void SetTimePeriod(TimePeriod timePeriod);
-
-  /**
-   * @brief Sets the alpha function for an transition.
-   *
-   * This is applied to individual property transitions, if no further alpha functions are supplied.
-   * @param[in] alpha The alpha function
-   */
-  void SetAlphaFunction(AlphaFunction alpha);
-
-  /**
-   * @brief Retrieves the alpha function for an transition.
-   *
-   * @return The alpha function
-   */
-  AlphaFunction GetAlphaFunction() const;
-
-  /**
-   * @brief A View could be transition with its child Views or without them.
-   */
-  void TransitionWithChild(bool transitionWithChild);
-
-public: // Not intended for use by Application developers
-  /// @cond internal
-  /**
-   * @brief This constructor is used by TransitionBase::New() methods.
-   * @param[in] transitionBase A pointer to a newly allocated Dali resource
-   */
-  explicit DALI_INTERNAL TransitionBase(Internal::TransitionBase* transitionBase);
-  /// @endcond
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TRANSITION_BASE_H
diff --git a/dali-toolkit/public-api/transition/transition-set.cpp b/dali-toolkit/public-api/transition/transition-set.cpp
deleted file mode 100644 (file)
index 6de365a..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/public-api/transition/transition-set.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/transition/transition-set-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-TransitionSet::TransitionSet() = default;
-
-TransitionSet::TransitionSet(Internal::TransitionSet* transition)
-: BaseHandle(transition)
-{
-}
-
-TransitionSet TransitionSet::New()
-{
-  Internal::TransitionSetPtr internal = Dali::Toolkit::Internal::TransitionSet::New();
-
-  return TransitionSet(internal.Get());
-}
-
-TransitionSet TransitionSet::DownCast(BaseHandle handle)
-{
-  return TransitionSet(dynamic_cast<Dali::Toolkit::Internal::TransitionSet*>(handle.GetObjectPtr()));
-}
-
-TransitionSet::~TransitionSet() = default;
-
-TransitionSet::TransitionSet(const TransitionSet& handle) = default;
-
-TransitionSet& TransitionSet::operator=(const TransitionSet& rhs) = default;
-
-TransitionSet::TransitionSet(TransitionSet&& rhs) = default;
-
-TransitionSet& TransitionSet::operator=(TransitionSet&& rhs) = default;
-
-void TransitionSet::AddTransition(TransitionBase transition)
-{
-  if(transition)
-  {
-    Internal::TransitionBasePtr transitionBasePtr(&GetImplementation(transition));
-    GetImplementation(*this).AddTransition(transitionBasePtr);
-  }
-}
-
-TransitionBase TransitionSet::GetTransitionAt(uint32_t index) const
-{
-  Internal::TransitionBase* transitionBasePtr = GetImplementation(*this).GetTransitionAt(static_cast<uint32_t>(index));
-  return Dali::Toolkit::TransitionBase(transitionBasePtr);
-}
-
-uint32_t TransitionSet::GetTransitionCount() const
-{
-  return GetImplementation(*this).GetTransitionCount();
-}
-
-void TransitionSet::Play()
-{
-  GetImplementation(*this).QueueToPlay();
-}
-
-TransitionSet::TransitionSetSignalType& TransitionSet::FinishedSignal()
-{
-  return GetImplementation(*this).FinishedSignal();
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/public-api/transition/transition-set.h b/dali-toolkit/public-api/transition/transition-set.h
deleted file mode 100644 (file)
index 90a70a1..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-#ifndef DALI_TRANSITION_SET_H
-#define DALI_TRANSITION_SET_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/transition/transition-base.h>
-
-// EXTERNAL INCLUDES
-#include <dali/public-api/object/handle.h>
-#include <dali/public-api/signals/dali-signal.h>
-#include <cstdint> // uint32_t, uint8_t
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal DALI_INTERNAL
-{
-class TransitionSet;
-}
-
-/**
- * @brief
- *
- * TransitionSet is used to control lifetime of multiple Transitions.
- * Transition could be played with multiple other transitions for a scene change.
- * For the case, it is more useful to manage a group of transitions with same lifetime and a finished signal.
- * TransitionSet provides a single Play call and Finished callback for the multiple traisitions those added on it.
- */
-class DALI_TOOLKIT_API TransitionSet : public BaseHandle
-{
-public:
-  using TransitionSetSignalType = Signal<void(TransitionSet&)>; ///< TransitionSet finished signal type
-
-  /**
-   * @brief Creates an uninitialized TransitionSet; this can be initialized with TransitionSet::New().
-   *
-   * Calling member functions with an uninitialized TransitionSet handle is not allowed.
-   */
-  TransitionSet();
-
-  /**
-   * @brief Creates an initialized TransitionSet.
-   *
-   * @return A handle to a newly allocated Dali resource
-   * @note durationSeconds can not be negative.
-   */
-  static TransitionSet New();
-
-  /**
-   * @brief Downcasts a handle to TransitionSet handle.
-   *
-   * If handle points to an TransitionSet object, the downcast produces valid handle.
-   * If not, the returned handle is left uninitialized.
-   *
-   * @param[in] handle Handle to an object
-   * @return Handle to an TransitionSet object or an uninitialized handle
-   */
-  static TransitionSet DownCast(BaseHandle handle);
-
-  /**
-   * @brief Destructor.
-   *
-   * This is non-virtual since derived Handle types must not contain data or virtual methods.
-   */
-  ~TransitionSet();
-
-  /**
-   * @brief This copy constructor is required for (smart) pointer semantics.
-   *
-   * @param[in] handle A reference to the copied handle
-   */
-  TransitionSet(const TransitionSet& handle);
-
-  /**
-   * @brief This assignment operator is required for (smart) pointer semantics.
-   *
-   * @param[in] rhs A reference to the copied handle
-   * @return A reference to this
-   */
-  TransitionSet& operator=(const TransitionSet& rhs);
-
-  /**
-   * @brief Move constructor.
-   *
-   * @param[in] rhs A reference to the moved handle
-   */
-  TransitionSet(TransitionSet&& rhs);
-
-  /**
-   * @brief Move assignment operator.
-   *
-   * @param[in] rhs A reference to the moved handle
-   * @return A reference to this handle
-   */
-  TransitionSet& operator=(TransitionSet&& rhs);
-
-  /**
-   * @brief Add a TransitionBase on this TransitionSet.
-   *
-   * @param[in] transition TransitionBase to be added.
-   */
-  void AddTransition(TransitionBase transition);
-
-  /**
-   * @brief Retrieves a TransitionBase at the index.
-   *
-   * @return The TransitionBase of index
-   */
-  TransitionBase GetTransitionAt(uint32_t index) const;
-
-  /**
-   * @brief Retrieves the number of Transitions added in TransitionSet
-   *
-   * @return The number of Transitions
-   */
-  uint32_t GetTransitionCount() const;
-
-  /**
-   * @brief Play the transition.
-   * This method not make property animation instantly.
-   * Transition requires some world transform properties.
-   * The Transitions currently added on this TransitionSet are queued TransitionQueue
-   * and they are played at the end of this tick of event Thread
-   */
-  void Play();
-
-  /**
-   * @brief Connects to this signal to be notified when all TransitionSet's transitions have finished.
-   *
-   * @return A signal object to connect with
-   */
-  TransitionSetSignalType& FinishedSignal();
-
-public: // Not intended for use by Application developers
-  /// @cond internal
-  /**
-   * @brief This constructor is used by TransitionSet::New() methods.
-   * @param[in] transition A pointer to a newly allocated Dali resource
-   */
-  explicit DALI_INTERNAL TransitionSet(Internal::TransitionSet* transition);
-  /// @endcond
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TRANSITION_SET_H
diff --git a/dali-toolkit/public-api/transition/transition.cpp b/dali-toolkit/public-api/transition/transition.cpp
deleted file mode 100644 (file)
index 39956c8..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// CLASS HEADER
-#include <dali-toolkit/public-api/transition/transition.h>
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/internal/transition/transition-impl.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-Transition::Transition() = default;
-
-Transition::Transition(Internal::Transition* transition)
-: TransitionBase(transition)
-{
-}
-
-Transition Transition::New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod)
-{
-  Internal::TransitionPtr internal = Dali::Toolkit::Internal::Transition::New(source, destination, timePeriod);
-
-  return Transition(internal.Get());
-}
-
-Transition Transition::DownCast(BaseHandle handle)
-{
-  return Transition(dynamic_cast<Dali::Toolkit::Internal::Transition*>(handle.GetObjectPtr()));
-}
-
-Transition::~Transition() = default;
-
-Transition::Transition(const Transition& handle) = default;
-
-Transition& Transition::operator=(const Transition& rhs) = default;
-
-Transition::Transition(Transition&& rhs) = default;
-
-Transition& Transition::operator=(Transition&& rhs) = default;
-
-void Transition::ShowSourceAfterFinished(bool showSourceAfterFinished)
-{
-  GetImplementation(*this).ShowSourceAfterFinished(showSourceAfterFinished);
-}
-
-} // namespace Toolkit
-
-} // namespace Dali
diff --git a/dali-toolkit/public-api/transition/transition.h b/dali-toolkit/public-api/transition/transition.h
deleted file mode 100644 (file)
index 468e8b0..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef DALI_TRANSITION_H
-#define DALI_TRANSITION_H
-
-/*
- * Copyright (c) 2021 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-// INTERNAL INCLUDES
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/transition/transition-base.h>
-
-namespace Dali
-{
-namespace Toolkit
-{
-namespace Internal DALI_INTERNAL
-{
-class Transition;
-}
-
-/**
- * @brief
- *
- * Transition provides continuous and seamless motions between two Controls.
- * This Transition generates property animation for transforms(position, scale, orientation), size, color, and opacity.
- * And, if there are common renderer properties of source and destination Control, they also animated.
- */
-class DALI_TOOLKIT_API Transition : public TransitionBase
-{
-public:
-  /**
-   * @brief Creates an uninitialized Transition; this can be initialized with Transition::New().
-   *
-   * Calling member functions with an uninitialized Transition handle is not allowed.
-   */
-  Transition();
-
-  /**
-   * @brief Creates an initialized Transition.
-   *
-   * @param[in] source Source
-   * @param[in] destination Destination
-   * @param[in] timePeriod The duration in seconds
-   * @return A handle to a newly allocated Dali resource
-   * @note durationSeconds can not be negative.
-   */
-  static Transition New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod);
-
-  /**
-   * @brief Downcasts a handle to Transition handle.
-   *
-   * If handle points to an Transition object, the downcast produces valid handle.
-   * If not, the returned handle is left uninitialized.
-   *
-   * @param[in] handle Handle to an object
-   * @return Handle to an Transition object or an uninitialized handle
-   */
-  static Transition DownCast(BaseHandle handle);
-
-  /**
-   * @brief Destructor.
-   *
-   * This is non-virtual since derived Handle types must not contain data or virtual methods.
-   */
-  ~Transition();
-
-  /**
-   * @brief This copy constructor is required for (smart) pointer semantics.
-   *
-   * @param[in] handle A reference to the copied handle
-   */
-  Transition(const Transition& handle);
-
-  /**
-   * @brief This assignment operator is required for (smart) pointer semantics.
-   *
-   * @param[in] rhs A reference to the copied handle
-   * @return A reference to this
-   */
-  Transition& operator=(const Transition& rhs);
-
-  /**
-   * @brief Move constructor.
-   *
-   * @param[in] rhs A reference to the moved handle
-   */
-  Transition(Transition&& rhs);
-
-  /**
-   * @brief Move assignment operator.
-   *
-   * @param[in] rhs A reference to the moved handle
-   * @return A reference to this handle
-   */
-  Transition& operator=(Transition&& rhs);
-
-  /**
-   * @brief Set whether the source control will be hidden or not.
-   * @param[in] showSourceAfterFinished True to show source control after transition. Default is true.
-   */
-  void ShowSourceAfterFinished(bool showSourceAfterFinished);
-
-public: // Not intended for use by Application developers
-  /// @cond internal
-  /**
-   * @brief This constructor is used by Transition::New() methods.
-   * @param[in] transition A pointer to a newly allocated Dali resource
-   */
-  explicit DALI_INTERNAL Transition(Internal::Transition* transition);
-  /// @endcond
-};
-
-} // namespace Toolkit
-
-} // namespace Dali
-
-#endif // DALI_TRANSITION_H