X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.cpp;h=e35c98b4a078214395e534f0d1d6039efaa79008;hp=80f44208ab49d36c6be8bb745f8f262eaab7102c;hb=1894ecb2c5bdcb91549d9da9d8301d0a753c5492;hpb=260c832bfaa0294e74a4f96d321f149adf09a3ce diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 80f4420..e35c98b 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -31,16 +31,16 @@ #include #include #include -#include #include -#include +#include #include -#include #include +#include #include +#include +#include #include #include -#include namespace Dali { @@ -61,7 +61,7 @@ DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, GRADIENT ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, IMAGE ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, MESH ) DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, PRIMITIVE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, DEBUG ) +DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME ) DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE ) const char * const VISUAL_TYPE( "visualType" ); @@ -95,10 +95,10 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property mFactoryCache = new VisualFactoryCache(); } - // Return a new DebugVisual if we have debug enabled + // Return a new WireframeVisual if we have debug enabled if( mDebugEnabled ) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) ); } Visual::Base* visualPtr = NULL; @@ -176,9 +176,9 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property break; } - case Toolkit::Visual::DEBUG: + case Toolkit::Visual::WIREFRAME: { - visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); + visualPtr = new WireframeVisual( *( mFactoryCache.Get() ) ); break; } @@ -206,7 +206,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) if( mDebugEnabled ) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) ); } NinePatchImage npatchImage = NinePatchImage::DownCast( image ); @@ -236,7 +236,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image if( mDebugEnabled ) { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); + return Toolkit::Visual::Base( new WireframeVisual( *( mFactoryCache.Get() ) ) ); } if( NinePatchImage::IsNinePatchUrl( url ) )