mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-13 22:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source
This commit is contained in:
Christophe Riccio 2017-08-08 23:32:52 +02:00
parent 2cc0c53da7
commit 1bfc198625
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glm/gtx/matrix_decompose.inl
View File

@ -1,6 +1,9 @@
/// @ref gtx_matrix_decompose /// @ref gtx_matrix_decompose
/// @file glm/gtx/matrix_decompose.inl /// @file glm/gtx/matrix_decompose.inl
#include "../gtc/constants.hpp"
#include "../gtc/epsilon.hpp"
namespace glm{ namespace glm{
namespace detail namespace detail
{ {
@ -32,7 +35,7 @@ namespace detail
mat<4, 4, T, P> LocalMatrix(ModelMatrix); mat<4, 4, T, P> LocalMatrix(ModelMatrix);
// Normalize the matrix. // Normalize the matrix.
if(LocalMatrix[3][3] == static_cast<T>(0)) if(epsilonEqual(LocalMatrix[3][3], static_cast<T>(0), epsilon<T>()))
return false; return false;
for(length_t i = 0; i < 4; ++i) for(length_t i = 0; i < 4; ++i)
@ -48,11 +51,14 @@ namespace detail
PerspectiveMatrix[3][3] = static_cast<T>(1); PerspectiveMatrix[3][3] = static_cast<T>(1);
/// TODO: Fixme! /// TODO: Fixme!
if(determinant(PerspectiveMatrix) == static_cast<T>(0)) if(epsilonEqual(determinant(PerspectiveMatrix), static_cast<T>(0), epsilon<T>()))
return false; return false;
// First, isolate perspective. This is the messiest. // First, isolate perspective. This is the messiest.
if(LocalMatrix[0][3] != static_cast<T>(0) || LocalMatrix[1][3] != static_cast<T>(0) || LocalMatrix[2][3] != static_cast<T>(0)) if(
epsilonNotEqual(LocalMatrix[0][3], static_cast<T>(0), epsilon<T>()) ||
epsilonNotEqual(LocalMatrix[1][3], static_cast<T>(0), epsilon<T>()) ||
epsilonNotEqual(LocalMatrix[2][3], static_cast<T>(0), epsilon<T>()))
{ {
// rightHandSide is the right hand side of the equation. // rightHandSide is the right hand side of the equation.
vec<4, T, P> RightHandSide; vec<4, T, P> RightHandSide;
@ -88,8 +94,8 @@ namespace detail
// Now get scale and shear. // Now get scale and shear.
for(length_t i = 0; i < 3; ++i) for(length_t i = 0; i < 3; ++i)
for(int j = 0; j < 3; ++j) for(length_t j = 0; j < 3; ++j)
Row[i][j] = LocalMatrix[i][j]; Row[i][j] = LocalMatrix[i][j];
// Compute X scale factor and normalize first row. // Compute X scale factor and normalize first row.
Scale.x = length(Row[0]);// v3Length(Row[0]); Scale.x = length(Row[0]);// v3Length(Row[0]);

12
test/gtx/gtx_vector_angle.cpp
View File

@ -22,11 +22,11 @@ int test_orientedAngle_vec2()
int Error = 0; int Error = 0;
float AngleA = glm::orientedAngle(glm::vec2(1, 0), glm::normalize(glm::vec2(1, 1))); float AngleA = glm::orientedAngle(glm::vec2(1, 0), glm::normalize(glm::vec2(1, 1)));
Error += AngleA == glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleA, glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
float AngleB = glm::orientedAngle(glm::vec2(0, 1), glm::normalize(glm::vec2(1, 1))); float AngleB = glm::orientedAngle(glm::vec2(0, 1), glm::normalize(glm::vec2(1, 1)));
Error += AngleB == -glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleB, -glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
float AngleC = glm::orientedAngle(glm::normalize(glm::vec2(1, 1)), glm::vec2(0, 1)); float AngleC = glm::orientedAngle(glm::normalize(glm::vec2(1, 1)), glm::vec2(0, 1));
Error += AngleC == glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleC, glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
return Error; return Error;
} }
@ -36,11 +36,11 @@ int test_orientedAngle_vec3()
int Error = 0; int Error = 0;
float AngleA = glm::orientedAngle(glm::vec3(1, 0, 0), glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 0, 1)); float AngleA = glm::orientedAngle(glm::vec3(1, 0, 0), glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 0, 1));
Error += AngleA == glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleA, glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
float AngleB = glm::orientedAngle(glm::vec3(0, 1, 0), glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 0, 1)); float AngleB = glm::orientedAngle(glm::vec3(0, 1, 0), glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 0, 1));
Error += AngleB == -glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleB, -glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
float AngleC = glm::orientedAngle(glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 1, 0), glm::vec3(0, 0, 1)); float AngleC = glm::orientedAngle(glm::normalize(glm::vec3(1, 1, 0)), glm::vec3(0, 1, 0), glm::vec3(0, 0, 1));
Error += AngleC == glm::pi<float>() * 0.25f ? 0 : 1; Error += glm::epsilonEqual(AngleC, glm::pi<float>() * 0.25f, 0.01f) ? 0 : 1;
return Error; return Error;
} }