Convert everything to new inline scheme (#57) (#72)

* Convert everything to new inline scheme

* Add both extern and inline for some SSE vs. non-SSE functions

Some functions had nice, compact SSE implementations but bulky non-SSE
implementations, so this commit inlines just the implementations that make
sense. Also updated documentation.

* Convert HINLINE and HEXTERN to HMM_INLINE and HMM_EXTERN

CONTRIBUTING.md

@@ -1,3 +1,9 @@
+# Understanding the structure of Handmade Math
+
+Most of the functions in Handmade Math are very short, and are the kind of functions you want to have inlined. Because of this, most functions in Handmade Math are defined with `HINLINE`, which is defined as `static inline`.
+
+The exceptions are functions like `HMM_Rotate`, which are long enough that it doesn't make sense to inline them. These functions are defined with an `HEXTERN` prototype, and implemented in the `#ifdef HANDMADE_MATH_IMPLEMENTATION` block.
+
 # Quick style guide
 
 * Put braces on a new line
@@ -13,23 +19,6 @@
   1.f
   .0f
   ```
-* Put macros and return types on a separate line from the function definition:
-  ```cpp
-  HINLINE float
-  HMM_MyFunction()
-  {
-      // ...
-  }
-  ```
-* Explicitly initialize variables to zero:
-  ```cpp
-  HINLINE float
-  HMM_MyFunction()
-  {
-      float MyFloat = 0.0f;
-      hmm_vec3 MyVector = {0};
-  }
-  ```
 * Put parentheses around the returned value:
   ```cpp
   HINLINE float
@@ -40,7 +29,7 @@
   ```
 
 
-# Other notes
+## Other style notes
 
 * If a new function is defined with different names for different datatypes, also add C++ overloaded versions of the functions. For example, if you have `HMM_LengthVec2(hmm_vec2)` and `HMM_LengthVec3(hmm_vec3)`, also provide `HMM_Length(hmm_vec2)` and `HMM_Length(hmm_vec3)`.
 
@@ -49,3 +38,6 @@
 * Try to define functions in the same order as the prototypes.
 * Don't forget that Handmade Math uses column-major order for matrices!
 
+# Versioning
+
+We use [semantic versioning](http://semver.org/) because it's reasonable.

README.md

@@ -3,7 +3,9 @@
 
 [![Build Status](https://travis-ci.org/StrangeZak/Handmade-Math.svg?branch=master)](https://travis-ci.org/StrangeZak/Handmade-Math)
 
-Single-file cross-platform public domain game math library for C/C++
+A single-file, cross-platform, public domain game math library for C/C++.
+
+To get started, go download [the latest release](https://github.com/HandmadeMath/Handmade-Math/releases).
 
 _This library is free and will stay free, but if you would like to support development, or you are a company using HandmadeMath, please consider financial support._
 
@@ -12,7 +14,12 @@ _This library is free and will stay free, but if you would like to support devel
 
 Version         | Changes        | 
 ----------------|----------------|
-**1.1.4** | Fixed divide-by-zero errors when normalizing zero vectors.
+**1.5.0** | Changed internal structure for better performance and inlining. As a result, `HANDMADE_MATH_NO_INLINE` has been removed and no longer has any effect.
+**1.4.0** | Fixed bug when using C mode. SSE'd all vec4 operations. Removed zeroing for better performance.
+**1.3.0** | Removed need to `#define HANDMADE_MATH_CPP_MODE`. C++ definitions are now included automatically in C++ environments.
+**1.2.0** | Added equality functions for `HMM_Vec2`, `HMM_Vec3`, and `HMM_Vec4`, and SSE'd `HMM_MultiplyMat4` and `HMM_Transpose`.
+**1.1.5** | Added `Width` and `Height` to `HMM_Vec2`, and made it so you can supply your own `SqrtF`.
+**1.1.4** | Fixed SSE being included on platforms that don't support it, and fixed divide-by-zero errors when normalizing zero vectors.
 **1.1.3** | Fixed compile error in C mode
 **1.1.2** | Fixed invalid HMMDEF's in the function definitions
 **1.1.1** | Resolved compiler warnings on gcc and g++
@@ -41,4 +48,4 @@ This library is in the public domain. You can do whatever you want with it.
 
 **Where can I contact you to ask questions?**
 
-You can email me at: Zak@Handmade.Network
+Feel free to make Github issues for any questions, concerns, or problems you encounter.

test/HandmadeMath.c

@@ -1,4 +1,3 @@
-
 #define HANDMADE_MATH_IMPLEMENTATION
 #define HANDMADE_MATH_NO_INLINE
 #include "../HandmadeMath.h"

test/HandmadeMath.cpp

@@ -1,5 +1,2 @@
-
+#include "HandmadeMath.c"
-#define HANDMADE_MATH_IMPLEMENTATION
+// C++ compilers complain when compiling a .c file...
-#define HANDMADE_MATH_CPP_MODE
-#define HANDMADE_MATH_NO_INLINE
-#include "../HandmadeMath.h"

test/HandmadeMath_NoSSE.c

@@ -1,5 +0,0 @@
-
-#define HANDMADE_MATH_IMPLEMENTATION
-#define HANDMADE_MATH_NO_SSE
-#define HANDMADE_MATH_NO_INLINE
-#include "../HandmadeMath.h"

test/HandmadeMath_NoSSE.cpp

@@ -1,6 +0,0 @@
-
-#define HANDMADE_MATH_IMPLEMENTATION
-#define HANDMADE_MATH_CPP_MODE
-#define HANDMADE_MATH_NO_SSE
-#define HANDMADE_MATH_NO_INLINE
-#include "../HandmadeMath.h"

test/HandmadeTest.h

@@ -25,27 +25,48 @@ int hmt_count_failures = 0;
 }
 
 #define TEST_BEGIN(name) { \
-    int count_testfailures = 0; \
+    int count_testcases = 0, count_testfailures = 0; \
     count_categorytests++; \
     printf("    " #name ":");
 #define TEST_END() \
     count_categoryfailures += count_testfailures; \
     if (count_testfailures > 0) { \
         count_categoryfailedtests++; \
+        printf("\n      " RED "(%d/%d passed)" RESET, count_testcases - count_testfailures, count_testcases); \
         printf("\n"); \
     } else { \
-        printf(GREEN " [PASS]\n" RESET); \
+        printf(GREEN " [PASS] (%d/%d passed) \n" RESET, count_testcases - count_testfailures, count_testcases); \
     } \
 }
 
+#define CASE_START() \
+    count_testcases++;
+
 #define CASE_FAIL() \
     count_testfailures++; \
-    printf("\n      - " RED "[FAIL] (%d) " RESET, __LINE__)
+    printf("\n      - " RED "[FAIL] (%d) " RESET, __LINE__);
 
 /*
  * Asserts and expects
  */
+#define EXPECT_TRUE(_actual) do { \
+    CASE_START(); \
+    if (!(_actual)) { \
+        CASE_FAIL(); \
+        printf("Expected true but got something false"); \
+    } \
+} while (0)
+
+#define EXPECT_FALSE(_actual) do { \
+    CASE_START(); \
+    if (_actual) { \
+        CASE_FAIL(); \
+        printf("Expected false but got something true"); \
+    } \
+} while (0)
+
 #define EXPECT_FLOAT_EQ(_actual, _expected) do { \
+    CASE_START(); \
     float actual = (_actual); \
     float diff = actual - (_expected); \
     if (diff < -FLT_EPSILON || FLT_EPSILON < diff) { \
@@ -55,6 +76,7 @@ int hmt_count_failures = 0;
 } while (0)
 
 #define EXPECT_NEAR(_actual, _expected, _epsilon) do { \
+    CASE_START(); \
     float actual = (_actual); \
     float diff = actual - (_expected); \
     if (diff < -(_epsilon) || (_epsilon) < diff) { \
@@ -64,6 +86,7 @@ int hmt_count_failures = 0;
 } while (0)
 
 #define EXPECT_LT(_actual, _expected) do { \
+    CASE_START(); \
     if ((_actual) >= (_expected)) { \
         CASE_FAIL(); \
         printf("Expected %f to be less than %f", (_actual), (_expected)); \
@@ -71,6 +94,7 @@ int hmt_count_failures = 0;
 } while (0)
 
 #define EXPECT_GT(_actual, _expected) do { \
+    CASE_START(); \
     if ((_actual) <= (_expected)) { \
         CASE_FAIL(); \
         printf("Expected %f to be greater than %f", (_actual), (_expected)); \

test/Makefile

@@ -1,6 +1,6 @@
-ROOT_DIR = ..
+ROOT_DIR=..
 
-CXXFLAGS += -g -Wall -Wextra -pthread -Wno-missing-braces -Wno-missing-field-initializers
+CXXFLAGS+=-g -Wall -Wextra -pthread -Wno-missing-braces -Wno-missing-field-initializers
 
 all: c c_no_sse cpp cpp_no_sse
 
@@ -8,17 +8,30 @@ clean:
 	rm -f hmm_test_c hmm_test_cpp hmm_test_c_no_sse hmm_test_cpp_no_sse *.o
 
 c: $(ROOT_DIR)/test/HandmadeMath.c test_impl
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -std=c99 -c $(ROOT_DIR)/test/HandmadeMath.c $(ROOT_DIR)/test/hmm_test.c -lm
+	@echo "\nCompiling in C mode"
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -std=c99 \
+		-c $(ROOT_DIR)/test/HandmadeMath.c $(ROOT_DIR)/test/hmm_test.c \
+		-lm
 	$(CC) -ohmm_test_c HandmadeMath.o hmm_test.o -lm
 
-c_no_sse: $(ROOT_DIR)/test/HandmadeMath_NoSSE.c test_impl
+c_no_sse: $(ROOT_DIR)/test/HandmadeMath.c test_impl
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -std=c99 -c $(ROOT_DIR)/test/HandmadeMath_NoSSE.c $(ROOT_DIR)/test/hmm_test.c -lm
+	@echo "\nCompiling in C mode (no SSE)"
-	$(CC) -ohmm_test_c_no_sse HandmadeMath_NoSSE.o hmm_test.o -lm
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -std=c99 \
+	    -DHANDMADE_MATH_NO_SSE \
+	    -c $(ROOT_DIR)/test/HandmadeMath.c $(ROOT_DIR)/test/hmm_test.c \
+	    -lm
+	$(CC) -ohmm_test_c_no_sse HandmadeMath.o hmm_test.o -lm
 
 cpp: $(ROOT_DIR)/test/HandmadeMath.cpp test_impl
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -ohmm_test_cpp $(ROOT_DIR)/test/HandmadeMath.cpp $(ROOT_DIR)/test/hmm_test.cpp
+	@echo "\nCompiling in C++ mode"
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -ohmm_test_cpp \
+		-DHANDMADE_MATH_CPP_MODE \
+		$(ROOT_DIR)/test/HandmadeMath.cpp $(ROOT_DIR)/test/hmm_test.cpp
 
-cpp_no_sse: $(ROOT_DIR)/test/HandmadeMath_NoSSE.cpp test_impl
+cpp_no_sse: $(ROOT_DIR)/test/HandmadeMath.cpp test_impl
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -ohmm_test_cpp_no_sse $(ROOT_DIR)/test/HandmadeMath_NoSSE.cpp $(ROOT_DIR)/test/hmm_test.cpp
+	@echo "\nCompiling in C++ mode (no SSE)"
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -ohmm_test_cpp_no_sse \
+		-DHANDMADE_MATH_CPP_MODE -DHANDMADE_MATH_NO_SSE \
+		$(ROOT_DIR)/test/HandmadeMath.cpp $(ROOT_DIR)/test/hmm_test.cpp
 
 test_impl: $(ROOT_DIR)/test/hmm_test.cpp $(ROOT_DIR)/test/hmm_test.c

test/README.md

@@ -0,0 +1,11 @@
+# Testing
+
+You can compile and run the tests yourself by running:
+
+```
+make
+./hmm_test_c
+./hmm_test_c_no_sse
+./hmm_test_cpp
+./hmm_test_cpp_no_sse
+```

test/hmm_test.c

@@ -120,9 +120,25 @@ int run_tests()
 
             EXPECT_FLOAT_EQ(v2.X, 1.0f);
             EXPECT_FLOAT_EQ(v2.Y, 2.0f);
+            EXPECT_FLOAT_EQ(v2.U, 1.0f);
+            EXPECT_FLOAT_EQ(v2.V, 2.0f);
+            EXPECT_FLOAT_EQ(v2.Left, 1.0f);
+            EXPECT_FLOAT_EQ(v2.Right, 2.0f);
+            EXPECT_FLOAT_EQ(v2.Width, 1.0f);
+            EXPECT_FLOAT_EQ(v2.Height, 2.0f);
+            EXPECT_FLOAT_EQ(v2.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v2.Elements[1], 2.0f);
 
             EXPECT_FLOAT_EQ(v2i.X, 1.0f);
             EXPECT_FLOAT_EQ(v2i.Y, 2.0f);
+            EXPECT_FLOAT_EQ(v2i.U, 1.0f);
+            EXPECT_FLOAT_EQ(v2i.V, 2.0f);
+            EXPECT_FLOAT_EQ(v2i.Left, 1.0f);
+            EXPECT_FLOAT_EQ(v2i.Right, 2.0f);
+            EXPECT_FLOAT_EQ(v2i.Width, 1.0f);
+            EXPECT_FLOAT_EQ(v2i.Height, 2.0f);
+            EXPECT_FLOAT_EQ(v2i.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v2i.Elements[1], 2.0f);
 
             //
             // Test vec3
@@ -133,10 +149,44 @@ int run_tests()
             EXPECT_FLOAT_EQ(v3.X, 1.0f);
             EXPECT_FLOAT_EQ(v3.Y, 2.0f);
             EXPECT_FLOAT_EQ(v3.Z, 3.0f);
+            EXPECT_FLOAT_EQ(v3.U, 1.0f);
+            EXPECT_FLOAT_EQ(v3.V, 2.0f);
+            EXPECT_FLOAT_EQ(v3.W, 3.0f);
+            EXPECT_FLOAT_EQ(v3.R, 1.0f);
+            EXPECT_FLOAT_EQ(v3.G, 2.0f);
+            EXPECT_FLOAT_EQ(v3.B, 3.0f);
+            EXPECT_FLOAT_EQ(v3.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3.Elements[2], 3.0f);
+            EXPECT_FLOAT_EQ(v3.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3.YZ.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v3.YZ.Elements[1], 3.0f);
+            EXPECT_FLOAT_EQ(v3.UV.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3.UV.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3.VW.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v3.VW.Elements[1], 3.0f);
 
             EXPECT_FLOAT_EQ(v3i.X, 1.0f);
             EXPECT_FLOAT_EQ(v3i.Y, 2.0f);
             EXPECT_FLOAT_EQ(v3i.Z, 3.0f);
+            EXPECT_FLOAT_EQ(v3i.U, 1.0f);
+            EXPECT_FLOAT_EQ(v3i.V, 2.0f);
+            EXPECT_FLOAT_EQ(v3i.W, 3.0f);
+            EXPECT_FLOAT_EQ(v3i.R, 1.0f);
+            EXPECT_FLOAT_EQ(v3i.G, 2.0f);
+            EXPECT_FLOAT_EQ(v3i.B, 3.0f);
+            EXPECT_FLOAT_EQ(v3i.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3i.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3i.Elements[2], 3.0f);
+            EXPECT_FLOAT_EQ(v3i.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3i.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3i.YZ.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v3i.YZ.Elements[1], 3.0f);
+            EXPECT_FLOAT_EQ(v3i.UV.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v3i.UV.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v3i.VW.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v3i.VW.Elements[1], 3.0f);
 
             //
             // Test vec4
@@ -149,16 +199,70 @@ int run_tests()
             EXPECT_FLOAT_EQ(v4.Y, 2.0f);
             EXPECT_FLOAT_EQ(v4.Z, 3.0f);
             EXPECT_FLOAT_EQ(v4.W, 4.0f);
+            EXPECT_FLOAT_EQ(v4.R, 1.0f);
+            EXPECT_FLOAT_EQ(v4.G, 2.0f);
+            EXPECT_FLOAT_EQ(v4.B, 3.0f);
+            EXPECT_FLOAT_EQ(v4.A, 4.0f);
+            EXPECT_FLOAT_EQ(v4.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4.YZ.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v4.YZ.Elements[1], 3.0f);
+            EXPECT_FLOAT_EQ(v4.ZW.Elements[0], 3.0f);
+            EXPECT_FLOAT_EQ(v4.ZW.Elements[1], 4.0f);
+            EXPECT_FLOAT_EQ(v4.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4.XYZ.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4.XYZ.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4.XYZ.Elements[2], 3.0f);
+            EXPECT_FLOAT_EQ(v4.RGB.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4.RGB.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4.RGB.Elements[2], 3.0f);
 
             EXPECT_FLOAT_EQ(v4i.X, 1.0f);
             EXPECT_FLOAT_EQ(v4i.Y, 2.0f);
             EXPECT_FLOAT_EQ(v4i.Z, 3.0f);
             EXPECT_FLOAT_EQ(v4i.W, 4.0f);
+            EXPECT_FLOAT_EQ(v4i.R, 1.0f);
+            EXPECT_FLOAT_EQ(v4i.G, 2.0f);
+            EXPECT_FLOAT_EQ(v4i.B, 3.0f);
+            EXPECT_FLOAT_EQ(v4i.A, 4.0f);
+            EXPECT_FLOAT_EQ(v4i.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4i.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4i.YZ.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v4i.YZ.Elements[1], 3.0f);
+            EXPECT_FLOAT_EQ(v4i.ZW.Elements[0], 3.0f);
+            EXPECT_FLOAT_EQ(v4i.ZW.Elements[1], 4.0f);
+            EXPECT_FLOAT_EQ(v4i.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4i.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4i.XYZ.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4i.XYZ.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4i.XYZ.Elements[2], 3.0f);
+            EXPECT_FLOAT_EQ(v4i.RGB.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4i.RGB.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4i.RGB.Elements[2], 3.0f);
 
             EXPECT_FLOAT_EQ(v4v.X, 1.0f);
             EXPECT_FLOAT_EQ(v4v.Y, 2.0f);
             EXPECT_FLOAT_EQ(v4v.Z, 3.0f);
             EXPECT_FLOAT_EQ(v4v.W, 4.0f);
+            EXPECT_FLOAT_EQ(v4v.R, 1.0f);
+            EXPECT_FLOAT_EQ(v4v.G, 2.0f);
+            EXPECT_FLOAT_EQ(v4v.B, 3.0f);
+            EXPECT_FLOAT_EQ(v4v.A, 4.0f);
+            EXPECT_FLOAT_EQ(v4v.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4v.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4v.YZ.Elements[0], 2.0f);
+            EXPECT_FLOAT_EQ(v4v.YZ.Elements[1], 3.0f);
+            EXPECT_FLOAT_EQ(v4v.ZW.Elements[0], 3.0f);
+            EXPECT_FLOAT_EQ(v4v.ZW.Elements[1], 4.0f);
+            EXPECT_FLOAT_EQ(v4v.XY.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4v.XY.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4v.XYZ.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4v.XYZ.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4v.XYZ.Elements[2], 3.0f);
+            EXPECT_FLOAT_EQ(v4v.RGB.Elements[0], 1.0f);
+            EXPECT_FLOAT_EQ(v4v.RGB.Elements[1], 2.0f);
+            EXPECT_FLOAT_EQ(v4v.RGB.Elements[2], 3.0f);
         }
         TEST_END()
 
@@ -230,7 +334,7 @@ int run_tests()
             EXPECT_FLOAT_EQ(HMM_LengthSquaredVec3(v3), 14.0f);
             EXPECT_FLOAT_EQ(HMM_LengthSquaredVec4(v4), 15.0f);
 
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             EXPECT_FLOAT_EQ(HMM_LengthSquared(v2), 5.0f);
             EXPECT_FLOAT_EQ(HMM_LengthSquared(v3), 14.0f);
             EXPECT_FLOAT_EQ(HMM_LengthSquared(v4), 15.0f);
@@ -248,7 +352,7 @@ int run_tests()
             EXPECT_FLOAT_EQ(HMM_LengthVec3(v3), 7.0f);
             EXPECT_FLOAT_EQ(HMM_LengthVec4(v4), 13.892444f);
 
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             EXPECT_FLOAT_EQ(HMM_Length(v2), 9.0553856f);
             EXPECT_FLOAT_EQ(HMM_Length(v3), 7.0f);
             EXPECT_FLOAT_EQ(HMM_Length(v4), 13.892444f);
@@ -284,7 +388,7 @@ int run_tests()
                 EXPECT_LT(result.W, 0.0f);
             }
 
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Normalize(v2);
                 EXPECT_FLOAT_EQ(HMM_LengthVec2(result), 1.0f);
@@ -335,7 +439,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.W, 0.0f);
             }
 
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Normalize(v2);
                 EXPECT_FLOAT_EQ(result.X, 0.0f);
@@ -377,7 +481,7 @@ int run_tests()
             hmm_vec2 v2 = HMM_Vec2(3.0f, 4.0f);
 
             EXPECT_FLOAT_EQ(HMM_DotVec2(v1, v2), 11.0f);
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             EXPECT_FLOAT_EQ(HMM_Dot(v1, v2), 11.0f);
 #endif
         }
@@ -389,7 +493,7 @@ int run_tests()
             hmm_vec3 v2 = HMM_Vec3(4.0f, 5.0f, 6.0f);
 
             EXPECT_FLOAT_EQ(HMM_DotVec3(v1, v2), 32.0f);
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             EXPECT_FLOAT_EQ(HMM_Dot(v1, v2), 32.0f);
 #endif
         }
@@ -401,7 +505,7 @@ int run_tests()
             hmm_vec4 v2 = HMM_Vec4(5.0f, 6.0f, 7.0f, 8.0f);
 
             EXPECT_FLOAT_EQ(HMM_DotVec4(v1, v2), 70.0f);
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             EXPECT_FLOAT_EQ(HMM_Dot(v1, v2), 70.0f);
 #endif
         }
@@ -474,7 +578,7 @@ int run_tests()
                 float result = HMM_DotQuaternion(q1, q2);
                 EXPECT_FLOAT_EQ(result, 70.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 float result = HMM_Dot(q1, q2);
                 EXPECT_FLOAT_EQ(result, 70.0f);
@@ -494,7 +598,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 0.5477225575f);
                 EXPECT_FLOAT_EQ(result.W, 0.7302967433f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Normalize(q);
                 EXPECT_FLOAT_EQ(result.X, 0.1825741858f);
@@ -589,7 +693,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, 4.0f);
                 EXPECT_FLOAT_EQ(result.Y, 6.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Add(v2_1, v2_2);
                 EXPECT_FLOAT_EQ(result.X, 4.0f);
@@ -619,7 +723,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, 7.0f);
                 EXPECT_FLOAT_EQ(result.Z, 9.0f);    
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Add(v3_1, v3_2);
                 EXPECT_FLOAT_EQ(result.X, 5.0f);
@@ -653,7 +757,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 10.0f);
                 EXPECT_FLOAT_EQ(result.W, 12.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Add(v4_1, v4_2);
                 EXPECT_FLOAT_EQ(result.X, 6.0f);
@@ -715,7 +819,7 @@ int run_tests()
                     }
                 }
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_mat4 result = HMM_Add(m4_1, m4_2);
                 float Expected = 18.0f;
@@ -723,7 +827,7 @@ int run_tests()
                 {
                     for (int Row = 0; Row < 4; ++Row)
                     {
-                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], Expected) << "At column " << Column << ", row " << Row;
+                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], Expected);
                         Expected += 2.0f;
                     }
                 }
@@ -735,7 +839,7 @@ int run_tests()
                 {
                     for (int Row = 0; Row < 4; ++Row)
                     {
-                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], Expected) << "At column " << Column << ", row " << Row;
+                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], Expected);
                         Expected += 2.0f;
                     }
                 }
@@ -747,7 +851,7 @@ int run_tests()
             {
                 for (int Row = 0; Row < 4; ++Row)
                 {
-                    EXPECT_FLOAT_EQ(m4_1.Elements[Column][Row], Expected) << "At column " << Column << ", row " << Row;
+                    EXPECT_FLOAT_EQ(m4_1.Elements[Column][Row], Expected);
                     Expected += 2.0f;
                 }
             }
@@ -767,7 +871,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 10.0f);
                 EXPECT_FLOAT_EQ(result.W, 12.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Add(q1, q2);
                 EXPECT_FLOAT_EQ(result.X, 6.0f);
@@ -806,7 +910,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, -2.0f);
                 EXPECT_FLOAT_EQ(result.Y, -2.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Subtract(v2_1, v2_2);
                 EXPECT_FLOAT_EQ(result.X, -2.0f);
@@ -836,7 +940,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, -3.0f);
                 EXPECT_FLOAT_EQ(result.Z, -3.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Subtract(v3_1, v3_2);
                 EXPECT_FLOAT_EQ(result.X, -3.0f);
@@ -870,7 +974,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, -4.0f);
                 EXPECT_FLOAT_EQ(result.W, -4.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Subtract(v4_1, v4_2);
                 EXPECT_FLOAT_EQ(result.X, -4.0f);
@@ -930,14 +1034,14 @@ int run_tests()
                     }
                 }
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_mat4 result = HMM_Subtract(m4_1, m4_2);
                 for (int Column = 0; Column < 4; ++Column)
                 {
                     for (int Row = 0; Row < 4; ++Row)
                     {
-                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], -16.0f) << "At column " << Column << ", row " << Row;
+                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], -16.0f);
                     }
                 }
             }
@@ -947,7 +1051,7 @@ int run_tests()
                 {
                     for (int Row = 0; Row < 4; ++Row)
                     {
-                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], -16.0f) << "At column " << Column << ", row " << Row;
+                        EXPECT_FLOAT_EQ(result.Elements[Column][Row], -16.0f);
                     }
                 }
             }
@@ -957,7 +1061,7 @@ int run_tests()
             {
                 for (int Row = 0; Row < 4; ++Row)
                 {
-                    EXPECT_FLOAT_EQ(m4_1.Elements[Column][Row], -16.0f) << "At column " << Column << ", row " << Row;
+                    EXPECT_FLOAT_EQ(m4_1.Elements[Column][Row], -16.0f);
                 }
             }
 #endif
@@ -976,7 +1080,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, -4.0f);
                 EXPECT_FLOAT_EQ(result.W, -4.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Subtract(q1, q2);
                 EXPECT_FLOAT_EQ(result.X, -4.0f);
@@ -1015,7 +1119,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
                 EXPECT_FLOAT_EQ(result.Y, 8.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Multiply(v2_1, v2_2);
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
@@ -1044,7 +1148,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
                 EXPECT_FLOAT_EQ(result.Y, 6.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Multiply(v2, s);
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
@@ -1079,7 +1183,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, 10.0f);
                 EXPECT_FLOAT_EQ(result.Z, 18.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Multiply(v3_1, v3_2);
                 EXPECT_FLOAT_EQ(result.X, 4.0f);
@@ -1112,7 +1216,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, 6.0f);
                 EXPECT_FLOAT_EQ(result.Z, 9.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Multiply(v3, s);
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
@@ -1152,7 +1256,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 21.0f);
                 EXPECT_FLOAT_EQ(result.W, 32.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Multiply(v4_1, v4_2);
                 EXPECT_FLOAT_EQ(result.X, 5.0f);
@@ -1189,7 +1293,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 9.0f);
                 EXPECT_FLOAT_EQ(result.W, 12.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Multiply(v4, s);
                 EXPECT_FLOAT_EQ(result.X, 3.0f);
@@ -1264,7 +1368,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Elements[3][2], 1118.0f);
                 EXPECT_FLOAT_EQ(result.Elements[3][3], 1240.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_mat4 result = HMM_Multiply(m4_1, m4_2);
                 EXPECT_FLOAT_EQ(result.Elements[0][0], 538.0f);
@@ -1347,7 +1451,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Elements[3][2], 45.0f);
                 EXPECT_FLOAT_EQ(result.Elements[3][3], 48.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_mat4 result = HMM_Multiply(m4, s);
                 EXPECT_FLOAT_EQ(result.Elements[0][0], 3.0f);
@@ -1451,7 +1555,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 110.0f);
                 EXPECT_FLOAT_EQ(result.W, 120.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Multiply(m4, v4);
                 EXPECT_FLOAT_EQ(result.X, 90.0f);
@@ -1484,7 +1588,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 48.0f);
                 EXPECT_FLOAT_EQ(result.W, -6.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Multiply(q1, q2);
                 EXPECT_FLOAT_EQ(result.X, 24.0f);
@@ -1519,7 +1623,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 6.0f);
                 EXPECT_FLOAT_EQ(result.W, 8.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Multiply(q, f);
                 EXPECT_FLOAT_EQ(result.X, 2.0f);
@@ -1565,7 +1669,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
                 EXPECT_FLOAT_EQ(result.Y, 0.75f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Divide(v2_1, v2_2);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1594,7 +1698,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
                 EXPECT_FLOAT_EQ(result.Y, 1.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec2 result = HMM_Divide(v2, s);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1624,7 +1728,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, 0.75f);
                 EXPECT_FLOAT_EQ(result.Z, 10.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Divide(v3_1, v3_2);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1657,7 +1761,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Y, 1.0f);
                 EXPECT_FLOAT_EQ(result.Z, 1.5f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec3 result = HMM_Divide(v3, s);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1691,7 +1795,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 10.0f);
                 EXPECT_FLOAT_EQ(result.W, 0.25f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Divide(v4_1, v4_2);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1728,7 +1832,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 1.5f);
                 EXPECT_FLOAT_EQ(result.W, 2.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_vec4 result = HMM_Divide(v4, s);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1789,7 +1893,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Elements[3][2], 7.5f);
                 EXPECT_FLOAT_EQ(result.Elements[3][3], 8.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_mat4 result = HMM_Divide(m4, s);
                 EXPECT_FLOAT_EQ(result.Elements[0][0], 0.5f);
@@ -1862,7 +1966,7 @@ int run_tests()
                 EXPECT_FLOAT_EQ(result.Z, 1.5f);
                 EXPECT_FLOAT_EQ(result.W, 2.0f);
             }
-#ifdef HANDMADE_MATH_CPP_MODE
+#ifdef __cplusplus
             {
                 hmm_quaternion result = HMM_Divide(q, f);
                 EXPECT_FLOAT_EQ(result.X, 0.5f);
@@ -1889,6 +1993,67 @@ int run_tests()
     }
     CATEGORY_END()
 
+    CATEGORY_BEGIN(Equality)
+    {
+        TEST_BEGIN(Vec2)
+        {
+            hmm_vec2 a = HMM_Vec2(1.0f, 2.0f);
+            hmm_vec2 b = HMM_Vec2(1.0f, 2.0f);
+            hmm_vec2 c = HMM_Vec2(3.0f, 4.0f);
+
+            EXPECT_TRUE(HMM_EqualsVec2(a, b));
+            EXPECT_FALSE(HMM_EqualsVec2(a, c));
+
+#ifdef __cplusplus
+            EXPECT_TRUE(HMM_Equals(a, b));
+            EXPECT_FALSE(HMM_Equals(a, c));
+
+            EXPECT_TRUE(a == b);
+            EXPECT_FALSE(a == c);
+#endif
+        }
+        TEST_END()
+
+        TEST_BEGIN(Vec3)
+        {
+            hmm_vec3 a = HMM_Vec3(1.0f, 2.0f, 3.0f);
+            hmm_vec3 b = HMM_Vec3(1.0f, 2.0f, 3.0f);
+            hmm_vec3 c = HMM_Vec3(4.0f, 5.0f, 6.0f);
+
+            EXPECT_TRUE(HMM_EqualsVec3(a, b));
+            EXPECT_FALSE(HMM_EqualsVec3(a, c));
+
+#ifdef __cplusplus
+            EXPECT_TRUE(HMM_Equals(a, b));
+            EXPECT_FALSE(HMM_Equals(a, c));
+
+            EXPECT_TRUE(a == b);
+            EXPECT_FALSE(a == c);
+#endif
+        }
+        TEST_END()
+
+        TEST_BEGIN(Vec4)
+        {
+            hmm_vec4 a = HMM_Vec4(1.0f, 2.0f, 3.0f, 4.0f);
+            hmm_vec4 b = HMM_Vec4(1.0f, 2.0f, 3.0f, 4.0f);
+            hmm_vec4 c = HMM_Vec4(5.0f, 6.0f, 7.0f, 8.0f);
+
+            EXPECT_TRUE(HMM_EqualsVec4(a, b));
+            EXPECT_FALSE(HMM_EqualsVec4(a, c));
+
+#ifdef __cplusplus
+            EXPECT_TRUE(HMM_Equals(a, b));
+            EXPECT_FALSE(HMM_Equals(a, c));
+
+            EXPECT_TRUE(a == b);
+            EXPECT_FALSE(a == c);
+#endif
+        }
+        TEST_END()
+    }
+    CATEGORY_END()
+
     CATEGORY_BEGIN(Projection)
     {
         TEST_BEGIN(Orthographic)
@@ -1989,5 +2154,49 @@ int run_tests()
     }
     CATEGORY_END()
 
+#ifdef HANDMADE_MATH__USE_SSE
+    CATEGORY_BEGIN(SSE)
+    {
+        TEST_BEGIN(LinearCombine)
+        {
+            hmm_mat4 MatrixOne = HMM_Mat4d(2.0f);
+            hmm_mat4 MatrixTwo = HMM_Mat4d(4.0f);
+            hmm_mat4 Result;
+            
+            Result.Rows[0] = HMM_LinearCombineSSE(MatrixOne.Rows[0], MatrixTwo);
+            Result.Rows[1] = HMM_LinearCombineSSE(MatrixOne.Rows[1], MatrixTwo);
+            Result.Rows[2] = HMM_LinearCombineSSE(MatrixOne.Rows[2], MatrixTwo);
+            Result.Rows[3] = HMM_LinearCombineSSE(MatrixOne.Rows[3], MatrixTwo);
+            
+            {
+                EXPECT_FLOAT_EQ(Result.Elements[0][0], 8.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[0][1], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[0][2], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[0][3], 0.0f);
+                                
+                EXPECT_FLOAT_EQ(Result.Elements[1][0], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[1][1], 8.0f);                
+                EXPECT_FLOAT_EQ(Result.Elements[1][2], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[1][3], 0.0f);
+
+                                
+                EXPECT_FLOAT_EQ(Result.Elements[2][0], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[2][1], 0.0f);                
+                EXPECT_FLOAT_EQ(Result.Elements[2][2], 8.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[2][3], 0.0f);
+
+                
+                EXPECT_FLOAT_EQ(Result.Elements[3][0], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[3][1], 0.0f);                
+                EXPECT_FLOAT_EQ(Result.Elements[3][2], 0.0f);
+                EXPECT_FLOAT_EQ(Result.Elements[3][3], 8.0f);                
+            }
+            
+        }
+        TEST_END()
+    }
+    CATEGORY_END()
+#endif
+
     return 0;
 }