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 "There is an issue with scale, so change to LINEAR. and fixed pixel alignment...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-manager.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
index
3449362
..
044b9e3
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-manager.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_ATLAS_MANAGER_H__
-#define
__DALI_TOOLKIT_ATLAS_MANAGER_H__
+#ifndef
DALI_TOOLKIT_ATLAS_MANAGER_H
+#define
DALI_TOOLKIT_ATLAS_MANAGER_H
/*
/*
- * Copyright (c) 20
15
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,9
+20,7
@@
// EXTERNAL INCLUDES
#include <stdint.h>
#include <dali/public-api/common/dali-vector.h>
// EXTERNAL INCLUDES
#include <stdint.h>
#include <dali/public-api/common/dali-vector.h>
-#include <dali/public-api/images/buffer-image.h>
-#include <dali/devel-api/images/atlas.h>
-#include <dali/devel-api/rendering/material.h>
+#include <dali/public-api/rendering/texture-set.h>
namespace Dali
{
namespace Dali
{
@@
-90,7
+88,7
@@
public:
struct Mesh2D
{
Vector< Vertex2D > mVertices; ///< container of vertices
struct Mesh2D
{
Vector< Vertex2D > mVertices; ///< container of vertices
- Vector<
SizeType
> mIndices; ///< container of indices
+ Vector<
unsigned short
> mIndices; ///< container of indices
};
/**
};
/**
@@
-157,13
+155,13
@@
public:
* If an add is made before an atlas is created under this policy,
* then a default size atlas will be created
*
* If an add is made before an atlas is created under this policy,
* then a default size atlas will be created
*
- * @param[in] image
reference to a bitmapimage
+ * @param[in] image
PixelData object containing the image data
* @param[out] slot result of add operation
* @param[in] atlas optional preferred atlas
*
* @return true if a new atlas was created
*/
* @param[out] slot result of add operation
* @param[in] atlas optional preferred atlas
*
* @return true if a new atlas was created
*/
- bool Add( const
BufferImage
& image,
+ bool Add( const
PixelData
& image,
AtlasSlot& slot,
AtlasId atlas = 0 );
AtlasSlot& slot,
AtlasId atlas = 0 );
@@
-190,13
+188,13
@@
public:
bool addReference = true );
/**
bool addReference = true );
/**
- * @brief Get the
BufferImag
e containing an atlas
+ * @brief Get the
Textur
e containing an atlas
*
* @param[in] atlas AtlasId returned when atlas was created
*
* @return Atlas Handle
*/
*
* @param[in] atlas AtlasId returned when atlas was created
*
* @return Atlas Handle
*/
- Dali::
Atlas
GetAtlasContainer( AtlasId atlas ) const;
+ Dali::
Texture
GetAtlasContainer( AtlasId atlas ) const;
/**
* @brief Get the Id of the atlas containing an image
/**
* @brief Get the Id of the atlas containing an image
@@
-247,7
+245,7
@@
public:
*
* @return Pixel format used by this atlas
*/
*
* @return Pixel format used by this atlas
*/
- Pixel::Format GetPixelFormat( AtlasId atlas );
+ Pixel::Format GetPixelFormat( AtlasId atlas )
const
;
/**
* @brief Fill in a metrics structure showing current status of this Atlas Manager
/**
* @brief Fill in a metrics structure showing current status of this Atlas Manager
@@
-257,21
+255,21
@@
public:
void GetMetrics( Metrics& metrics );
/**
void GetMetrics( Metrics& metrics );
/**
- * @brief Get
Material
used by atlas
+ * @brief Get
TextureSet
used by atlas
*
* @param[in] atlas AtlasId
*
*
* @param[in] atlas AtlasId
*
- * @return
Material
used by atlas
+ * @return
TextureSet
used by atlas
*/
*/
-
Material GetMaterial
( AtlasId atlas ) const;
+
TextureSet GetTextures
( AtlasId atlas ) const;
/**
/**
- * @brief Set the
material
used by an atlas
+ * @brief Set the
texture set
used by an atlas
*
* @param[in] atlas AtlasId
*
* @param[in] atlas AtlasId
- * @param[in]
material The Material
to assign
+ * @param[in]
textureSet The texture set
to assign
*/
*/
- void Set
Material( AtlasId atlas, Material& material
);
+ void Set
Textures( AtlasId atlas, TextureSet& textureSet
);
private:
private:
@@
-283,4
+281,4
@@
private:
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_ATLAS_MANAGER_H__
+#endif //
DALI_TOOLKIT_ATLAS_MANAGER_H