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
Merge "Update contents of programming guide" into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager-impl.h
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
b/dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
index
6f1411e
..
ef078f8
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
@@
-60,13
+60,11
@@
public:
struct AtlasDescriptor
{
Dali::Atlas mAtlas; // atlas image
struct AtlasDescriptor
{
Dali::Atlas mAtlas; // atlas image
- SizeType mWidth; // width of atlas
- SizeType mHeight; // height of atlas
- SizeType mBlockWidth; // width of a block in atlas
- SizeType mBlockHeight; // height of a block in atlas
+ 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
Pixel::Format mPixelFormat; // pixel format used by atlas
BufferImage mHorizontalStrip; // Image used to pad upload
BufferImage mVerticalStrip; // Image used to pad upload
+ BufferImage mFilledPixelImage; // Image used by atlas for operations such as underline
PixelBuffer* mStripBuffer; // Blank image buffer used to pad upload
Material mMaterial; // material used for atlas texture
SizeType mNextFreeBlock; // next free block will be placed here ( actually +1 )
PixelBuffer* mStripBuffer; // Blank image buffer used to pad upload
Material mMaterial; // material used for atlas texture
SizeType mNextFreeBlock; // next free block will be placed here ( actually +1 )
@@
-94,11
+92,7
@@
public:
/**
* @copydoc: Toolkit::AtlasManager::CreateAtlas
*/
/**
* @copydoc: Toolkit::AtlasManager::CreateAtlas
*/
- AtlasId CreateAtlas( SizeType width,
- SizeType height,
- SizeType blockWidth,
- SizeType blockHeight,
- Pixel::Format pixelformat );
+ AtlasId CreateAtlas( const Toolkit::AtlasManager::AtlasSize& size, Pixel::Format pixelformat );
/**
* @copydoc Toolkit::AtlasManager::SetAddPolicy
/**
* @copydoc Toolkit::AtlasManager::SetAddPolicy
@@
-151,13
+145,12
@@
public:
/**
* @copydoc Toolkit::AtlasManager::SetNewAtlasSize
*/
/**
* @copydoc Toolkit::AtlasManager::SetNewAtlasSize
*/
- void SetNewAtlasSize( const Vector2& size,
- const Vector2& blockSize );
+ void SetNewAtlasSize( const Toolkit::AtlasManager::AtlasSize& size );
/**
* @copydoc Toolkit::AtlasManager::GetAtlasSize
*/
/**
* @copydoc Toolkit::AtlasManager::GetAtlasSize
*/
-
Vector2
GetAtlasSize( AtlasId atlas );
+
const Toolkit::AtlasManager::AtlasSize&
GetAtlasSize( AtlasId atlas );
/**
* @copydoc Toolkit::AtlasManager::GetBlockSize
/**
* @copydoc Toolkit::AtlasManager::GetBlockSize
@@
-214,9
+207,9
@@
private:
void PrintMeshData( const MeshData& meshData );
void PrintMeshData( const MeshData& meshData );
- Vector2 mNewAtlasSize;
- Vector2 mNewBlockSize;
+ Toolkit::AtlasManager::AtlasSize mNewAtlasSize;
Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy;
Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy;
+ uint32_t mFilledPixel;
};
} // namespace Internal
};
} // namespace Internal