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

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine 

Former-commit-id: afd304d63ca67e70f89a063f4a405a74a17066d3 [formerly 503ccb17483a1c6f1d185a2f78803d62df5e2d7c] [formerly eb274e933fbf9ae4691dc8edd1c1fdd22ead3ba5 [formerly 9333ca813e0998e35361bfcb6c30f858d9fc4dcd]]
Former-commit-id: de79d5619edf5b7c4c50a8b94ecbb5c5abcd386c [formerly a2439ceaf22c1c6534e454ada9b2000f3fa495df]
Former-commit-id: dcb4f491304c24dad3c75cc1feac3802912a548f
This commit is contained in:
Lynix 2016-09-03 21:13:09 +02:00
parent a311ff4cf1 cfba75812d
commit 549f22ddc2
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() :
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)
m_size(64.f, 64.f),
m_origin(Nz::Vector3f::Zero())
{
SetDefaultMaterial();
}
@ -26,11 +26,8 @@ namespace Nz
*
* \param material Reference to a material
*/
inline Sprite::Sprite(MaterialRef material) :
m_color(Color::White),
m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f)
Sprite()
{
SetMaterial(std::move(material), true);
}
@ -42,9 +39,7 @@ namespace Nz
*/
inline Sprite::Sprite(Texture* texture) :
m_color(Color::White),
m_textureCoords(0.f, 0.f, 1.f, 1.f),
m_size(64.f, 64.f)
Sprite()
{
SetTexture(texture, true);
}
@ -60,7 +55,8 @@ namespace Nz
m_color(sprite.m_color),
m_material(sprite.m_material),
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_material = sprite.m_material;
m_origin = sprite.m_origin;
m_textureCoords = sprite.m_textureCoords;
m_size = sprite.m_size;