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=365c6149a82fa8782247791ffc2291ec9d1150bc;hp=2c79c27a1f8b448ff280616c71217ae57d5de915;hb=93833d2c76d1cab9da6fce404739e95e093da911;hpb=f29b744f4c9d27aeb355319712313876bb236bca diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 2c79c27..365c614 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-factory-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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. @@ -23,30 +23,26 @@ #include #include #include -#include #include // INTERNAL INCLUDES #include +#include #include #include #include -#include #include -#include #include -#include #include +#include #include +#include +#include +#include +#include #include +#include #include -#include -#include - -namespace -{ -const char * const BROKEN_VISUAL_IMAGE_URL( DALI_IMAGE_DIR "broken.png"); -} namespace Dali { @@ -60,20 +56,6 @@ namespace Internal namespace { -DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_TYPE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, BORDER ) -DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, COLOR ) -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, BATCH_IMAGE ) -DALI_ENUM_TO_STRING_TABLE_END( VISUAL_TYPE ) - -const char * const VISUAL_TYPE( "visualType" ); -const char * const BATCHING_ENABLED( "batchingEnabled" ); - BaseHandle Create() { BaseHandle handle = Toolkit::VisualFactory::Get(); @@ -103,13 +85,7 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property mFactoryCache = new VisualFactoryCache(); } - // Return a new DebugVisual if we have debug enabled - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } - - Visual::Base* visualPtr = NULL; + Visual::BasePtr visualPtr; Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE ); Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type. @@ -118,113 +94,153 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType ); } - // If the type is IMAGE, either from a default or the TYPE value in the property-map, change it to a BatchImage if required. - if( visualType == Toolkit::Visual::IMAGE ) - { - bool batchingEnabled( false ); - Property::Value* value = propertyMap.Find( Toolkit::Visual::Property::BATCHING_ENABLED, BATCHING_ENABLED ); - if( value ) - { - value->Get( batchingEnabled ); - if( batchingEnabled ) - { - visualType = Toolkit::Visual::BATCH_IMAGE; - } - } - } - switch( visualType ) { case Toolkit::Visual::BORDER: { - visualPtr = new BorderVisual( *( mFactoryCache.Get() ) ); + visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } case Toolkit::Visual::COLOR: { - visualPtr = new ColorVisual( *( mFactoryCache.Get() ) ); + visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } case Toolkit::Visual::GRADIENT: { - visualPtr = new GradientVisual( *( mFactoryCache.Get() ) ); + visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - default: // Default to Image type if unknown (check if there is a URL) case Toolkit::Visual::IMAGE: { Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl ) ) + if( imageURLValue ) { - if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) - { - visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - } - else + if( imageURLValue->Get( imageUrl ) ) { - CreateAtlasManager(); + VisualUrl visualUrl( imageUrl ); - if( SvgVisual::IsSvgUrl( imageUrl ) ) + switch( visualUrl.GetType() ) { - visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap ); + break; + } } - else + } + else + { + Property::Array* array = imageURLValue->GetArray(); + if( array ) { - visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap ); } } } - else if( propertyMap.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER ) ) - { - // Create Image Visual if it has a shader - // TODO: This is required because of EffectsView which should be fixed - CreateAtlasManager(); - visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - } break; } case Toolkit::Visual::MESH: { - visualPtr = new MeshVisual( *( mFactoryCache.Get() ) ); + visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } case Toolkit::Visual::PRIMITIVE: { - visualPtr = new PrimitiveVisual( *( mFactoryCache.Get() ) ); + visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case Toolkit::Visual::DEBUG: + case Toolkit::Visual::WIREFRAME: { - visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case Toolkit::Visual::BATCH_IMAGE: + case Toolkit::Visual::TEXT: { - CreateAtlasManager(); - visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); + visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap ); + break; + } + + case Toolkit::Visual::N_PATCH: + { + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue && imageURLValue->Get( imageUrl ) ) + { + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + } + break; + } + + case Toolkit::Visual::SVG: + { + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue && imageURLValue->Get( imageUrl ) ) + { + visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + } + break; + } + + case Toolkit::Visual::ANIMATED_IMAGE: + { + Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); + std::string imageUrl; + if( imageURLValue ) + { + if( imageURLValue->Get( imageUrl ) ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap ); + } + else + { + Property::Array* array = imageURLValue->GetArray(); + if( array ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap ); + } + } + } break; } } - if( visualPtr ) + if( !visualPtr ) { - Actor actor; - visualPtr->Initialize( actor, propertyMap ); + DALI_LOG_ERROR( "Renderer type unknown\n" ); } - else + + if( mDebugEnabled && visualType != Toolkit::Visual::WIREFRAME ) { - DALI_LOG_ERROR( "Renderer type unknown" ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr, propertyMap ); } - return Toolkit::Visual::Base( visualPtr ); + return Toolkit::Visual::Base( visualPtr.Get() ); } Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) @@ -234,28 +250,25 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image ) mFactoryCache = new VisualFactoryCache(); } - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } + Visual::BasePtr visualPtr; NinePatchImage npatchImage = NinePatchImage::DownCast( image ); if( npatchImage ) { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( npatchImage ); - - return Toolkit::Visual::Base( visualPtr ); + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), npatchImage ); } else { - CreateAtlasManager(); - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, image ); + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image ); + } - return Toolkit::Visual::Base( visualPtr ); + if( mDebugEnabled ) + { + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); } + + return Toolkit::Visual::Base( visualPtr.Get() ); } Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size ) @@ -265,49 +278,50 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image mFactoryCache = new VisualFactoryCache(); } - if( mDebugEnabled ) - { - return Toolkit::Visual::Base( new DebugVisual( *( mFactoryCache.Get() ) ) ); - } - - if( NinePatchImage::IsNinePatchUrl( url ) ) - { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url ); + Visual::BasePtr visualPtr; - return Toolkit::Visual::Base( visualPtr ); - } - else if( SvgVisual::IsSvgUrl( url ) ) + // first resolve url type to know which visual to create + VisualUrl visualUrl( url ); + switch( visualUrl.GetType() ) { - CreateAtlasManager(); - SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - visualPtr->SetImage( url, size ); - return Toolkit::Visual::Base( visualPtr ); + case VisualUrl::N_PATCH: + { + visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::SVG: + { + visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::GIF: + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl ); + break; + } + case VisualUrl::REGULAR_IMAGE: + { + visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, size ); + break; + } } - else - { - CreateAtlasManager(); - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ), *( mAtlasManager.Get() ) ); - Actor actor; - visualPtr->SetImage( actor, url, size ); - return Toolkit::Visual::Base( visualPtr ); + if( mDebugEnabled ) + { + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); } -} -Image VisualFactory::GetBrokenVisualImage() -{ - return ResourceImage::New( BROKEN_VISUAL_IMAGE_URL ); + return Toolkit::Visual::Base( visualPtr.Get() ); } -void VisualFactory::CreateAtlasManager() +Internal::TextureManager& VisualFactory::GetTextureManager() { - if( !mAtlasManager ) + if( !mFactoryCache ) { - Shader shader = ImageVisual::GetImageShader( *( mFactoryCache.Get() ) ); - mAtlasManager = new ImageAtlasManager(); - mAtlasManager->SetBrokenImage( BROKEN_VISUAL_IMAGE_URL ); + mFactoryCache = new VisualFactoryCache(); } + return mFactoryCache->GetTextureManager(); } } // namespace Internal