X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition-effects%2Fcube-transition-effect-impl.cpp;h=ffa43e0a60325430c376d07dec3d5ec5c23b2764;hb=193fa3dcbfa6b46bb9d3d1c079f2ca4eb25747a1;hp=08bf54d81f8e398b8052cd6fb4783e1284100332;hpb=9d09b345fbdef7a0532f5b45ffe65754f87258c6;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 08bf54d..ffa43e0 100644 --- a/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp +++ b/dali-toolkit/internal/transition-effects/cube-transition-effect-impl.cpp @@ -22,9 +22,12 @@ #include // for strcmp #include #include -#include +#include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -90,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 ), @@ -245,7 +248,7 @@ void CubeTransitionEffect::OnStageConnection( int depth ) { Control::OnStageConnection( depth ); - Geometry geometry = Geometry::QUAD(); + Geometry geometry = VisualFactoryCache::CreateQuadGeometry(); Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); TextureSet textureSet = TextureSet::New(); @@ -350,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; }