*/
struct AtlasDescriptor
{
- Dali::Atlas mAtlas; // atlas image
+ Dali::Texture mAtlas; // atlas image
Toolkit::AtlasManager::AtlasSize mSize; // size of atlas
Pixel::Format mPixelFormat; // pixel format used by atlas
- BufferImage mHorizontalStrip; // Image used to pad upload
- BufferImage mVerticalStrip; // Image used to pad upload
- Material mMaterial; // material used for atlas texture
+ PixelData mHorizontalStrip; // Image used to pad upload
+ PixelData mVerticalStrip; // Image used to pad upload
+ TextureSet mTextureSet; // Texture set used for atlas texture
SizeType mTotalBlocks; // total number of blocks in atlas
SizeType mAvailableBlocks; // number of blocks available in atlas
Dali::Vector< SizeType > mFreeBlocksList; // unless there are any previously freed blocks
/**
* @copydoc Toolkit::AtlasManager::Add
*/
- bool Add( const BufferImage& image,
+ bool Add( const PixelData& image,
Toolkit::AtlasManager::AtlasSlot& slot,
Toolkit::AtlasManager::AtlasId atlas );
/**
* @copydoc Toolkit::AtlasManager::GetAtlasContainer
*/
- Dali::Atlas GetAtlasContainer( AtlasId atlas ) const;
+ Dali::Texture GetAtlasContainer( AtlasId atlas ) const;
/**
* @copydoc Toolkit::AtlasManager::GetAtlas
/**
* @copydoc Toolkit::AtlasManager::GetPixelFormat
*/
- Pixel::Format GetPixelFormat( AtlasId atlas );
+ Pixel::Format GetPixelFormat( AtlasId atlas ) const;
/**
* @copydoc Toolkit::AtlasManager::GetMetrics
void GetMetrics( Toolkit::AtlasManager::Metrics& metrics );
/**
- * @copydoc Toolkit::AtlasManager::GetMaterial
+ * @copydoc Toolkit::AtlasManager::GetTextures
*/
- Material GetMaterial( AtlasId atlas ) const;
+ TextureSet GetTextures( AtlasId atlas ) const;
/**
- * @copydoc Toolkit::AtlasManager::SetMaterial
+ * @copydoc Toolkit::AtlasManager::SetTextures
*/
- void SetMaterial( AtlasId atlas, Material& material );
+ void SetTextures( AtlasId atlas, TextureSet& textureSet );
private:
std::vector< AtlasDescriptor > mAtlasList; // List of atlases created
Vector< AtlasSlotDescriptor > mImageList; // List of bitmaps stored in atlases
Toolkit::AtlasManager::AtlasSize mNewAtlasSize; // Atlas size to use in next creation
- Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy; // Policy for faling to add an Image
+ Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy; // Policy for failing to add an Image
SizeType CheckAtlas( SizeType atlas,
SizeType width,
SizeType height,
Pixel::Format pixelFormat );
- void UploadImage( const BufferImage& image,
+ void UploadImage( const PixelData& image,
const AtlasSlotDescriptor& desc );
};