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=80f44208ab49d36c6be8bb745f8f262eaab7102c;hb=ca4209fb071e5c353a7e528098a2e497765118d8;hpb=2cf32ac170f397aacce527efd34909b3fd62efda diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.cpp b/dali-toolkit/internal/visuals/visual-factory-impl.cpp index 80f4420..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,24 +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 namespace Dali { @@ -54,18 +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_TABLE_END( VISUAL_TYPE ) - -const char * const VISUAL_TYPE( "visualType" ); -const char * const BATCHING_ENABLED( "batchingEnabled" ); BaseHandle Create() { BaseHandle handle = Toolkit::VisualFactory::Get(); @@ -95,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. @@ -114,19 +98,19 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property { 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; } @@ -134,67 +118,129 @@ Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property { Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME ); std::string imageUrl; - if( imageURLValue && imageURLValue->Get( imageUrl ) ) + if( imageURLValue ) { - Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED ); - if( batchingEnabledValue ) + if( imageURLValue->Get( imageUrl ) ) { - bool batchingEnabled( false ); - batchingEnabledValue->Get( batchingEnabled ); - if( batchingEnabled ) + VisualUrl visualUrl( imageUrl ); + + switch( visualUrl.GetType() ) { - visualPtr = new BatchImageVisual( *( mFactoryCache.Get() ) ); - break; + 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 if( NinePatchImage::IsNinePatchUrl( imageUrl ) ) - { - visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - } - else if( SvgVisual::IsSvgUrl( imageUrl ) ) - { - visualPtr = new SvgVisual( *( mFactoryCache.Get() ) ); - } else { - visualPtr = new ImageVisual( *( mFactoryCache.Get() ) ); + Property::Array* array = imageURLValue->GetArray(); + if( array ) + { + visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap ); + } } } - 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::WIREFRAME: + { + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), propertyMap ); + break; + } + + case Toolkit::Visual::TEXT: + { + visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap ); break; } - case Toolkit::Visual::DEBUG: + case Toolkit::Visual::N_PATCH: { - visualPtr = new DebugVisual( *( mFactoryCache.Get() ) ); + 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\n" ); + //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 ) @@ -204,27 +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 { - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.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 ) @@ -234,32 +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() ) ) ); - } + Visual::BasePtr visualPtr; - if( NinePatchImage::IsNinePatchUrl( url ) ) + // first resolve url type to know which visual to create + VisualUrl visualUrl( url ); + switch( visualUrl.GetType() ) { - NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url ); - - 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 if( SvgVisual::IsSvgUrl( url ) ) + + if( mDebugEnabled ) { - SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ) ); - visualPtr->SetImage( url, size ); - return Toolkit::Visual::Base( visualPtr ); + //Create a WireframeVisual if we have debug enabled + visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr ); } - else - { - ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() )); - Actor actor; - visualPtr->SetImage( actor, url, size ); - return Toolkit::Visual::Base( visualPtr ); + return Toolkit::Visual::Base( visualPtr.Get() ); +} + +Internal::TextureManager& VisualFactory::GetTextureManager() +{ + if( !mFactoryCache ) + { + mFactoryCache = new VisualFactoryCache(); } + return mFactoryCache->GetTextureManager(); } } // namespace Internal