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

Graphics/Sprite: Add Origin parameter 

Allows you to change center of translation/rotation/scale


Former-commit-id: f3ce3d4f8350738f8ddca2e157282b70a982b5ef [formerly b3c9dff5ec52ee320e68c032817caef84862c059] [formerly 0dd589e277f5d625f2c52d9195e812d940e2a4e0 [formerly 06491fb509c1e8a49acb8628c82e60a8ca71db84]]
Former-commit-id: 811657fd21f956a06906796be7986d8ddc37023c [formerly 7d6a08ef01b05140f6aed6f3f65b2ec5837fa28e]
Former-commit-id: af0ee4137a64a0cd4986cfc29854aced0698bde0
This commit is contained in:
Lynix 2016-08-31 20:53:27 +02:00
parent a4934ae855
commit 60ac889640
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Nazara/Graphics/Sprite.hpp
View File

@ -38,12 +38,14 @@ namespace Nz
inline const Color& GetColor() 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 SetDefaultMaterial();
inline void SetMaterial(MaterialRef material, bool resizeSprite = true);
inline void SetOrigin(const Vector3f& origin);
inline void SetSize(const Vector2f& size);
inline void SetSize(float sizeX, float sizeY);
inline void SetTexture(TextureRef texture, bool resizeSprite = true);
@ -67,6 +69,7 @@ namespace Nz
MaterialRef m_material;
Rectf m_textureCoords;
Vector2f m_size;
Vector3f m_origin;
static SpriteLibrary::LibraryMap s_library;
};

33
include/Nazara/Graphics/Sprite.inl
View File

@ -14,6 +14,7 @@ namespace Nz
inline Sprite::Sprite() :
m_color(Color::White),
m_origin(Nz::Vector3f::Zero()),
m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f)
{
@ -77,12 +78,23 @@ namespace Nz
* \brief Gets the material of the sprite
* \return Current material
*/
inline const MaterialRef& Sprite::GetMaterial() const
{
return m_material;
}
/*!
* \brief Gets the origin of the sprite
*
* \return Current material
*
* \see SetOrigin
*/
inline const Vector3f & Sprite::GetOrigin() const
{
return m_origin;
}
/*!
* \brief Gets the size of the sprite
* \return Current size
@ -146,6 +158,24 @@ namespace Nz
}
}
/*!
* \brief Sets the origin of the sprite
*
* The origin is the center of translation/rotation/scaling of the sprite.
*
* \param origin New origin for the sprite
*
* \see GetOrigin
*/
inline void Sprite::SetOrigin(const Vector3f& origin)
{
m_origin = origin;
// On invalide la bounding box
InvalidateBoundingVolume();
InvalidateVertices();
}
/*!
* \brief Sets the size of the sprite
*
@ -277,3 +307,4 @@ namespace Nz
}
#include <Nazara/Renderer/DebugOff.hpp>
#include "Sprite.hpp"

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

@ -39,7 +39,9 @@ namespace Nz
void Sprite::MakeBoundingVolume() const
{
m_boundingVolume.Set(Vector3f(0.f), m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down());
Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
m_boundingVolume.Set(-origin, m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
}
/*!
@ -57,20 +59,22 @@ namespace Nz
SparsePtr<Vector3f> posPtr(&vertices[0].position, sizeof(VertexStruct_XYZ_Color_UV));
SparsePtr<Vector2f> texCoordPtr(&vertices[0].uv, sizeof(VertexStruct_XYZ_Color_UV));
Vector3f origin(m_origin.x, -m_origin.y, m_origin.z);
*colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(0.f));
*posPtr++ = instanceData->transformMatrix->Transform(Vector3f(-origin));
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftTop);
*colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right());
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightTop);
*colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down());
*posPtr++ = instanceData->transformMatrix->Transform(m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_LeftBottom);
*colorPtr++ = m_color;
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down());
*posPtr++ = instanceData->transformMatrix->Transform(m_size.x*Vector3f::Right() + m_size.y*Vector3f::Down() - origin);
*texCoordPtr++ = m_textureCoords.GetCorner(RectCorner_RightBottom);
}