anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Resolved issue #24, incorrect assert messages for step and smoothstep

Browse Source
master
Christophe Riccio ago%!(EXTRA string=13 years)
parent 560b474008
commit 82832839c2
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      glm/core/func_common.inl

4
glm/core/func_common.inl
Unescape View File

@ -615,7 +615,7 @@ namespace detail
genType const & x genType const & x
) )
{ {
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs"); GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'step' only accept floating-point inputs");
return x < edge ? genType(0) : genType(1); return x < edge ? genType(0) : genType(1);
} }
@ -707,7 +707,7 @@ namespace detail
genType const & x genType const & x
) )
{ {
GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'mix' only accept floating-point inputs"); GLM_STATIC_ASSERT(detail::type<genType>::is_float, "'smoothstep' only accept floating-point inputs");
genType tmp = clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1)); genType tmp = clamp((x - edge0) / (edge1 - edge0), genType(0), genType(1));
return tmp * tmp * (genType(3) - genType(2) * tmp); return tmp * tmp * (genType(3) - genType(2) * tmp);

Write Preview
Loading…
Cancel
Save