From 5b6a6f3b241fea6d19521ddbb705e27d5e4c0268 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 20 Oct 2024 16:24:14 +0100 Subject: Move lots of maths helpers to inline, constexpr, templates Always for working with different dimensions/types --- assetFactory/mutation.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'assetFactory/mutation.cpp') diff --git a/assetFactory/mutation.cpp b/assetFactory/mutation.cpp index 6695dff..2ab2a76 100644 --- a/assetFactory/mutation.cpp +++ b/assetFactory/mutation.cpp @@ -1,12 +1,11 @@ #include "mutation.h" -#include #include #include Mutation::Matrix Mutation::getMatrix() const { - return glm::translate(glm::identity(), position) * rotate_ypr(rotation) + return glm::translate(glm::identity(), position) * rotate_ypr<4>(rotation) * glm::scale(glm::identity(), scale); } @@ -19,7 +18,7 @@ Mutation::getDeformationMatrix() const Mutation::Matrix Mutation::getLocationMatrix() const { - return glm::translate(glm::identity(), position) * rotate_ypr(rotation); + return glm::translate(glm::identity(), position) * rotate_ypr<4>(rotation); } bool -- cgit v1.2.3