/*
- * 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.
#include <dali/public-api/object/property-array.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
-#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/text-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/public-api/visuals/text-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/internal/visuals/border/border-visual.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
-#include <dali-toolkit/internal/visuals/image/batch-image-visual.h>
#include <dali-toolkit/internal/visuals/image/image-visual.h>
#include <dali-toolkit/internal/visuals/mesh/mesh-visual.h>
#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
#include <dali-toolkit/internal/visuals/animated-image/animated-image-visual.h>
#include <dali-toolkit/internal/visuals/wireframe/wireframe-visual.h>
#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
-#include <dali-toolkit/internal/visuals/visual-factory-resolve-url.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
namespace Dali
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::DevelVisual, TEXT )
-DALI_ENUM_TO_STRING_WITH_SCOPE( Toolkit::Visual, WIREFRAME )
-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();
Visual::BasePtr visualPtr;
- if( mDebugEnabled )
+ Property::Value* typeValue = propertyMap.Find( Toolkit::Visual::Property::TYPE, VISUAL_TYPE );
+ Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type.
+ if( typeValue )
{
- //Create a WireframeVisual if we have debug enabled
- visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ) );
+ Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
}
- else
+
+ switch( visualType )
{
- Property::Value* typeValue = propertyMap.Find( Toolkit::DevelVisual::Property::TYPE, VISUAL_TYPE );
- Toolkit::DevelVisual::Type visualType = Toolkit::DevelVisual::IMAGE; // Default to IMAGE type.
- if( typeValue )
+ case Toolkit::Visual::BORDER:
{
- Scripting::GetEnumerationProperty( *typeValue, VISUAL_TYPE_TABLE, VISUAL_TYPE_TABLE_COUNT, visualType );
+ visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
+ break;
}
- switch( visualType )
+ case Toolkit::Visual::COLOR:
{
- case Toolkit::Visual::BORDER:
- {
- visualPtr = BorderVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
- }
-
- case Toolkit::Visual::COLOR:
- {
- visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
- }
+ visualPtr = ColorVisual::New( *( mFactoryCache.Get() ), propertyMap );
+ break;
+ }
- case Toolkit::Visual::GRADIENT:
- {
- visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
- }
+ case Toolkit::Visual::GRADIENT:
+ {
+ visualPtr = GradientVisual::New( *( mFactoryCache.Get() ), propertyMap );
+ break;
+ }
- case Toolkit::Visual::IMAGE:
+ case Toolkit::Visual::IMAGE:
+ {
+ Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+ std::string imageUrl;
+ if( imageURLValue )
{
- Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
- std::string imageUrl;
- if( imageURLValue && imageURLValue->Get( imageUrl ) )
+ if( imageURLValue->Get( imageUrl ) )
{
- // first resolve url type to know which visual to create
- UrlType::Type type = ResolveUrlType( imageUrl );
- if( UrlType::N_PATCH == type )
- {
- visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
- }
- else if( UrlType::SVG == type )
- {
- visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
- }
- else if( UrlType::GIF == type )
- {
- visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
- }
- else // Regular image
+ VisualUrl visualUrl( imageUrl );
+
+ switch( visualUrl.GetType() )
{
- bool batchingEnabled( false );
- Property::Value* batchingEnabledValue = propertyMap.Find( Toolkit::ImageVisual::Property::BATCHING_ENABLED, BATCHING_ENABLED );
- if( batchingEnabledValue )
+ case VisualUrl::N_PATCH:
{
- batchingEnabledValue->Get( batchingEnabled );
+ visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap );
+ break;
}
-
- if( batchingEnabled )
+ case VisualUrl::SVG:
{
- visualPtr = BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+ visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap );
+ break;
}
- else
+ case VisualUrl::GIF:
{
- visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
+ visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap );
+ break;
+ }
+ case VisualUrl::REGULAR_IMAGE:
+ {
+ visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), visualUrl, propertyMap );
+ break;
}
}
}
-
- break;
+ else
+ {
+ Property::Array* array = imageURLValue->GetArray();
+ if( array )
+ {
+ visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), *array, propertyMap );
+ }
+ }
}
+ break;
+ }
- case Toolkit::Visual::MESH:
- {
- visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
- }
+ case Toolkit::Visual::MESH:
+ {
+ visualPtr = MeshVisual::New( *( mFactoryCache.Get() ), propertyMap );
+ break;
+ }
- case Toolkit::Visual::PRIMITIVE:
+ case Toolkit::Visual::PRIMITIVE:
+ {
+ 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::N_PATCH:
+ {
+ Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+ std::string imageUrl;
+ if( imageURLValue && imageURLValue->Get( imageUrl ) )
{
- visualPtr = PrimitiveVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
+ visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
}
+ break;
+ }
- case Toolkit::Visual::WIREFRAME:
+ 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 = WireframeVisual::New( *( mFactoryCache.Get() ) );
- break;
+ visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), imageUrl, propertyMap );
}
+ break;
+ }
- case Toolkit::DevelVisual::TEXT:
+ case Toolkit::Visual::ANIMATED_IMAGE:
+ {
+ Property::Value* imageURLValue = propertyMap.Find( Toolkit::ImageVisual::Property::URL, IMAGE_URL_NAME );
+ std::string imageUrl;
+ if( imageURLValue )
{
- visualPtr = TextVisual::New( *( mFactoryCache.Get() ), propertyMap );
- break;
+ 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;
}
}
DALI_LOG_ERROR( "Renderer type unknown\n" );
}
+ if( mDebugEnabled && visualType != Toolkit::Visual::WIREFRAME )
+ {
+ //Create a WireframeVisual if we have debug enabled
+ visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr, propertyMap );
+ }
+
return Toolkit::Visual::Base( visualPtr.Get() );
}
mFactoryCache = new VisualFactoryCache();
}
- if( mDebugEnabled )
- {
- return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );
- }
-
Visual::BasePtr visualPtr;
NinePatchImage npatchImage = NinePatchImage::DownCast( image );
visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image );
}
+ if( mDebugEnabled )
+ {
+ //Create a WireframeVisual if we have debug enabled
+ visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr );
+ }
+
return Toolkit::Visual::Base( visualPtr.Get() );
}
mFactoryCache = new VisualFactoryCache();
}
- if( mDebugEnabled )
- {
- return Toolkit::Visual::Base( WireframeVisual::New( *( mFactoryCache.Get() ) ).Get() );
- }
-
Visual::BasePtr visualPtr;
// first resolve url type to know which visual to create
- UrlType::Type type = ResolveUrlType( url );
- if( UrlType::N_PATCH == type )
- {
- visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), url );
- }
- else if( UrlType::SVG == type )
+ VisualUrl visualUrl( url );
+ switch( visualUrl.GetType() )
{
- visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url );
- }
- else if( UrlType::GIF == type )
- {
- visualPtr = AnimatedImageVisual::New( *( mFactoryCache.Get() ), url );
+ 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 // Regular image
+
+ if( mDebugEnabled )
{
- visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );
+ //Create a WireframeVisual if we have debug enabled
+ visualPtr = WireframeVisual::New( *( mFactoryCache.Get() ), visualPtr );
}
return Toolkit::Visual::Base( visualPtr.Get() );
}
+Internal::TextureManager& VisualFactory::GetTextureManager()
+{
+ if( !mFactoryCache )
+ {
+ mFactoryCache = new VisualFactoryCache();
+ }
+ return mFactoryCache->GetTextureManager();
+}
+
} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff