From e282b842b4bdf8ca074fbc737828221441107063 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 22 Dec 2019 17:01:05 +0100 Subject: [PATCH] Add Node::SetScale(Vector2) to prevent a bug --- include/Nazara/Utility/Node.hpp | 1 + src/Nazara/Utility/Node.cpp | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/Nazara/Utility/Node.hpp b/include/Nazara/Utility/Node.hpp index da36997ec..df931a7ba 100644 --- a/include/Nazara/Utility/Node.hpp +++ b/include/Nazara/Utility/Node.hpp @@ -75,6 +75,7 @@ namespace Nz void SetPosition(const Vector3f& translation, CoordSys coordSys = CoordSys_Local); void SetPosition(float translationX, float translationY, float translationZ = 0.f, CoordSys coordSys = CoordSys_Local); void SetRotation(const Quaternionf& quat, CoordSys coordSys = CoordSys_Local); + void SetScale(const Vector2f& scale, CoordSys coordSys = CoordSys_Local); void SetScale(const Vector3f& scale, CoordSys coordSys = CoordSys_Local); void SetScale(float scale, CoordSys coordSys = CoordSys_Local); void SetScale(float scaleX, float scaleY, float scaleZ = 1.f, CoordSys coordSys = CoordSys_Local); diff --git a/src/Nazara/Utility/Node.cpp b/src/Nazara/Utility/Node.cpp index a302300c6..e18e81244 100644 --- a/src/Nazara/Utility/Node.cpp +++ b/src/Nazara/Utility/Node.cpp @@ -530,6 +530,12 @@ namespace Nz InvalidateNode(); } + void Node::SetScale(const Vector2f& scale, CoordSys coordSys) + { + // Prevent Z scale at zero (can happen when using SetScale with a Vec2) + SetScale(scale.x, scale.y, 1.f, coordSys); + } + void Node::SetScale(const Vector3f& scale, CoordSys coordSys) { switch (coordSys)