Expose NaNs in our tests

oops

HandmadeMath.h

@@ -1,5 +1,5 @@
 /*
-  HandmadeMath.h v1.11.0
+  HandmadeMath.h v1.12.1
 
   This is a single header file with a bunch of useful functions for game and
   graphics math operations.
@@ -84,7 +84,7 @@
 
   CREDITS
 
-  Written by Zakary Strange (strangezak@gmail.com && @strangezak)
+  Written by Zakary Strange (strangezak@protonmail.com && @strangezak)
 
   Functionality:
    Matt Mascarenhas (@miblo_)
@@ -217,10 +217,10 @@ extern "C"
 #define HMM_PI32 3.14159265359f
 #define HMM_PI 3.14159265358979323846
 
-#define HMM_MIN(a, b) (a) > (b) ? (b) : (a)
-#define HMM_MAX(a, b) (a) < (b) ? (b) : (a)
+#define HMM_MIN(a, b) ((a) > (b) ? (b) : (a))
+#define HMM_MAX(a, b) ((a) < (b) ? (b) : (a))
 #define HMM_ABS(a) ((a) > 0 ? (a) : -(a))
-#define HMM_MOD(a, m) ((a) % (m)) >= 0 ? ((a) % (m)) : (((a) % (m)) + (m))
+#define HMM_MOD(a, m) (((a) % (m)) >= 0 ? ((a) % (m)) : (((a) % (m)) + (m)))
 #define HMM_SQUARE(x) ((x) * (x))
 
 #ifndef HMM_PREFIX
@@ -2799,7 +2799,7 @@ COVERAGE(HMM_UnaryMinusVec2, 1)
 HMM_INLINE hmm_vec2 operator-(hmm_vec2 In)
 {
     ASSERT_COVERED(HMM_UnaryMinusVec2);
-    
+
     hmm_vec2 Result;
     Result.X = -In.X;
     Result.Y = -In.Y;
@@ -2822,7 +2822,7 @@ COVERAGE(HMM_UnaryMinusVec4, 1)
 HMM_INLINE hmm_vec4 operator-(hmm_vec4 In)
 {
     ASSERT_COVERED(HMM_UnaryMinusVec4);
-    
+
     hmm_vec4 Result;
 #if HANDMADE_MATH__USE_SSE
     Result.InternalElementsSSE = _mm_xor_ps(In.InternalElementsSSE, _mm_set1_ps(-0.0f));

README.md

@@ -10,6 +10,7 @@ To get started, go download [the latest release](https://github.com/HandmadeMath
 
 Version         | Changes        |
 ----------------|----------------|
+**1.12.1** | Added extra parentheses around some macros |
 **1.12.0** | Added Unary Minus operator for `HMM_Vec2`, `HMM_Vec3`, and `HMM_Vec4`. |
 **1.11.1** | Added HMM_PREFIX macro to a few functions that were missing it. |
 **1.11.0** | Added ability to customize or remove the default `HMM_` prefix on function names by defining a macro called `HMM_PREFIX(name)`. |

test/HandmadeTest.h

@@ -58,6 +58,7 @@
 #define HANDMADETEST_H
 
 #include <float.h>
+#include <math.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -152,7 +153,7 @@ INITIALIZER(_HMT_COVERCASE_FUNCNAME_INIT(name)) { \
     _HMT_CASE_START(); \
     float actual = (_actual); \
     float diff = actual - (_expected); \
-    if (diff < -FLT_EPSILON || FLT_EPSILON < diff) { \
+    if (isnan(actual) || diff < -FLT_EPSILON || FLT_EPSILON < diff) { \
         _HMT_CASE_FAIL(); \
         printf("Expected %f, got %f", (_expected), actual); \
     } \
@@ -162,7 +163,7 @@ INITIALIZER(_HMT_COVERCASE_FUNCNAME_INIT(name)) { \
     _HMT_CASE_START(); \
     float actual = (_actual); \
     float diff = actual - (_expected); \
-    if (diff < -(_epsilon) || (_epsilon) < diff) { \
+    if (isnan(actual) || diff < -(_epsilon) || (_epsilon) < diff) { \
         _HMT_CASE_FAIL(); \
         printf("Expected %f, got %f", (_expected), actual); \
     } \

test/categories/QuaternionOps.h

@@ -66,14 +66,39 @@ TEST(QuaternionOps, NLerp)
 
 TEST(QuaternionOps, Slerp)
 {
-    hmm_quaternion from = HMM_Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
-    hmm_quaternion to = HMM_Quaternion(0.5f, 0.5f, -0.5f, 0.5f);
+    // Normal operation
+    {
+        hmm_quaternion from = HMM_Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
+        hmm_quaternion to = HMM_Quaternion(0.5f, 0.5f, -0.5f, 0.5f);
 
-    hmm_quaternion result = HMM_Slerp(from, 0.5f, to);
-    EXPECT_FLOAT_EQ(result.X, 0.28867513f);
-    EXPECT_FLOAT_EQ(result.Y, 0.28867513f);
-    EXPECT_FLOAT_EQ(result.Z, -0.28867513f);
-    EXPECT_FLOAT_EQ(result.W, 0.86602540f);
+        hmm_quaternion result = HMM_Slerp(from, 0.5f, to);
+        EXPECT_FLOAT_EQ(result.X, 0.28867513f);
+        EXPECT_FLOAT_EQ(result.Y, 0.28867513f);
+        EXPECT_FLOAT_EQ(result.Z, -0.28867513f);
+        EXPECT_FLOAT_EQ(result.W, 0.86602540f);
+    }
+
+    // Same quat twice
+    {
+        hmm_quaternion q = HMM_Quaternion(0.5f, 0.5f, 0.5f, 1.0f);
+
+        hmm_quaternion result = HMM_Slerp(q, 0.5f, q);
+        EXPECT_FLOAT_EQ(result.X, 0.5f);
+        EXPECT_FLOAT_EQ(result.Y, 0.5f);
+        EXPECT_FLOAT_EQ(result.Z, 0.5f);
+        EXPECT_FLOAT_EQ(result.W, 1.0f);
+    }
+
+    // Identity quat twice
+    {
+        hmm_quaternion q = HMM_Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
+
+        hmm_quaternion result = HMM_Slerp(q, 0.5f, q);
+        EXPECT_FLOAT_EQ(result.X, 0.0f);
+        EXPECT_FLOAT_EQ(result.Y, 1.0f);
+        EXPECT_FLOAT_EQ(result.Z, 0.0f);
+        EXPECT_FLOAT_EQ(result.W, 1.0f);
+    }
 }
 
 TEST(QuaternionOps, QuatToMat4)