-#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) 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 <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
{
{
Vector2 mPosition; ///< Vertex posiiton
Vector2 mTexCoords; ///< Vertex texture co-ordinates
+ Vector4 mColor; ///< Vertex color
};
struct Mesh2D
{
Vector< Vertex2D > mVertices; ///< container of vertices
- Vector< SizeType > mIndices; ///< container of indices
+ Vector< unsigned short > mIndices; ///< container of indices
};
/**
* 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
*/
- bool Add( const BufferImage& image,
+ bool Add( const PixelData& image,
AtlasSlot& slot,
AtlasId atlas = 0 );
*
* @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
*
* @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
void GetMetrics( Metrics& metrics );
/**
- * @brief Get Material used by atlas
+ * @brief Get TextureSet used by atlas
*
* @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] material The Material to assign
+ * @param[in] textureSet The texture set to assign
*/
- void SetMaterial( AtlasId atlas, Material& material );
+ void SetTextures( AtlasId atlas, TextureSet& textureSet );
private:
} // namespace Dali
-#endif // __DALI_TOOLKIT_ATLAS_MANAGER_H__
+#endif // DALI_TOOLKIT_ATLAS_MANAGER_H