From 40b610297730e939e9a9249d98f3035e77300e41 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Wed, 5 Apr 2023 08:51:24 +0200 Subject: [PATCH] Utility/Node: Add a constructor taking translation/rotation/scale --- include/Nazara/Utility/Components/NodeComponent.hpp | 2 +- include/Nazara/Utility/Node.hpp | 2 +- include/Nazara/Utility/Node.inl | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/Nazara/Utility/Components/NodeComponent.hpp b/include/Nazara/Utility/Components/NodeComponent.hpp index 0c93a12e2..64061bf84 100644 --- a/include/Nazara/Utility/Components/NodeComponent.hpp +++ b/include/Nazara/Utility/Components/NodeComponent.hpp @@ -16,7 +16,7 @@ namespace Nz class NAZARA_UTILITY_API NodeComponent : public Node { public: - NodeComponent() = default; + using Node::Node; NodeComponent(const NodeComponent&) = default; NodeComponent(NodeComponent&&) noexcept = default; ~NodeComponent() = default; diff --git a/include/Nazara/Utility/Node.hpp b/include/Nazara/Utility/Node.hpp index 7d6969fbe..964ee74d8 100644 --- a/include/Nazara/Utility/Node.hpp +++ b/include/Nazara/Utility/Node.hpp @@ -24,7 +24,7 @@ namespace Nz public: enum class Invalidation; - inline Node(); + inline Node(const Vector3f& translation = Vector3f::Zero(), const Quaternionf& rotation = Quaternionf::Identity(), const Vector3f& scale = Vector3f::Unit()); inline Node(const Node& node); inline Node(Node&& node) noexcept; virtual ~Node(); diff --git a/include/Nazara/Utility/Node.inl b/include/Nazara/Utility/Node.inl index 8bc79c48e..23d49f9cc 100644 --- a/include/Nazara/Utility/Node.inl +++ b/include/Nazara/Utility/Node.inl @@ -9,13 +9,13 @@ namespace Nz { - inline Node::Node() : + inline Node::Node(const Vector3f& translation, const Quaternionf& rotation, const Vector3f& scale) : m_initialRotation(Quaternionf::Identity()), - m_rotation(Quaternionf::Identity()), + m_rotation(rotation), m_initialPosition(Vector3f::Zero()), m_initialScale(Vector3f(1.f, 1.f, 1.f)), - m_position(Vector3f::Zero()), - m_scale(Vector3f(1.f, 1.f, 1.f)), + m_position(translation), + m_scale(scale), m_parent(nullptr), m_derivedUpdated(false), m_inheritPosition(true),