X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-effect-impl.cpp;h=31dd1577a282948ef4fe905ff2bfef54c5706e73;hp=5a76197fbca3b05fde4da5717b8307283991d45b;hb=cc7137614f4136f571ccecc22ad1b72c01f16156;hpb=e5ca10134c73ca0588f893adde82694ad907dd8d 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 5a76197..31dd157 100644 --- 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) 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. @@ -19,111 +19,52 @@ #include "cube-transition-effect-impl.h" // EXTERNAL INCLUDES -#include // for strcmp -#include -#include -#include #include +#include +#include +#include // for strcmp + +// INTERNAL INCLUDES +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - // Setup properties, signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Toolkit::CubeTransitionEffect, Dali::BaseHandle, NULL ); +DALI_TYPE_REGISTRATION_BEGIN(Toolkit::CubeTransitionEffect, Dali::BaseHandle, NULL); -DALI_SIGNAL_REGISTRATION( Toolkit, CubeTransitionEffect, "transitionCompleted", SIGNAL_TRANSITION_COMPLETED ) +DALI_SIGNAL_REGISTRATION(Toolkit, CubeTransitionEffect, "transitionCompleted", SIGNAL_TRANSITION_COMPLETED) DALI_TYPE_REGISTRATION_END() -const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - varying mediump vec2 vTexCoord;\n - uniform mediump mat4 uMvpMatrix;\n - uniform mediump vec3 uSize;\n - uniform mediump vec4 uTextureRect;\n - \n - void main()\n - {\n - mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n - vertexPosition.xyz *= uSize;\n - vertexPosition = uMvpMatrix * vertexPosition;\n - \n - vTexCoord = aPosition + vec2(0.5);\n - vTexCoord = mix(uTextureRect.xy, uTextureRect.zw, vTexCoord);\n - - gl_Position = vertexPosition;\n - }\n -); - -const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( - varying mediump vec2 vTexCoord;\n - uniform sampler2D sTexture;\n - uniform lowp vec4 uColor;\n - uniform lowp vec4 uSamplerRect; - \n - void main()\n - {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * uColor;\n - }\n -); - -Actor CreateTile( const Vector4& samplerRect ) +Actor CreateTile(const Vector4& samplerRect) { - Actor tile = Actor::New(); - tile.SetAnchorPoint( AnchorPoint::CENTER ); - tile.RegisterProperty( "uTextureRect", samplerRect ); + Actor tile = Actor::New(); + tile.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER); + tile.RegisterProperty("uTextureRect", samplerRect); return tile; } +} // namespace -Geometry CreateQuadGeometry() -{ - const float halfWidth = 0.5f; - const float halfHeight = 0.5f; - struct QuadVertex { Vector2 position;}; - QuadVertex quadVertexData[4] = - { - { Vector2(-halfWidth, -halfHeight) }, - { Vector2( halfWidth, -halfHeight) }, - { Vector2(-halfWidth, halfHeight) }, - { Vector2( halfWidth, halfHeight) } - }; - - Property::Map quadVertexFormat; - quadVertexFormat["aPosition"] = Property::VECTOR2; - PropertyBuffer quadVertices = PropertyBuffer::New( quadVertexFormat ); - quadVertices.SetData( quadVertexData, 4 ); - - // Create the geometry object - Geometry geometry = Geometry::New(); - geometry.AddVertexBuffer( quadVertices ); - geometry.SetGeometryType( Geometry::TRIANGLE_STRIP ); - - return geometry; -} - -} +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); -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 ) ), - mRows( rows ), - mColumns( columns ), - mIsAnimating( false ), - mIsPaused( false ), - mAnimationDuration( 1.f ), - mCubeDisplacement( 0.f ) +CubeTransitionEffect::CubeTransitionEffect(unsigned int rows, unsigned int columns) +: Control(ControlBehaviour(DISABLE_STYLE_CHANGE_SIGNALS)), + mRows(rows), + mColumns(columns), + mIsAnimating(false), + mIsPaused(false), + mAnimationDuration(1.f), + mCubeDisplacement(0.f) { } @@ -131,198 +72,199 @@ CubeTransitionEffect::~CubeTransitionEffect() { } -void CubeTransitionEffect::SetTargetRight( unsigned int idx ) +void CubeTransitionEffect::SetTargetRight(unsigned int idx) { - mBoxType[ idx ] = RIGHT; + mBoxType[idx] = RIGHT; - mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f ); + 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 ].SetOrientation( Degree( 90.f ), Vector3::YAXIS ); + mTargetTiles[idx].SetProperty(Actor::Property::PARENT_ORIGIN, Vector3(1.f, 0.5f, 0.5f)); + mTargetTiles[idx].SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(90.f), Vector3::YAXIS)); } -void CubeTransitionEffect::SetTargetLeft( unsigned int idx ) +void CubeTransitionEffect::SetTargetLeft(unsigned int idx) { - mBoxType[ idx ] = LEFT; + mBoxType[idx] = LEFT; - mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f ); + 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 ].SetOrientation( Degree( -90.f ), Vector3::YAXIS ); + mTargetTiles[idx].SetProperty(Actor::Property::PARENT_ORIGIN, Vector3(0.f, 0.5f, 0.5f)); + mTargetTiles[idx].SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(-90.f), Vector3::YAXIS)); } -void CubeTransitionEffect::SetTargetBottom( unsigned int idx ) +void CubeTransitionEffect::SetTargetBottom(unsigned int idx) { - mBoxType[ idx ] = BOTTOM; + mBoxType[idx] = BOTTOM; - mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f ); + 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 ].SetOrientation( Degree( 90.f ), Vector3::XAXIS ); + mTargetTiles[idx].SetProperty(Actor::Property::PARENT_ORIGIN, Vector3(0.5f, 0.f, 0.5f)); + mTargetTiles[idx].SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(90.f), Vector3::XAXIS)); } -void CubeTransitionEffect::SetTargetTop( unsigned int idx ) +void CubeTransitionEffect::SetTargetTop(unsigned int idx) { - mBoxType[ idx ] = TOP; + mBoxType[idx] = TOP; - mBoxes[ idx ].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f ); + 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 ].SetOrientation( Degree( -90.f ), Vector3::XAXIS ); + mTargetTiles[idx].SetProperty(Actor::Property::PARENT_ORIGIN, Vector3(0.5f, 1.f, 0.5f)); + mTargetTiles[idx].SetProperty(Actor::Property::ORIENTATION, Quaternion(Degree(-90.f), Vector3::XAXIS)); } -void CubeTransitionEffect::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void CubeTransitionEffect::OnRelayout(const Vector2& size, RelayoutContainer& container) { - mTileSize = Vector2( size.x / mColumns, size.y / mRows ); + mTileSize = Vector2(size.x / mColumns, size.y / mRows); - mBoxRoot.SetProperty( Actor::Property::SIZE_WIDTH, size.x ); - mBoxRoot.SetProperty( Actor::Property::SIZE_HEIGHT, size.y ); - mBoxRoot.SetProperty( Actor::Property::SIZE_DEPTH, 1.0f ); + mBoxRoot.SetProperty(Actor::Property::SIZE_WIDTH, size.x); + mBoxRoot.SetProperty(Actor::Property::SIZE_HEIGHT, size.y); + mBoxRoot.SetProperty(Actor::Property::SIZE_DEPTH, 1.0f); - for( size_t i = 0; i < mBoxes.size(); ++i ) + for(size_t i = 0; i < mBoxes.size(); ++i) { - mBoxes[ i ].SetProperty( Actor::Property::SIZE_WIDTH, mTileSize.x ); - mBoxes[ i ].SetProperty( Actor::Property::SIZE_HEIGHT, mTileSize.y ); + mBoxes[i].SetProperty(Actor::Property::SIZE_WIDTH, mTileSize.x); + mBoxes[i].SetProperty(Actor::Property::SIZE_HEIGHT, mTileSize.y); - switch( mBoxType[i] ) + switch(mBoxType[i]) { case LEFT: case RIGHT: { - mBoxes[ i ].SetProperty( Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f ); - mBoxes[ i ].SetProperty( Actor::Property::SIZE_DEPTH, mTileSize.x ); + mBoxes[i].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.x * 0.5f); + mBoxes[i].SetProperty(Actor::Property::SIZE_DEPTH, mTileSize.x); break; } case BOTTOM: case TOP: { - mBoxes[ i ].SetProperty( Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f ); - mBoxes[ i ].SetProperty( Actor::Property::SIZE_DEPTH, mTileSize.y ); + mBoxes[i].SetProperty(Actor::Property::PARENT_ORIGIN_Z, 1.0f - mTileSize.y * 0.5f); + mBoxes[i].SetProperty(Actor::Property::SIZE_DEPTH, mTileSize.y); break; } } } - for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) + for(ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it) { - it->SetProperty( Actor::Property::SIZE_WIDTH, mTileSize.x ); - it->SetProperty( Actor::Property::SIZE_HEIGHT, mTileSize.y ); + it->SetProperty(Actor::Property::SIZE_WIDTH, mTileSize.x); + it->SetProperty(Actor::Property::SIZE_HEIGHT, mTileSize.y); } - for( ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it ) + for(ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it) { - it->SetProperty( Actor::Property::SIZE_WIDTH, mTileSize.x ); - it->SetProperty( Actor::Property::SIZE_HEIGHT, mTileSize.y ); + it->SetProperty(Actor::Property::SIZE_WIDTH, mTileSize.x); + it->SetProperty(Actor::Property::SIZE_HEIGHT, mTileSize.y); } } void CubeTransitionEffect::Initialize() { - Self().RegisterProperty( "uTextureRect", Vector4( 0.0f, 0.0f, 1.0f, 1.0f ) ); + Self().RegisterProperty("uTextureRect", Vector4(0.0f, 0.0f, 1.0f, 1.0f)); mBoxType.Resize(mColumns * mRows); //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(); - mCurrentTiles.reserve( mColumns * mRows ); - mTargetTiles.reserve( mColumns * mRows ); + mCurrentTiles.reserve(mColumns * mRows); + mTargetTiles.reserve(mColumns * mRows); - Vector2 gridSizeInv( 1.0f / mColumns, 1.0f / mRows ); - Vector3 offset( 0.5f * gridSizeInv.x, 0.5f * gridSizeInv.y, 0.0f ); + Vector2 gridSizeInv(1.0f / mColumns, 1.0f / mRows); + Vector3 offset(0.5f * gridSizeInv.x, 0.5f * gridSizeInv.y, 0.0f); Vector3 anchor; - for( unsigned int y = 0; y < mRows; ++y, anchor.y += 1.0f / mRows ) + for(unsigned int y = 0; y < mRows; ++y, anchor.y += 1.0f / mRows) { anchor.x = 0.0f; - for( unsigned int x = 0; x RemoveRenderer( mCurrentRenderer ); + it->RemoveRenderer(mCurrentRenderer); } mCurrentRenderer.Reset(); } - if( mTargetRenderer ) + if(mTargetRenderer) { - for( ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it ) + for(ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it) { - it->RemoveRenderer( mTargetRenderer ); + it->RemoveRenderer(mTargetRenderer); } mTargetRenderer.Reset(); } - Control::OnStageDisconnection(); + Control::OnSceneDisconnection(); } -void CubeTransitionEffect::SetTransitionDuration( float duration ) +void CubeTransitionEffect::SetTransitionDuration(float duration) { mAnimationDuration = duration; } -float CubeTransitionEffect::GetTransitionDuration( ) const +float CubeTransitionEffect::GetTransitionDuration() const { return mAnimationDuration; } -void CubeTransitionEffect::SetCubeDisplacement( float displacement ) +void CubeTransitionEffect::SetCubeDisplacement(float displacement) { mCubeDisplacement = displacement; } @@ -337,88 +279,81 @@ bool CubeTransitionEffect::IsTransitioning() return mIsAnimating; } -void CubeTransitionEffect::SetCurrentImage( Image image ) +void CubeTransitionEffect::SetCurrentTexture(Texture texture) { - mCurrentImage = image; + mCurrentTexture = texture; - if( mCurrentRenderer ) + if(mCurrentRenderer) { - Material material = mCurrentRenderer.GetMaterial(); - - int index = material.GetTextureIndex("sTexture" ); - if( index != -1 ) - { - material.SetTextureImage( index, mCurrentImage ); - } - else - { - material.AddTexture( mCurrentImage, "sTexture" ); - } + TextureSet textureSet = mCurrentRenderer.GetTextures(); + textureSet.SetTexture(0u, mCurrentTexture); } } -void CubeTransitionEffect::SetTargetImage( Image image ) +void CubeTransitionEffect::SetTargetTexture(Texture texture) { - mTargetImage = image; + mTargetTexture = texture; - if( mTargetRenderer ) + if(mTargetRenderer) { - Material material = mTargetRenderer.GetMaterial(); - material.AddTexture( mTargetImage, "sTexture" ); + TextureSet textureSet = mTargetRenderer.GetTextures(); + textureSet.SetTexture(0u, mTargetTexture); } } -void CubeTransitionEffect::StartTransition( bool toNextImage ) +void CubeTransitionEffect::StartTransition(bool toNextImage) { - Vector3 size = Self().GetCurrentSize(); - if( toNextImage ) + Vector3 size = Self().GetCurrentProperty(Actor::Property::SIZE); + if(toNextImage) { - StartTransition( Vector2(size.x* 0.5f, size.y*0.5f), Vector2( -10.f, 0.f ) ); + StartTransition(Vector2(size.x * 0.5f, size.y * 0.5f), Vector2(-10.f, 0.f)); } else { - StartTransition( Vector2(size.x* 0.5f, size.y*0.5f), Vector2( 10.f, 0.f )); + StartTransition(Vector2(size.x * 0.5f, size.y * 0.5f), Vector2(10.f, 0.f)); } } -void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisplacement ) +void CubeTransitionEffect::StartTransition(Vector2 panPosition, Vector2 panDisplacement) { - if( !mCurrentRenderer ) + 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; } //create the target renderer - Material material = Material::New( mCurrentRenderer.GetMaterial().GetShader() ); - if( mTargetImage ) + TextureSet textureSet = TextureSet::New(); + if(mTargetTexture) { - material.AddTexture( mTargetImage, "sTexture" ); + textureSet.SetTexture(0u, mTargetTexture); } Geometry geometry = mCurrentRenderer.GetGeometry(); - mTargetRenderer = Renderer::New( geometry, material ); + Shader shader(mCurrentRenderer.GetShader()); + mTargetRenderer = Renderer::New(geometry, shader); + mTargetRenderer.SetTextures(textureSet); int depthIndex = mCurrentRenderer.GetProperty(Renderer::Property::DEPTH_INDEX); - mTargetRenderer.SetProperty( Dali::Renderer::Property::DEPTH_INDEX, depthIndex ); + mTargetRenderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, depthIndex); - for( size_t i = 0; i < mBoxes.size(); ++i ) + for(size_t i = 0; i < mBoxes.size(); ++i) { - mBoxes[ i ].SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ); + mBoxes[i].SetProperty(Actor::Property::ORIENTATION, Quaternion(Radian(0.0f), Vector3::XAXIS)); } - for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) + for(ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it) { - it->SetParentOrigin( Vector3( 0.5f, 0.5f, 1.0f) ); - it->SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ); - it->AddRenderer( mCurrentRenderer ); + 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); } - for( ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it ) + for(ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it) { - it->AddRenderer( mTargetRenderer ); + it->AddRenderer(mTargetRenderer); } - Self().RemoveRenderer( mCurrentRenderer ); - Self().Add( mBoxRoot ); + Self().RemoveRenderer(mCurrentRenderer); + Self().Add(mBoxRoot); if(mAnimation) { @@ -426,15 +361,15 @@ void CubeTransitionEffect::StartTransition( Vector2 panPosition, Vector2 panDisp mAnimation.Reset(); } - mAnimation = Animation::New( mAnimationDuration ); - mAnimation.FinishedSignal().Connect( this, &CubeTransitionEffect::OnTransitionFinished ); + mAnimation = Animation::New(mAnimationDuration); + mAnimation.FinishedSignal().Connect(this, &CubeTransitionEffect::OnTransitionFinished); - OnStartTransition( panPosition, panDisplacement ); + OnStartTransition(panPosition, panDisplacement); } void CubeTransitionEffect::PauseTransition() { - if( mIsAnimating && !mIsPaused ) + if(mIsAnimating && !mIsPaused) { mAnimation.Pause(); mIsPaused = true; @@ -443,7 +378,7 @@ void CubeTransitionEffect::PauseTransition() void CubeTransitionEffect::ResumeTransition() { - if( mIsAnimating && mIsPaused) + if(mIsAnimating && mIsPaused) { mAnimation.Play(); mIsPaused = false; @@ -461,53 +396,52 @@ void CubeTransitionEffect::ResetToInitialState() mAnimation.Reset(); mIsAnimating = false; - Self().Remove( mBoxRoot ); + Self().Remove(mBoxRoot); - for( size_t i = 0; i < mBoxes.size(); ++i ) + for(size_t i = 0; i < mBoxes.size(); ++i) { - mBoxes[ i ].SetProperty( Actor::Property::ORIENTATION, Quaternion( Radian( 0.0f ), Vector3::XAXIS ) ); + mBoxes[i].SetProperty(Actor::Property::ORIENTATION, Quaternion(Radian(0.0f), Vector3::XAXIS)); } - for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) + for(ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it) { - it->SetParentOrigin( 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 ); + 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); } - if( mCurrentRenderer ) + if(mCurrentRenderer) { - for( ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it ) + for(ActorArray::iterator it = mCurrentTiles.begin(); it != mCurrentTiles.end(); ++it) { - it->RemoveRenderer( mCurrentRenderer ); + it->RemoveRenderer(mCurrentRenderer); } - Self().AddRenderer( mCurrentRenderer ); + Self().AddRenderer(mCurrentRenderer); } - for( ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it ) + for(ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it) { - it->SetProperty( Actor::Property::COLOR, HALF_BRIGHTNESS ); + it->SetProperty(Actor::Property::COLOR, HALF_BRIGHTNESS); } - if( mTargetRenderer ) + if(mTargetRenderer) { - for( ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it ) + for(ActorArray::iterator it = mTargetTiles.begin(); it != mTargetTiles.end(); ++it) { - it->RemoveRenderer( mTargetRenderer ); + it->RemoveRenderer(mTargetRenderer); } } } void CubeTransitionEffect::OnTransitionFinished(Animation& source) { - - std::swap( mCurrentTiles, mTargetTiles ); - std::swap( mCurrentRenderer, mTargetRenderer ); - std::swap( mCurrentImage, mTargetImage ); + std::swap(mCurrentTiles, mTargetTiles); + std::swap(mCurrentRenderer, mTargetRenderer); + std::swap(mCurrentTexture, mTargetTexture); ResetToInitialState(); //Emit signal - Toolkit::CubeTransitionEffect handle( GetOwner() ); - mTransitionCompletedSignal.Emit( handle, mCurrentImage ); + Toolkit::CubeTransitionEffect handle(GetOwner()); + mTransitionCompletedSignal.Emit(handle, mCurrentTexture); } Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffect::TransitionCompletedSignal() @@ -515,16 +449,16 @@ Toolkit::CubeTransitionEffect::TransitionCompletedSignalType& CubeTransitionEffe return mTransitionCompletedSignal; } -bool CubeTransitionEffect::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +bool CubeTransitionEffect::DoConnectSignal(BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor) { - Dali::BaseHandle handle( object ); + Dali::BaseHandle handle(object); - bool connected( true ); - Toolkit::CubeTransitionEffect cubeTransitionEffect = Toolkit::CubeTransitionEffect::DownCast( handle ); + bool connected(true); + Toolkit::CubeTransitionEffect cubeTransitionEffect = Toolkit::CubeTransitionEffect::DownCast(handle); - if( 0 == strcmp( signalName.c_str(), SIGNAL_TRANSITION_COMPLETED ) ) + if(0 == strcmp(signalName.c_str(), SIGNAL_TRANSITION_COMPLETED)) { - cubeTransitionEffect.TransitionCompletedSignal().Connect( tracker, functor ); + cubeTransitionEffect.TransitionCompletedSignal().Connect(tracker, functor); } else {