organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-05 21:45:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge pull request #808 from tigert1998/master

Browse source 
Modify glm::refract's behaviour, allow any refraction index and prevert NaN generation #808
This commit is contained in:
Christophe 2018-08-28 12:49:06 +02:00 • committed by GitHub
commit b52c256622
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
glm/detail/func_geometric.inl
View file

@ -114,11 +114,10 @@ namespace detail
{
GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, T, Q> const& I, vec<L, T, Q> const& N, T eta)
{
assert(eta >= static_cast<T>(-1) && eta <= static_cast<T>(1));
T const dotValue(dot(N, I));
T const k(static_cast<T>(1) - eta * eta * (static_cast<T>(1) - dotValue * dotValue));
vec<L, T, Q> const Result = (eta * I - (eta * dotValue + std::sqrt(k)) * N) * static_cast<T>(k >= static_cast<T>(0));
vec<L, T, Q> const Result =
(k >= static_cast<T>(0)) ? (eta * I - (eta * dotValue + std::sqrt(k)) * N) : vec<L, T, Q>(0);
return Result;
}
};

2
glm/geometric.hpp
View file

@ -99,8 +99,6 @@ namespace glm
/// and the ratio of indices of refraction eta,
/// return the refraction vector.
///
/// @param eta Indice of refraction. Must be a value between -1 and 1 inclusively.
///
/// @tparam L An integer between 1 and 4 included that qualify the dimension of the vector.
/// @tparam T Floating-point scalar types.
///