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
DALi Version 1.0.52
[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
5336e1b
..
5b301f0
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager-impl.h
@@
-46,7
+46,7
@@
typedef Dali::Vector< Toolkit::AtlasManager::AtlasSlot > slotContainer;
class AtlasManager;
typedef IntrusivePtr<AtlasManager> AtlasManagerPtr;
class AtlasManager;
typedef IntrusivePtr<AtlasManager> AtlasManagerPtr;
-class AtlasManager : public Dali::BaseObject
, public ConnectionTracker
+class AtlasManager : public Dali::BaseObject
{
public:
{
public:
@@
-64,11
+64,10
@@
public:
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
Sampler mSampler; // sampler used for atlas texture
Material mMaterial; // material used for atlas texture
Sampler mSampler; // sampler used for atlas texture
- SizeType mNextFreeBlock; // next free block will be placed here ( actually +1 )
+ 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
};
Dali::Vector< SizeType > mFreeBlocksList; // unless there are any previously freed blocks
};
@@
-112,7
+111,8
@@
public:
*/
void GenerateMeshData( ImageId id,
const Vector2& position,
*/
void GenerateMeshData( ImageId id,
const Vector2& position,
- Toolkit::AtlasManager::Mesh2D& mesh );
+ Toolkit::AtlasManager::Mesh2D& mesh,
+ bool addReference );
/**
* @copydoc Toolkit::AtlasManager::StitchMesh
/**
* @copydoc Toolkit::AtlasManager::StitchMesh
@@
-122,14
+122,6
@@
public:
bool optimize );
/**
bool optimize );
/**
- * @copydoc Toolkit::AtlasManager::StitchMesh
- */
- void StitchMesh( const Toolkit::AtlasManager::Mesh2D& first,
- const Toolkit::AtlasManager::Mesh2D& second,
- Toolkit::AtlasManager::Mesh2D& out,
- bool optimize );
-
- /**
* @copydoc Toolkit::AtlasManager::Remove
*/
bool Remove( ImageId id );
* @copydoc Toolkit::AtlasManager::Remove
*/
bool Remove( ImageId id );
@@
-193,17
+185,14
@@
private:
std::vector< AtlasDescriptor > mAtlasList; // List of atlases created
std::vector< AtlasSlotDescriptor > mImageList; // List of bitmaps store in atlases
std::vector< AtlasDescriptor > mAtlasList; // List of atlases created
std::vector< AtlasSlotDescriptor > mImageList; // List of bitmaps store in atlases
- Vector< PixelBuffer* > mUploadedImages; // List of PixelBuffers passed to UploadedSignal
Toolkit::AtlasManager::AtlasSize mNewAtlasSize; // Atlas size to use in next creation
Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy; // Policy for faling to add an Image
Toolkit::AtlasManager::AtlasSize mNewAtlasSize; // Atlas size to use in next creation
Toolkit::AtlasManager::AddFailPolicy mAddFailPolicy; // Policy for faling to add an Image
- SizeType mFilledPixel; // 32Bit pixel image for underlining
SizeType CheckAtlas( SizeType atlas,
SizeType width,
SizeType height,
Pixel::Format pixelFormat,
SizeType CheckAtlas( SizeType atlas,
SizeType width,
SizeType height,
Pixel::Format pixelFormat,
- SizeType& blockArea,
- SizeType& totalBlocks );
+ SizeType& blockArea );
void CreateMesh( SizeType atlas,
SizeType imageWidth,
void CreateMesh( SizeType atlas,
SizeType imageWidth,
@@
-222,8
+211,6
@@
private:
void PrintMeshData( const Toolkit::AtlasManager::Mesh2D& mesh );
void PrintMeshData( const Toolkit::AtlasManager::Mesh2D& mesh );
- void OnUpload( Image image );
-
Shader mShaderL8;
Shader mShaderRgba;
Shader mShaderL8;
Shader mShaderRgba;
@@
-254,4
+241,4
@@
inline Internal::AtlasManager& GetImplementation(Toolkit::AtlasManager& manager)
} // namespace Dali
} // namespace Dali
- #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__
\ No newline at end of file
+ #endif // __DALI_TOOLKIT_ATLAS_MANAGER_IMPL_H__