From c144435d4a6be31424d59914026118657e98c00c Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 2 Feb 2023 13:24:22 +0100 Subject: [PATCH] Graphics: Set default sprites size to the base color texture size, if any --- src/Nazara/Graphics/LinearSlicedSprite.cpp | 6 ++++-- src/Nazara/Graphics/SlicedSprite.cpp | 4 ++-- src/Nazara/Graphics/Sprite.cpp | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Nazara/Graphics/LinearSlicedSprite.cpp b/src/Nazara/Graphics/LinearSlicedSprite.cpp index 27852631e..a2bbfaa78 100644 --- a/src/Nazara/Graphics/LinearSlicedSprite.cpp +++ b/src/Nazara/Graphics/LinearSlicedSprite.cpp @@ -18,9 +18,11 @@ namespace Nz m_color(Color::White()), m_orientation(orientation), m_textureCoords(0.f, 0.f, 1.f, 1.f), - m_origin(0.f, 0.f), - m_size(64.f) + m_origin(0.f, 0.f) { + Vector2ui size = Vector2ui(GetTextureSize()); + m_size = (orientation == Orientation::Horizontal) ? size.x : size.y; + UpdateVertices(); } diff --git a/src/Nazara/Graphics/SlicedSprite.cpp b/src/Nazara/Graphics/SlicedSprite.cpp index 896767636..90cc54691 100644 --- a/src/Nazara/Graphics/SlicedSprite.cpp +++ b/src/Nazara/Graphics/SlicedSprite.cpp @@ -15,9 +15,9 @@ namespace Nz m_material(std::move(material)), m_color(Color::White()), m_textureCoords(0.f, 0.f, 1.f, 1.f), - m_origin(0.f, 0.f), - m_size(64.f, 64.f) + m_origin(0.f, 0.f) { + m_size = Vector2f(Vector2ui(GetTextureSize())); UpdateVertices(); } diff --git a/src/Nazara/Graphics/Sprite.cpp b/src/Nazara/Graphics/Sprite.cpp index cdc2d7746..ecf5c2de2 100644 --- a/src/Nazara/Graphics/Sprite.cpp +++ b/src/Nazara/Graphics/Sprite.cpp @@ -16,10 +16,10 @@ namespace Nz m_material(std::move(material)), m_color(Color::White()), m_textureCoords(0.f, 0.f, 1.f, 1.f), - m_origin(0.f, 0.f), - m_size(64.f, 64.f) + m_origin(0.f, 0.f) { m_cornerColor.fill(Color::White()); + m_size = Vector2f(Vector2ui(GetTextureSize())); UpdateVertices(); }