Rendering API clean-up

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / image-atlas-manager.h

diff --git a/dali-toolkit/internal/controls/renderers/image-atlas-manager.h b/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
index b0729dd..e191351 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
+++ b/dali-toolkit/internal/controls/renderers/image-atlas-manager.h
@@ -21,7 +21,7 @@
 #include <string>
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/ref-object.h>
-#include <dali/devel-api/rendering/material.h>
+#include <dali/devel-api/rendering/texture-set.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/devel-api/image-atlas/image-atlas.h>
@@ -42,17 +42,15 @@ class ImageAtlasManager : public RefObject
 {
 public:
   typedef std::vector< Toolkit::ImageAtlas > AtlasContainer;
-  typedef std::vector< Material > MaterialContainer;
+  typedef std::vector< TextureSet > TextureSetContainer;
 
 public:
 
   /**
    * Construtor
    *
-   * @param[in] shader The shader for material.
-   * @param[in] textureUniformName The texture uniform name for the atlas image.
    */
-  ImageAtlasManager( Shader shader, const std::string& textureUniformName );
+  ImageAtlasManager();
 
   /**
    * @brief Add an image to the atlas.
@@ -67,21 +65,31 @@ public:
    * @param [in] size The width and height to fit the loaded image to.
    * @param [in] fittingMode The method used to fit the shape of the image before loading to the shape defined by the size parameter.
    * @param [in] orientationCorrection Reorient the image to respect any orientation metadata in its header.
-   * @return True if there is enough space to fit this image in,false otherwise.
+   * @return The texture set containing the image.
    */
-  Material Add( Vector4& textureRect,
+  TextureSet Add( Vector4& textureRect,
                 const std::string& url,
                 ImageDimensions size = ImageDimensions(),
                 FittingMode::Type fittingMode = FittingMode::DEFAULT,
                 bool orientationCorrection = true );
 
   /**
-   * Remove the image at the given rectangle from the material.
+   * @brief Add a pixel buffer to the atlas
    *
-   * @param [in] material The material containing the atlas image.
+   * @param [out] textureRect The texture area of the resource image in the atlas.
+   * @param [in] pixelData The pixel data.
+   * @return The texture set containing the image.
+   */
+  TextureSet Add( Vector4& textureRect,
+                PixelDataPtr pixelData );
+
+  /**
+   * Remove the image at the given rectangle from the texture set.
+   *
+   * @param [in] textureSet The texture set containing the atlas image.
    * @param [in] textureRect The texture area to be removed.
    */
-  void Remove( Material material, const Vector4& textureRect );
+  void Remove( TextureSet textureSet, const Vector4& textureRect );
 
   /**
    * @brief Set the broken image which is used to replace the image if loading fails.
@@ -90,6 +98,20 @@ public:
    */
   void SetBrokenImage( const std::string& brokenImageUrl );
 
+  /**
+   * @brief Get shader
+   */
+  Shader GetShader() const;
+
+private:
+
+  /**
+   * @brief Create a new atlas.
+   *
+   * This method is called when the newly added image or pixel buffer cannot fit into the current atlas list.
+   */
+  void CreateNewAtlas();
+
 protected:
 
   /**
@@ -111,9 +133,7 @@ protected:
 private:
 
   AtlasContainer    mAtlasList;
-  MaterialContainer mMaterialList;
-  Shader            mShader;
-  std::string       mTextureUniformName;
+  TextureSetContainer mTextureSetList;
   std::string       mBrokenImageUrl;
 
 };