projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cache NPatch textures
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-factory-impl.cpp
b/dali-toolkit/internal/visuals/visual-factory-impl.cpp
index
6baaec2
..
9b77e63
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-factory-impl.cpp
@@
-28,7
+28,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/
public-api/visuals/
visual-properties.h>
+#include <dali-toolkit/
devel-api/visual-factory/devel-
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/border/border-visual.h>
#include <dali-toolkit/internal/visuals/color/color-visual.h>
#include <dali-toolkit/internal/visuals/gradient/gradient-visual.h>
@@
-38,6
+38,7
@@
#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
#include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
#include <dali-toolkit/internal/visuals/npatch/npatch-visual.h>
#include <dali-toolkit/internal/visuals/primitive/primitive-visual.h>
#include <dali-toolkit/internal/visuals/svg/svg-visual.h>
+#include <dali-toolkit/internal/visuals/text/text-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/wireframe/wireframe-visual.h>
#include <dali-toolkit/internal/visuals/visual-factory-cache.h>
#include <dali-toolkit/internal/visuals/visual-factory-resolve-url.h>
@@
-99,12
+100,12
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
// Return a new WireframeVisual if we have debug enabled
if( mDebugEnabled )
{
// Return a new WireframeVisual if we have debug enabled
if( mDebugEnabled )
{
- return Toolkit::Visual::Base(
new WireframeVisual( *( mFactoryCache.Get() )
) );
+ return Toolkit::Visual::Base(
WireframeVisual::New( *( mFactoryCache.Get() ) ).Get(
) );
}
}
- Visual::Base
* visualPtr = NULL
;
+ Visual::Base
Ptr visualPtr
;
- Property::Value* typeValue = propertyMap.Find( Toolkit::Visual
::
Property::TYPE, VISUAL_TYPE );
+ Property::Value* typeValue = propertyMap.Find( Toolkit::VisualProperty::TYPE, VISUAL_TYPE );
Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type.
if( typeValue )
{
Toolkit::Visual::Type visualType = Toolkit::Visual::IMAGE; // Default to IMAGE type.
if( typeValue )
{
@@
-115,19
+116,19
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
{
case Toolkit::Visual::BORDER:
{
{
case Toolkit::Visual::BORDER:
{
- visualPtr =
new BorderVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
BorderVisual::New
( *( mFactoryCache.Get() ) );
break;
}
case Toolkit::Visual::COLOR:
{
break;
}
case Toolkit::Visual::COLOR:
{
- visualPtr =
new ColorVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
ColorVisual::New
( *( mFactoryCache.Get() ) );
break;
}
case Toolkit::Visual::GRADIENT:
{
break;
}
case Toolkit::Visual::GRADIENT:
{
- visualPtr =
new GradientVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
GradientVisual::New
( *( mFactoryCache.Get() ) );
break;
}
break;
}
@@
-141,11
+142,11
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
UrlType::Type type = ResolveUrlType( imageUrl );
if( UrlType::N_PATCH == type )
{
UrlType::Type type = ResolveUrlType( imageUrl );
if( UrlType::N_PATCH == type )
{
- visualPtr =
new NPatchVisual( *( mFactoryCache.Get() )
);
+ visualPtr =
NPatchVisual::New( *( mFactoryCache.Get() ), imageUrl
);
}
else if( UrlType::SVG == type )
{
}
else if( UrlType::SVG == type )
{
- visualPtr =
new SvgVisual( *( mFactoryCache.Get() )
);
+ visualPtr =
SvgVisual::New( *( mFactoryCache.Get() ), imageUrl
);
}
else // Regular image
{
}
else // Regular image
{
@@
-158,12
+159,12
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
if( batchingEnabled )
{
if( batchingEnabled )
{
- visualPtr =
new BatchImageVisual( *( mFactoryCache.Get() )
);
+ visualPtr =
BatchImageVisual::New( *( mFactoryCache.Get() ), imageUrl
);
break;
}
else
{
break;
}
else
{
- visualPtr =
new ImageVisual( *( mFactoryCache.Get() )
);
+ visualPtr =
ImageVisual::New( *( mFactoryCache.Get() ), imageUrl
);
}
}
}
}
}
}
@@
-173,35
+174,39
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Property::Map& property
case Toolkit::Visual::MESH:
{
case Toolkit::Visual::MESH:
{
- visualPtr =
new MeshVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
MeshVisual::New
( *( mFactoryCache.Get() ) );
break;
}
case Toolkit::Visual::PRIMITIVE:
{
break;
}
case Toolkit::Visual::PRIMITIVE:
{
- visualPtr =
new PrimitiveVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
PrimitiveVisual::New
( *( mFactoryCache.Get() ) );
break;
}
case Toolkit::Visual::WIREFRAME:
{
break;
}
case Toolkit::Visual::WIREFRAME:
{
- visualPtr =
new WireframeVisual
( *( mFactoryCache.Get() ) );
+ visualPtr =
WireframeVisual::New
( *( mFactoryCache.Get() ) );
break;
}
break;
}
+ case Toolkit::Visual::TEXT:
+ {
+ visualPtr = TextVisual::New( *( mFactoryCache.Get() ) );
+ break;
+ }
}
if( visualPtr )
{
}
if( visualPtr )
{
- Actor actor;
- visualPtr->Initialize( actor, propertyMap );
+ visualPtr->SetProperties( propertyMap );
}
else
{
DALI_LOG_ERROR( "Renderer type unknown\n" );
}
}
else
{
DALI_LOG_ERROR( "Renderer type unknown\n" );
}
- return Toolkit::Visual::Base( visualPtr );
+ return Toolkit::Visual::Base( visualPtr
.Get()
);
}
Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
}
Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
@@
-213,25
+218,22
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const Image& image )
if( mDebugEnabled )
{
if( mDebugEnabled )
{
- return Toolkit::Visual::Base(
new WireframeVisual( *( mFactoryCache.Get() )
) );
+ return Toolkit::Visual::Base(
WireframeVisual::New( *( mFactoryCache.Get() ) ).Get(
) );
}
}
+ Visual::BasePtr visualPtr;
+
NinePatchImage npatchImage = NinePatchImage::DownCast( image );
if( npatchImage )
{
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
{
}
else
{
- ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ) );
- Actor actor;
- visualPtr->SetImage( actor, image );
-
- return Toolkit::Visual::Base( visualPtr );
+ visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), image );
}
}
+
+ return Toolkit::Visual::Base( visualPtr.Get() );
}
Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
}
Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, ImageDimensions size )
@@
-243,32
+245,27
@@
Toolkit::Visual::Base VisualFactory::CreateVisual( const std::string& url, Image
if( mDebugEnabled )
{
if( mDebugEnabled )
{
- return Toolkit::Visual::Base(
new WireframeVisual( *( mFactoryCache.Get() )
) );
+ 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 )
{
// first resolve url type to know which visual to create
UrlType::Type type = ResolveUrlType( url );
if( UrlType::N_PATCH == type )
{
- NPatchVisual* visualPtr = new NPatchVisual( *( mFactoryCache.Get() ) );
- visualPtr->SetImage( url );
-
- return Toolkit::Visual::Base( visualPtr );
+ visualPtr = NPatchVisual::New( *( mFactoryCache.Get() ), url );
}
else if( UrlType::SVG == type )
{
}
else if( UrlType::SVG == type )
{
- SvgVisual* visualPtr = new SvgVisual( *( mFactoryCache.Get() ) );
- visualPtr->SetImage( url, size );
- return Toolkit::Visual::Base( visualPtr );
+ visualPtr = SvgVisual::New( *( mFactoryCache.Get() ), url, size );
}
else // Regular image
{
}
else // Regular image
{
- ImageVisual* visualPtr = new ImageVisual( *( mFactoryCache.Get() ));
- Actor actor;
- visualPtr->SetImage( actor, url, size );
-
- return Toolkit::Visual::Base( visualPtr );
+ visualPtr = ImageVisual::New( *( mFactoryCache.Get() ), url, size );
}
}
+
+ return Toolkit::Visual::Base( visualPtr.Get() );
}
} // namespace Internal
}
} // namespace Internal