From cf7eff7aab751fd1b599d967ee156c7ebb61cbbd Mon Sep 17 00:00:00 2001 From: Franklin Wei Date: Mon, 4 Feb 2019 18:16:49 -0500 Subject: Work on adding toroid --- quat.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'quat.cpp') diff --git a/quat.cpp b/quat.cpp index aa53af6..df117d0 100644 --- a/quat.cpp +++ b/quat.cpp @@ -1,9 +1,9 @@ #include "quat.h" #include -quat::quat(double w_, double x_, double y_, double z_) : w(w_), x(x_), y(y_), z(z_) { } -quat::quat(double x_, double y_, double z_) : w(0), x(x_), y(y_), z(z_) { } -quat::quat(double w_, vec3 vec) : w(w_), x(vec[0]), y(vec[1]), z(vec[2]) { } +quat::quat(scalar w_, scalar x_, scalar y_, scalar z_) : w(w_), x(x_), y(y_), z(z_) { } +quat::quat(scalar x_, scalar y_, scalar z_) : w(0), x(x_), y(y_), z(z_) { } +quat::quat(scalar w_, vec3 vec) : w(w_), x(vec[0]), y(vec[1]), z(vec[2]) { } quat::quat(vec3 vec) : w(0), x(vec[0]), y(vec[1]), z(vec[2]) { } quat::quat() : w(0), x(0), y(0), z(0) { } @@ -25,10 +25,10 @@ quat quat::conjugate() const return quat(this->w, -this->x, -this->y, -this->z); } -quat quat::from_angleaxis(double angle, vec3 axis) +quat quat::from_angleaxis(scalar angle, vec3 axis) { - double si = std::sin(angle / 2); - double co = std::cos(angle / 2); + scalar si = std::sin(angle / 2); + scalar co = std::cos(angle / 2); return quat(co, si * axis[0], si * axis[1], si * axis[2]); } -- cgit v1.1