Fixed glm::step that didn't work with scalars g-truc#684

paintdream · Oct 22, 2017 · fcbedf5 · fcbedf5
1 parent 5dbb447
commit fcbedf5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl
@@ -582,7 +582,7 @@ namespace detail
 	template<typename genType>
 	GLM_FUNC_QUALIFIER genType step(genType edge, genType x)
 	{
-		return mix(static_cast<genType>(1), static_cast<genType>(0), glm::lessThan(x, edge));
+		return mix(static_cast<genType>(1), static_cast<genType>(0), x < edge);
 	}
 
 	template<length_t L, typename T, qualifier Q>

diff --git a/test/core/core_func_common.cpp b/test/core/core_func_common.cpp
@@ -527,6 +527,20 @@ namespace step_
 	{
 		int Error = 0;
 
+		// scalar
+		{
+			float const Edge = 2.0f;
+
+			float const A = glm::step(Edge, 1.0f);
+			Error += glm::epsilonEqual(A, 0.0f, glm::epsilon<float>()) ? 0 : 1;
+
+			float const B = glm::step(Edge, 3.0f);
+			Error += glm::epsilonEqual(B, 1.0f, glm::epsilon<float>()) ? 0 : 1;
+
+			float const C = glm::step(Edge, 2.0f);
+			Error += glm::epsilonEqual(C, 1.0f, glm::epsilon<float>()) ? 0 : 1;
+		}
+
 		// vec4 and float
 		{
 			for (std::size_t i = 0; i < sizeof(TestVec4Scalar) / sizeof(entry<float, glm::vec4>); ++i)