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: 6d03384a0686ebca2f801b89dba88997389d4890 [formerly 689dc220ce6c35424b11ad63ce4fb987e3f76dfe] [formerly a089561e19b168dd425b701e233f9ebdd2db8836 [formerly ff7b70e8542a9a8c782e2e7cf8fca153492f7a81]]
Former-commit-id: 65a0c2feedf6f2139699579443d8fc917dc6bdb2 [formerly bc01bcd1258a631e60c287b8afb8cb1166d879d8]
Former-commit-id: 7fed4c8ca92e761c29f90f25d26a62ab0fd8485b
This commit is contained in:
Lynix 2016-09-03 21:13:09 +02:00
parent 88615eae85 8a9ec2883a
commit fc231a70fe
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;