mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Merge pull request #672 from amc522/master
Fixing checks for nan in fmin/fmax #672
This commit is contained in:
commit
4e0c87683c
@ -146,8 +146,8 @@ namespace glm
|
||||
{
|
||||
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmin' only accept floating-point input");
|
||||
|
||||
if (isnan(y))
|
||||
return x;
|
||||
if (isnan(x))
|
||||
return y;
|
||||
if (isnan(y))
|
||||
return x;
|
||||
|
||||
@ -176,8 +176,8 @@ namespace glm
|
||||
{
|
||||
GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmax' only accept floating-point input");
|
||||
|
||||
if (isnan(y))
|
||||
return x;
|
||||
if (isnan(x))
|
||||
return y;
|
||||
if (isnan(y))
|
||||
return x;
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
#define GLM_ENABLE_EXPERIMENTAL
|
||||
|
||||
#include <glm/gtx/extended_min_max.hpp>
|
||||
#include <glm/gtc/vec1.hpp>
|
||||
#include <glm/gtc/epsilon.hpp>
|
||||
@ -18,6 +19,9 @@ namespace fmin_
|
||||
glm::vec1 A0 = glm::fmin(glm::vec1(1), glm::vec1(Zero_f / 0.0f));
|
||||
Error += glm::epsilonEqual(A0.x, 1.0f, glm::epsilon<float>()) ? 0 : 1;
|
||||
|
||||
glm::vec1 A1 = glm::fmin(glm::vec1(Zero_f / 0.0f), glm::vec1(1));
|
||||
Error += glm::epsilonEqual(A1.x, 1.0f, glm::epsilon<float>()) ? 0 : 1;
|
||||
|
||||
glm::vec2 B0 = glm::fmin(glm::vec2(1), glm::vec2(1));
|
||||
glm::vec2 B1 = glm::fmin(glm::vec2(1), 1.0f);
|
||||
bool B2 = glm::all(glm::equal(B0, B1));
|
||||
@ -47,6 +51,9 @@ namespace fmax_
|
||||
glm::vec1 A0 = glm::fmax(glm::vec1(1), glm::vec1(Zero_f / 0.0f));
|
||||
Error += glm::epsilonEqual(A0.x, 1.0f, glm::epsilon<float>()) ? 0 : 1;
|
||||
|
||||
glm::vec1 A1 = glm::fmax(glm::vec1(Zero_f / 0.0f), glm::vec1(1));
|
||||
Error += glm::epsilonEqual(A0.x, 1.0f, glm::epsilon<float>()) ? 0 : 1;
|
||||
|
||||
glm::vec2 B0 = glm::fmax(glm::vec2(1), glm::vec2(1));
|
||||
glm::vec2 B1 = glm::fmax(glm::vec2(1), 1.0f);
|
||||
bool B2 = glm::all(glm::equal(B0, B1));
|
||||
|
Loading…
Reference in New Issue
Block a user