Remove some public Setter/Getter APIs from Dali::Actor

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / transition-effects / cube-transition-effect-impl.cpp

diff --git a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
index ed71b14..d151290 100644 (file)
--- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
+++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -22,11 +22,11 @@
 #include <cstring> // for strcmp
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
+#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
 
 namespace Dali
 {
@@ -82,7 +82,7 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
 Actor CreateTile( const Vector4& samplerRect )
 {
  Actor tile = Actor::New();
-  tile.SetAnchorPoint( AnchorPoint::CENTER );
+  tile.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   tile.RegisterProperty( "uTextureRect", samplerRect );
   return tile;
 }
@@ -93,7 +93,7 @@ const Vector4 CubeTransitionEffect::FULL_BRIGHTNESS( 1.0f, 1.0f, 1.0f, 1.0f );
 const Vector4 CubeTransitionEffect::HALF_BRIGHTNESS( 0.5f, 0.5f, 0.5f, 1.0f );
 
 CubeTransitionEffect::CubeTransitionEffect( unsigned int rows, unsigned int columns )
-: Control( ControlBehaviour( 0 ) ),
+: Control( ControlBehaviour( DISABLE_STYLE_CHANGE_SIGNALS ) ),
   mRows( rows ),
   mColumns( columns ),
   mIsAnimating( false ),
@@ -113,7 +113,7 @@ void CubeTransitionEffect::SetTargetRight( unsigned int idx )
 
   mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f );
 
-  mTargetTiles[ idx ].SetParentOrigin( Vector3( 1.f, 0.5f, 0.5f) );
+  mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 1.f, 0.5f, 0.5f) );
   mTargetTiles[ idx ].SetOrientation( Degree( 90.f ), Vector3::YAXIS );
 }
 
@@ -123,7 +123,7 @@ void CubeTransitionEffect::SetTargetLeft( unsigned int idx )
 
   mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f );
 
-  mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.f, 0.5f, 0.5f) );
+  mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.f, 0.5f, 0.5f) );
   mTargetTiles[ idx ].SetOrientation( Degree( -90.f ), Vector3::YAXIS );
 }
 
@@ -133,7 +133,7 @@ void CubeTransitionEffect::SetTargetBottom( unsigned int idx )
 
   mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f );
 
-  mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.5f, 0.f, 0.5f) );
+  mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.f, 0.5f) );
   mTargetTiles[ idx ].SetOrientation( Degree( 90.f ), Vector3::XAXIS );
 }
 
@@ -143,7 +143,7 @@ void CubeTransitionEffect::SetTargetTop( unsigned int idx )
 
   mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f );
 
-  mTargetTiles[ idx ].SetParentOrigin( Vector3( 0.5f, 1.f, 0.5f) );
+  mTargetTiles[ idx ].SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 1.f, 0.5f) );
   mTargetTiles[ idx ].SetOrientation( Degree( -90.f ), Vector3::XAXIS );
 }
 
@@ -199,8 +199,8 @@ void CubeTransitionEffect::Initialize()
 
   //create the box parents
   mBoxRoot = Actor::New();
-  mBoxRoot.SetParentOrigin( ParentOrigin::CENTER );
-  mBoxRoot.SetAnchorPoint( AnchorPoint::CENTER );
+  mBoxRoot.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+  mBoxRoot.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
   mCurrentTiles.clear();
   mTargetTiles.clear();
@@ -221,7 +221,7 @@ void CubeTransitionEffect::Initialize()
 
       Actor currentTile = CreateTile( textureRect );
       currentTile.SetProperty( Actor::Property::COLOR, FULL_BRIGHTNESS );
-      currentTile.SetParentOrigin( ParentOrigin::CENTER );
+      currentTile.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
       mCurrentTiles.push_back( currentTile );
 
       Actor targetTile = CreateTile( textureRect );
@@ -229,8 +229,8 @@ void CubeTransitionEffect::Initialize()
       mTargetTiles.push_back( targetTile );
 
       Actor box = Actor::New();
-      box.SetParentOrigin( anchor + offset );
-      box.SetAnchorPoint( AnchorPoint::CENTER );
+      box.SetProperty( Actor::Property::PARENT_ORIGIN, anchor + offset );
+      box.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
 
       box.Add( currentTile );
       box.Add( targetTile );
@@ -246,9 +246,7 @@ void CubeTransitionEffect::Initialize()
 
 void CubeTransitionEffect::OnStageConnection( int depth )
 {
-  Control::OnStageConnection( depth );
-
-  Geometry geometry = RendererFactoryCache::CreateQuadGeometry();
+  Geometry geometry = VisualFactoryCache::CreateQuadGeometry();
   Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER );
 
   TextureSet textureSet = TextureSet::New();
@@ -262,6 +260,8 @@ void CubeTransitionEffect::OnStageConnection( int depth )
 
   mCurrentRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, depth );
   Self().AddRenderer( mCurrentRenderer );
+
+  Control::OnStageConnection( depth );
 }
 
 void CubeTransitionEffect::OnStageDisconnection()
@@ -338,7 +338,7 @@ void CubeTransitionEffect::SetTargetTexture( Texture texture )
 
 void CubeTransitionEffect::StartTransition( bool toNextImage )
 {
-  Vector3 size = Self().GetCurrentSize();
+  Vector3 size = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE );
   if( toNextImage )
   {
     StartTransition( Vector2(size.x* 0.5f, size.y*0.5f), Vector2( -10.f, 0.f ) );
@@ -353,7 +353,7 @@ void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisp
 {
   if( !mCurrentRenderer )
   {
-    DALI_LOG_ERROR( "Trying to transition a cube transition without an image set" );
+    DALI_LOG_ERROR( "Trying to transition a cube transition without an image set\n" );
     return;
   }
 
@@ -378,7 +378,7 @@ void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisp
 
   for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it )
   {
-    it->SetParentOrigin( Vector3( 0.5f, 0.5f, 1.0f) );
+    it->SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.5f, 1.0f) );
     it->SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) );
     it->AddRenderer( mCurrentRenderer );
   }
@@ -440,7 +440,7 @@ void CubeTransitionEffect::ResetToInitialState()
 
   for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it )
   {
-    it->SetParentOrigin( Vector3( 0.5f, 0.5f, 1.0f) );
+    it->SetProperty( Actor::Property::PARENT_ORIGIN, Vector3( 0.5f, 0.5f, 1.0f) );
     it->SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) );
     it->SetProperty( Actor::Property::COLOR, FULL_BRIGHTNESS );
   }