Merge branch 'devel/new_mesh' into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / atlas-manager / atlas-manager.cpp

diff --git a/dali-toolkit/internal/atlas-manager/atlas-manager.cpp b/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
index e46eb1d..e6b041c 100644 (file)
--- a/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
+++ b/dali-toolkit/internal/atlas-manager/atlas-manager.cpp
@@ -69,23 +69,25 @@ bool AtlasManager::Remove( ImageId id )
 
 void AtlasManager::GenerateMeshData( ImageId id,
                                      const Vector2& position,
-                                     MeshData& meshData)
+                                     Mesh2D& mesh,
+                                     bool addReference )
 {
   GetImplementation(*this).GenerateMeshData( id,
                                              position,
-                                             meshData );
+                                             mesh,
+                                             addReference );
 }
 
-void AtlasManager::StitchMesh( MeshData& first,
-                               const MeshData& second,
+void AtlasManager::StitchMesh( Mesh2D& first,
+                               const Mesh2D& second,
                                bool optimize )
 {
   GetImplementation(*this).StitchMesh( first, second, optimize );
 }
 
-void AtlasManager::StitchMesh( const MeshData& first,
-                               const MeshData& second,
-                               MeshData& out,
+void AtlasManager::StitchMesh( const Mesh2D& first,
+                               const Mesh2D& second,
+                               Mesh2D& out,
                                bool optimize )
 {
   GetImplementation(*this).StitchMesh( first, second, out, optimize );
@@ -128,7 +130,17 @@ Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas )
 
 void AtlasManager::GetMetrics( Metrics& metrics )
 {
-  return GetImplementation(*this).GetMetrics( metrics );
+  GetImplementation(*this).GetMetrics( metrics );
+}
+
+Material AtlasManager::GetMaterial( AtlasId atlas ) const
+{
+  return GetImplementation(*this).GetMaterial( atlas );
+}
+
+Sampler AtlasManager::GetSampler( AtlasId atlas ) const
+{
+  return GetImplementation(*this).GetSampler( atlas );
 }
 
 } // namespace Toolkit