From e81a9c4baa620f5addf4515d491c85c7a6480cda Mon Sep 17 00:00:00 2001 From: Sergey Krivohatskiy Date: Tue, 23 Mar 2021 15:03:38 +0300 Subject: [PATCH] compilation fixes Signed-off-by: Sergey Krivohatskiy --- test/gtx/gtx_matrix_interpolation.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/gtx/gtx_matrix_interpolation.cpp b/test/gtx/gtx_matrix_interpolation.cpp index 4e51dd19..4ff1de8a 100644 --- a/test/gtx/gtx_matrix_interpolation.cpp +++ b/test/gtx/gtx_matrix_interpolation.cpp @@ -38,19 +38,19 @@ static int test_axisAngle() } template -int testForAxisAngle(glm::tvec3 const axisTrue, T const angleTrue) +int testForAxisAngle(glm::vec<3, T, glm::defaultp> const axisTrue, T const angleTrue) { T const eps = sqrt(std::numeric_limits::epsilon()); - glm::tmat4x4 const matTrue = glm::axisAngleMatrix(axisTrue, angleTrue); + glm::mat<4, 4, T, glm::defaultp> const matTrue = glm::axisAngleMatrix(axisTrue, angleTrue); - glm::tvec3 axis; + glm::vec<3, T, glm::defaultp> axis; T angle; glm::axisAngle(matTrue, axis, angle); - glm::tmat4x4 const matRebuilt = glm::axisAngleMatrix(axis, angle); + glm::mat<4, 4, T, glm::defaultp> const matRebuilt = glm::axisAngleMatrix(axis, angle); - glm::tmat4x4 const errMat = matTrue - matRebuilt; - T const maxErr = glm::compMax(glm::tvec4( + glm::mat<4, 4, T, glm::defaultp> const errMat = matTrue - matRebuilt; + T const maxErr = glm::compMax(glm::vec<4, T, glm::defaultp>( glm::compMax(glm::abs(errMat[0])), glm::compMax(glm::abs(errMat[1])), glm::compMax(glm::abs(errMat[2])),