-#ifndef __DALI_TOOLKIT_IMAGE_ATLAS_MANAGER_H__
-#define __DALI_TOOLKIT_IMAGE_ATLAS_MANAGER_H__
+#ifndef DALI_TOOLKIT_IMAGE_ATLAS_MANAGER_H
+#define DALI_TOOLKIT_IMAGE_ATLAS_MANAGER_H
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
#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/public-api/rendering/texture-set.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/image-atlas/image-atlas.h>
{
/**
- * The manager for automatic image atlasing. Owned by RendererFactory
+ * The manager for automatic image atlasing. Owned by VisualFactory
*/
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.
* @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 The material containing the image.
+ * @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,
*
* @param [out] textureRect The texture area of the resource image in the atlas.
* @param [in] pixelData The pixel data.
- * @return The material containing the image.
+ * @return The texture set containing the image.
*/
- Material Add( Vector4& textureRect,
- PixelDataPtr pixelData );
+ TextureSet Add( Vector4& textureRect,
+ PixelData pixelData );
/**
- * Remove the image at the given rectangle from the material.
+ * Remove the image at the given rectangle from the texture set.
*
- * @param [in] material The material containing the atlas image.
+ * @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.
*/
void SetBrokenImage( const std::string& brokenImageUrl );
+ /**
+ * @brief Get shader
+ */
+ Shader GetShader() const;
+
private:
/**
private:
AtlasContainer mAtlasList;
- MaterialContainer mMaterialList;
- Shader mShader;
- std::string mTextureUniformName;
+ TextureSetContainer mTextureSetList;
std::string mBrokenImageUrl;
};
} // namespace Dali
-#endif // __DALI_TOOLKIT_ATLAS_MANAGER_H__
+#endif // DALI_TOOLKIT_ATLAS_MANAGER_H