sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Graphics/Sprite: Allows to set sprite corner color 

Former-commit-id: 66ca16acbb25da23a8a85b77d1bd4c4ca412e82f [formerly d4f67e512d1e7edd31c049045cc9069a8926d794] [formerly 7b9ca802280f114492d4e1aaa068c241802f3c25 [formerly 068f737047936c99b79057674bd453a54fe44960]]
Former-commit-id: e92d6bb1bd4668a2f94f0311f887f38c00544277 [formerly da0e5d605a0b9197a767e48d8a5dbd94dd83872b]
Former-commit-id: a4ce87c4974513dbe3890ac3f316ed14b74919eb
This commit is contained in:
Lynix 2016-09-07 13:04:58 +02:00
parent fda4877d1a
commit 614c1556ef
3 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Graphics/Sprite.hpp
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;

59
include/Nazara/Graphics/Sprite.inl
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)
*/

9
src/Nazara/Graphics/Sprite.cpp
View File

@ -49,7 +49,6 @@ namespace Nz
*
* \param instanceData Data of the instance
*/
void Sprite::UpdateData(InstanceData* instanceData) const
{
instanceData->data.resize(4 * sizeof(VertexStruct_XYZ_Color_UV));
@ -61,19 +60,19 @@ namespace Nz
Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
*colorPtr++ = m_color;
*colorPtr++ = m_color * m_cornerColor[RectCorner_LeftTop];
*posPtr++ = instanceData->transformMatrix.Transform(Vector3f(-origin));
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop);
*colorPtr++ = m_color;
*colorPtr++ = m_color * m_cornerColor[RectCorner_RightTop];
*posPtr++ = instanceData->transformMatrix.Transform(m_size.x*Vector3f::Right() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop);
*colorPtr++ = m_color;
*colorPtr++ = m_color * m_cornerColor[RectCorner_LeftBottom];
*posPtr++ = instanceData->transformMatrix.Transform(m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom);
*colorPtr++ = m_color;
*colorPtr++ = m_color * m_cornerColor[RectCorner_RightBottom];
*posPtr++ = instanceData->transformMatrix.Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom);
}