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

Graphics/Sprite: Fix origin not being initialized/copied 

Former-commit-id: 790b49278d8cf7c1800f559cf0d29d65d0834b08 [formerly 93b247cc3433a5ac7c0f5a5ef48b0cf7a0c0f9dc] [formerly 9d6210ac2449aa5dc0d74d9a3cb256480e095008 [formerly 4ccda8249177b9ba5daa5406fd57f17b483cd81c]]
Former-commit-id: 22dcc8245a3ec0774c1723f88682c585a43ff3c7 [formerly 94bbee0ec1e3fb904d83258da52b8f90634f4c8a]
Former-commit-id: a8326b7bec2c16837b1340de8edd5c731ec837ec
This commit is contained in:
Lynix 2016-09-01 21:07:08 +02:00
parent 60ac889640
commit 9e3a7626fc
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,9 +14,9 @@ namespace Nz
inline Sprite::Sprite() : inline Sprite::Sprite() :
m_color(Color::White), m_color(Color::White),
m_origin(Nz::Vector3f::Zero()),
m_textureCoords(0.f, 0.f, 1.f, 1.f), m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f) m_size(64.f, 64.f),
m_origin(Nz::Vector3f::Zero())
{ {
SetDefaultMaterial(); SetDefaultMaterial();
} }
@ -26,11 +26,8 @@ namespace Nz
* *
* \param material Reference to a material * \param material Reference to a material
*/ */
inline Sprite::Sprite(MaterialRef material) : inline Sprite::Sprite(MaterialRef material) :
m_color(Color::White), Sprite()
m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f)
{ {
SetMaterial(std::move(material), true); SetMaterial(std::move(material), true);
} }
@ -42,9 +39,7 @@ namespace Nz
*/ */
inline Sprite::Sprite(Texture* texture) : inline Sprite::Sprite(Texture* texture) :
m_color(Color::White), Sprite()
m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f)
{ {
SetTexture(texture, true); SetTexture(texture, true);
} }
@ -60,7 +55,8 @@ namespace Nz
m_color(sprite.m_color), m_color(sprite.m_color),
m_material(sprite.m_material), m_material(sprite.m_material),
m_textureCoords(sprite.m_textureCoords), m_textureCoords(sprite.m_textureCoords),
m_size(sprite.m_size) m_size(sprite.m_size),
m_origin(sprite.m_origin)
{ {
} }
@ -270,6 +266,7 @@ namespace Nz
m_color = sprite.m_color; m_color = sprite.m_color;
m_material = sprite.m_material; m_material = sprite.m_material;
m_origin = sprite.m_origin;
m_textureCoords = sprite.m_textureCoords; m_textureCoords = sprite.m_textureCoords;
m_size = sprite.m_size; m_size = sprite.m_size;