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
Merged with Tizen Branch ( builds )
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
atlas-manager
/
atlas-manager.h
diff --git
a/dali-toolkit/internal/atlas-manager/atlas-manager.h
b/dali-toolkit/internal/atlas-manager/atlas-manager.h
index
5fc10d0
..
6f654ff
100644
(file)
--- a/
dali-toolkit/internal/atlas-manager/atlas-manager.h
+++ b/
dali-toolkit/internal/atlas-manager/atlas-manager.h
@@
-20,9
+20,9
@@
// 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/geometry/mesh-data.h>
#include <dali/public-api/images/atlas.h>
#include <dali/public-api/images/buffer-image.h>
#include <dali/public-api/images/atlas.h>
#include <dali/public-api/images/buffer-image.h>
+#include <dali/public-api/shader-effects/material.h>
namespace Dali
{
namespace Dali
{
@@
-187,6
+187,18
@@
public:
Dali::Vector< AtlasMetricsEntry > mAtlasMetrics; // container of atlas information
};
Dali::Vector< AtlasMetricsEntry > mAtlasMetrics; // container of atlas information
};
+ struct Vertex2D
+ {
+ Vector2 mPosition;
+ Vector2 mTexCoords;
+ };
+
+ struct Mesh2D
+ {
+ Vector< Vertex2D > mVertices;
+ Vector< unsigned short> mIndices;
+ };
+
/**
* Create an AtlasManager handle; this can be initialised with AtlasManager::New()
* Calling member functions with an uninitialised handle is not allowed.
/**
* Create an AtlasManager handle; this can be initialised with AtlasManager::New()
* Calling member functions with an uninitialised handle is not allowed.
@@
-277,7
+289,7
@@
public:
*/
void GenerateMeshData( ImageId id,
const Vector2& position,
*/
void GenerateMeshData( ImageId id,
const Vector2& position,
- Mesh
Data
& mesh );
+ Mesh
2D
& mesh );
/**
* @brief Append second mesh to the first mesh
/**
* @brief Append second mesh to the first mesh
@@
-286,8
+298,8
@@
public:
* @param[in] second Second mesh
* @param[in] optimize should we optimize vertex data
*/
* @param[in] second Second mesh
* @param[in] optimize should we optimize vertex data
*/
- void StitchMesh( Mesh
Data
& first,
- const Mesh
Data
& second,
+ void StitchMesh( Mesh
2D
& first,
+ const Mesh
2D
& second,
bool optimize = false );
/**
bool optimize = false );
/**
@@
-298,9
+310,9
@@
public:
* @param[in] optimize should we optimize vertex data
* @param[out] out resulting mesh
*/
* @param[in] optimize should we optimize vertex data
* @param[out] out resulting mesh
*/
- void StitchMesh( const Mesh
Data
& first,
- const Mesh
Data
& second,
- Mesh
Data
& out,
+ void StitchMesh( const Mesh
2D
& first,
+ const Mesh
2D
& second,
+ Mesh
2D
& out,
bool optimize = false );
/**
bool optimize = false );
/**
@@
-370,6
+382,15
@@
public:
*/
void GetMetrics( Metrics& metrics );
*/
void GetMetrics( Metrics& metrics );
+ /**
+ * @brief Get Material used by atlas
+ *
+ * @param atlas[in] atlas AtlasId
+ *
+ * @return Material used by atlas
+ */
+ Material GetMaterial( AtlasId atlas ) const;
+
private:
explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager *impl);
private:
explicit DALI_INTERNAL AtlasManager(Internal::AtlasManager *impl);