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: 708af231e00f2eee51399e85500e8a83abd7265c [formerly 46e71c1287c3b5973d82bc02a01e0d9bbe9c0cdb] [formerly 8f85fcb79568c56d0ee737998ef3e8daf98862d4 [formerly 0fce7b10282e33d4adb213611599fae0b12cfd1e]]
Former-commit-id: 48616ce4780e414c1d6c9abf062730294820120a [formerly 3c69f25821f27333b1eed6d0a26cbde7ec4d9bf6]
Former-commit-id: 9ce4ab829f6ea6d9a4a6af39c0b49ec6dfc3c7e2
This commit is contained in:
Lynix 2016-09-03 21:13:09 +02:00
parent 627444bea8 9e3a7626fc
commit fea67d6740
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;