From 44a8c553fb70cc24583151fd30cc9d745d205a2a Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Thu, 21 Dec 2023 16:16:01 +0100 Subject: [PATCH] AxisAngle use Vector3 instead of Vector --- src/lib/matrix/matrix/AxisAngle.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lib/matrix/matrix/AxisAngle.hpp b/src/lib/matrix/matrix/AxisAngle.hpp index 01d5f517ab..5cf351a3ef 100644 --- a/src/lib/matrix/matrix/AxisAngle.hpp +++ b/src/lib/matrix/matrix/AxisAngle.hpp @@ -24,7 +24,7 @@ class Quaternion; * described by this class. */ template -class AxisAngle : public Vector +class AxisAngle : public Vector3 { public: using Matrix31 = Matrix; @@ -35,7 +35,7 @@ public: * @param data_ array */ explicit AxisAngle(const Type data_[3]) : - Vector(data_) + Vector3(data_) { } @@ -50,7 +50,7 @@ public: * @param other Matrix31 to copy */ AxisAngle(const Matrix31 &other) : - Vector(other) + Vector3(other) { } @@ -130,7 +130,7 @@ public: { AxisAngle &v = *this; // make sure axis is a unit vector - Vector a = axis_; + Vector3 a = axis_; a = a.unit(); v(0) = a(0) * angle_; v(1) = a(1) * angle_; @@ -138,10 +138,10 @@ public: } - Vector axis() + Vector3 axis() { - if (Vector::norm() > 0) { - return Vector::unit(); + if (Vector3::norm() > 0) { + return Vector3::unit(); } else { return Vector3(1, 0, 0); @@ -150,7 +150,7 @@ public: Type angle() { - return Vector::norm(); + return Vector3::norm(); } };