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
Remove Atlas usage from ImageVisual
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
batch-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/image/batch-image-visual.h
b/dali-toolkit/internal/visuals/image/batch-image-visual.h
index
750e28f
..
e5536e9
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/batch-image-visual.h
+++ b/
dali-toolkit/internal/visuals/image/batch-image-visual.h
@@
-40,9
+40,8
@@
public:
* @brief Constructor.
*
* @param[in] factoryCache The VisualFactoryCache object
* @brief Constructor.
*
* @param[in] factoryCache The VisualFactoryCache object
- * @param[in] atlasManager The atlasManager object
*/
*/
- BatchImageVisual( VisualFactoryCache& factoryCache
, ImageAtlasManager& atlasManager
);
+ BatchImageVisual( VisualFactoryCache& factoryCache );
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-62,14
+61,19
@@
public: // from Visual
virtual void GetNaturalSize( Vector2& naturalSize ) const;
/**
virtual void GetNaturalSize( Vector2& naturalSize ) const;
/**
- * @copydoc Visual::Base::
SetClipRect
+ * @copydoc Visual::Base::
CreatePropertyMap
*/
*/
- virtual void
SetClipRect( const Rect<int>& clipRect )
;
+ virtual void
DoCreatePropertyMap( Property::Map& map ) const
;
/**
/**
- * @copydoc Visual::Base::
CreatePropertyMap
+ * @copydoc Visual::Base::
DoSetProperty
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
+ virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
+
+ /**
+ * @copydoc Visual::Base::DoGetProperty
+ */
+ virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
protected:
protected:
@@
-110,7
+114,6
@@
private:
private:
private:
- ImageAtlasManager& mAtlasManager;
Vector4 mAtlasRect;
std::string mImageUrl;
Dali::ImageDimensions mDesiredSize;
Vector4 mAtlasRect;
std::string mImageUrl;
Dali::ImageDimensions mDesiredSize;