Graphics/Sprite: Allows to set sprite corner color

Former-commit-id: 0b892e363a4fbb18c729d289f543403d897b03c0 [formerly 28fcd5a7269c63b1f8c4c8c80c82e5dce9e17d1b] [formerly f8022fe7d864a6c1773c4e19843d7fc46590d328 [formerly 33fbfb6cd1700a3e05bc82875546cd57cfe6f6aa]]
Former-commit-id: 3ef8f144f07c0cf7666b59cdcc135fc74348caf9 [formerly 8bae7631b9aaf2565ec52d68f9c0c1a7a81dc69f]
Former-commit-id: 6eba237772ab4773180e3a86e9fe4f9b6b8e348d
This commit is contained in:
Lynix
2016-09-07 13:04:58 +02:00
parent fb64f052dc
commit 7c3d9c563c
3 changed files with 60 additions and 11 deletions

View File

@@ -37,12 +37,14 @@ namespace Nz
void AddToRenderQueue(AbstractRenderQueue* renderQueue, const InstanceData& instanceData) const override;
inline const Color& GetColor() const;
inline const Color& GetCornerColor(RectCorner corner) const;
inline const MaterialRef& GetMaterial() const;
inline const Vector3f& GetOrigin() const;
inline const Vector2f& GetSize() const;
inline const Rectf& GetTextureCoords() const;
inline void SetColor(const Color& color);
inline void SetCornerColor(RectCorner corner, const Color& color);
inline void SetDefaultMaterial();
inline void SetMaterial(MaterialRef material, bool resizeSprite = true);
inline void SetOrigin(const Vector3f& origin);
@@ -65,6 +67,7 @@ namespace Nz
static bool Initialize();
static void Uninitialize();
std::array<Color, 4> m_cornerColor;
Color m_color;
MaterialRef m_material;
Rectf m_textureCoords;

View File

@@ -18,6 +18,9 @@ namespace Nz
m_size(64.f, 64.f),
m_origin(Nz::Vector3f::Zero())
{
for (Color& color : m_cornerColor)
color = Color::White;
SetDefaultMaterial();
}
@@ -62,14 +65,35 @@ namespace Nz
/*!
* \brief Gets the color of the sprite
*
* This is the global color of the sprite, independent from corner colors
*
* \return Current color
*
* \see GetCornerColor
* \see SetColor
*/
inline const Color& Sprite::GetColor() const
{
return m_color;
}
/*!
* \brief Gets the color setup on a corner of the sprite
*
* \return Current color
*
* \param corner Corner of the sprite to query
*
* \see SetCornerColor
*/
inline const Color& Sprite::GetCornerColor(RectCorner corner) const
{
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner");
return m_cornerColor[corner];
}
/*!
* \brief Gets the material of the sprite
* \return Current material
@@ -86,7 +110,7 @@ namespace Nz
*
* \see SetOrigin
*/
inline const Vector3f & Sprite::GetOrigin() const
inline const Vector3f& Sprite::GetOrigin() const
{
return m_origin;
}
@@ -105,18 +129,21 @@ namespace Nz
* \brief Gets the texture coordinates of the sprite
* \return Current texture coordinates
*/
inline const Rectf& Sprite::GetTextureCoords() const
{
return m_textureCoords;
}
/*!
* \brief Sets the color of the billboard
* \brief Sets the global color of the sprite
*
* \param color Color for the billboard
* This is independent from the corner color of the sprite
*
* \param color Color for the sprite
*
* \see GetColor
* \see SetCornerColor
*/
inline void Sprite::SetColor(const Color& color)
{
m_color = color;
@@ -124,6 +151,26 @@ namespace Nz
InvalidateVertices();
}
/*!
* \brief Sets a color for a corner of the sprite
*
* This is independent from the sprite global color, which gets multiplied by the corner color when rendering the sprite.
*
* \param corner Corner of the sprite to set
* \param color Color for the sprite
*
* \see GetCornerColor
* \see SetColor
*/
inline void Sprite::SetCornerColor(RectCorner corner, const Color& color)
{
NazaraAssert(corner < m_cornerColor.size(), "Invalid corner");
m_cornerColor[corner] = color;
InvalidateVertices();
}
/*!
* \brief Sets the default material of the sprite (just default material)
*/