Merge branch 'master' into 2-dev

* Make all functions static inline

* Updated email in credits

Co-authored-by: Zakary Strange <ZakaryStrange@gmail.com>

CONTRIBUTING.md

@@ -1,8 +1,6 @@
 # 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.
+Most of the functions in Handmade Math are very short, and all are the kind of functions you want to be easily inlined for performance. Because of this, all functions in Handmade Math are defined with `HMM_INLINE`, which is defined as `static inline`.
 
 # Quick style guide
 

HandmadeMath.h

@@ -1,17 +1,18 @@
 /*
-  HandmadeMath.h v1.13.0
+  HandmadeMath.h v1.11.0
 
   This is a single header file with a bunch of useful functions for game and
   graphics math operations.
 
+  All angles are in radians.
+
   =============================================================================
 
   To disable SSE intrinsics, you MUST
 
   #define HANDMADE_MATH_NO_SSE
 
-  in EXACTLY one C or C++ file that includes this header, BEFORE the
-  include, like this:
+  BEFORE the include, like this:
 
      #define HANDMADE_MATH_NO_SSE
      #include "HandmadeMath.h"
@@ -41,8 +42,7 @@
      #define HMM_ATAN2F MYATan2F
 
   Provide your own implementations of SinF, CosF, TanF, ACosF, ATanF, ATan2F,
-  ExpF, and LogF in EXACTLY one C or C++ file that includes this header,
-  BEFORE the include, like this:
+  ExpF, and LogF BEFORE the include, like this:
 
      #define HMM_SINF MySinF
      #define HMM_COSF MyCosF
@@ -68,14 +68,15 @@
 
   CREDITS
 
-  Written by Zakary Strange (strangezak@protonmail.com && @strangezak)
+  Written by:
+   Zakary Strange (zakarystrange@gmail.com && @strangezak)
+   Ben Visness (ben@bvisness.me && @its_bvisness)
 
   Functionality:
    Matt Mascarenhas (@miblo_)
    Aleph
    FieryDrake (@fierydrake)
    Gingerbill (@TheGingerBill)
-   Ben Visness (@bvisness)
    Trinton Bullard (@Peliex_Dev)
    @AntonDan
 
@@ -127,12 +128,11 @@
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wfloat-equal"
-#if (defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 8)) || defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 8)
 #pragma GCC diagnostic ignored "-Wmissing-braces"
 #endif
 #ifdef __clang__
 #pragma GCC diagnostic ignored "-Wgnu-anonymous-struct"
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
 #endif
 #endif
 
@@ -196,10 +196,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
@@ -367,16 +367,15 @@ typedef union hmm_mat4
 #ifdef __cplusplus
     inline hmm_vec4 operator[](const int &Index)
     {
-        hmm_vec4 Result;
-        float* Column = Elements[Index];
+        float* col = Elements[Index];
 
+        hmm_vec4 result;
+        result.Elements[0] = col[0];
+        result.Elements[1] = col[1];
+        result.Elements[2] = col[2];
+        result.Elements[3] = col[3];
 
-        Result.Elements[0] = Column[0];
-        Result.Elements[1] = Column[1];
-        Result.Elements[2] = Column[2];
-        Result.Elements[3] = Column[3];
-
-        return Result;
+        return result;
     }
 #endif
 } hmm_mat4;
@@ -571,6 +570,16 @@ HMM_INLINE float HMM_PREFIX(PowerF)(float Base, float Exponent)
  * Utility functions
  */
 
+COVERAGE(HMM_ToDegrees, 1)
+HMM_INLINE float HMM_ToDegrees(float Radians)
+{
+    ASSERT_COVERED(HMM_ToDegrees);
+
+    float Result = Radians * (180.0f / HMM_PI32);
+
+    return (Result);
+}
+
 COVERAGE(HMM_ToRadians, 1)
 HMM_INLINE float HMM_PREFIX(ToRadians)(float Degrees)
 {
@@ -602,8 +611,7 @@ HMM_INLINE float HMM_PREFIX(Clamp)(float Min, float Value, float Max)
     {
         Result = Min;
     }
-
-    if(Result > Max)
+    else if(Result > Max)
     {
         Result = Max;
     }
@@ -1314,11 +1322,15 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Transpose)(hmm_mat4 Matrix)
 {
     ASSERT_COVERED(HMM_Transpose);
 
+#ifdef HANDMADE_MATH__USE_SSE
     hmm_mat4 Result = Matrix;
 
-#ifdef HANDMADE_MATH__USE_SSE
     _MM_TRANSPOSE4_PS(Result.Columns[0], Result.Columns[1], Result.Columns[2], Result.Columns[3]);
+
+    return (Result);
 #else
+    hmm_mat4 Result;
+
     int Columns;
     for(Columns = 0; Columns < 4; ++Columns)
     {
@@ -1328,10 +1340,9 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Transpose)(hmm_mat4 Matrix)
             Result.Elements[Rows][Columns] = Matrix.Elements[Columns][Rows];
         }
     }
-#endif
-
 
     return (Result);
+#endif
 }
 
 COVERAGE(HMM_AddMat4, 1)
@@ -1339,15 +1350,19 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(AddMat4)(hmm_mat4 Left, hmm_mat4 Right)
 {
     ASSERT_COVERED(HMM_AddMat4);
 
+#ifdef HANDMADE_MATH__USE_SSE
     hmm_mat4 Result;
 
-#ifdef HANDMADE_MATH__USE_SSE
     Result.Columns[0] = _mm_add_ps(Left.Columns[0], Right.Columns[0]);
     Result.Columns[1] = _mm_add_ps(Left.Columns[1], Right.Columns[1]);
     Result.Columns[2] = _mm_add_ps(Left.Columns[2], Right.Columns[2]);
     Result.Columns[3] = _mm_add_ps(Left.Columns[3], Right.Columns[3]);
+
+    return (Result);
 #else
-     int Columns;
+    hmm_mat4 Result;
+
+    int Columns;
     for(Columns = 0; Columns < 4; ++Columns)
     {
         int Rows;
@@ -1356,10 +1371,9 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(AddMat4)(hmm_mat4 Left, hmm_mat4 Right)
             Result.Elements[Columns][Rows] = Left.Elements[Columns][Rows] + Right.Elements[Columns][Rows];
         }
     }
-#endif
-
 
     return (Result);
+#endif
 }
 
 COVERAGE(HMM_SubtractMat4, 1)
@@ -1367,14 +1381,18 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(SubtractMat4)(hmm_mat4 Left, hmm_mat4 Right)
 {
     ASSERT_COVERED(HMM_SubtractMat4);
 
+#ifdef HANDMADE_MATH__USE_SSE
     hmm_mat4 Result;
 
-#ifdef HANDMADE_MATH__USE_SSE
     Result.Columns[0] = _mm_sub_ps(Left.Columns[0], Right.Columns[0]);
     Result.Columns[1] = _mm_sub_ps(Left.Columns[1], Right.Columns[1]);
     Result.Columns[2] = _mm_sub_ps(Left.Columns[2], Right.Columns[2]);
     Result.Columns[3] = _mm_sub_ps(Left.Columns[3], Right.Columns[3]);
+
+    return (Result);
 #else
+    hmm_mat4 Result;
+
     int Columns;
     for(Columns = 0; Columns < 4; ++Columns)
     {
@@ -1384,9 +1402,9 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(SubtractMat4)(hmm_mat4 Left, hmm_mat4 Right)
             Result.Elements[Columns][Rows] = Left.Elements[Columns][Rows] - Right.Elements[Columns][Rows];
         }
     }
-#endif
 
     return (Result);
+#endif
 }
 
 COVERAGE(HMM_MultiplyMat4, 1)
@@ -1423,21 +1441,24 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(MultiplyMat4)(hmm_mat4 Left, hmm_mat4 Right)
     return (Result);
 }
 
-
 COVERAGE(HMM_MultiplyMat4f, 1)
 HMM_INLINE hmm_mat4 HMM_PREFIX(MultiplyMat4f)(hmm_mat4 Matrix, float Scalar)
 {
     ASSERT_COVERED(HMM_MultiplyMat4f);
 
+#ifdef HANDMADE_MATH__USE_SSE
     hmm_mat4 Result;
 
-#ifdef HANDMADE_MATH__USE_SSE
     __m128 SSEScalar = _mm_set1_ps(Scalar);
     Result.Columns[0] = _mm_mul_ps(Matrix.Columns[0], SSEScalar);
     Result.Columns[1] = _mm_mul_ps(Matrix.Columns[1], SSEScalar);
     Result.Columns[2] = _mm_mul_ps(Matrix.Columns[2], SSEScalar);
     Result.Columns[3] = _mm_mul_ps(Matrix.Columns[3], SSEScalar);
+
+    return (Result);
 #else
+    hmm_mat4 Result;
+
     int Columns;
     for(Columns = 0; Columns < 4; ++Columns)
     {
@@ -1447,9 +1468,9 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(MultiplyMat4f)(hmm_mat4 Matrix, float Scalar)
             Result.Elements[Columns][Rows] = Matrix.Elements[Columns][Rows] * Scalar;
         }
     }
-#endif
 
     return (Result);
+#endif
 }
 
 COVERAGE(HMM_MultiplyMat4ByVec4, 1)
@@ -1478,21 +1499,24 @@ HMM_INLINE hmm_vec4 HMM_PREFIX(MultiplyMat4ByVec4)(hmm_mat4 Matrix, hmm_vec4 Vec
     return (Result);
 }
 
-
 COVERAGE(HMM_DivideMat4f, 1)
 HMM_INLINE hmm_mat4 HMM_PREFIX(DivideMat4f)(hmm_mat4 Matrix, float Scalar)
 {
     ASSERT_COVERED(HMM_DivideMat4f);
 
+#ifdef HANDMADE_MATH__USE_SSE
     hmm_mat4 Result;
 
-#ifdef HANDMADE_MATH__USE_SSE
     __m128 SSEScalar = _mm_set1_ps(Scalar);
     Result.Columns[0] = _mm_div_ps(Matrix.Columns[0], SSEScalar);
     Result.Columns[1] = _mm_div_ps(Matrix.Columns[1], SSEScalar);
     Result.Columns[2] = _mm_div_ps(Matrix.Columns[2], SSEScalar);
     Result.Columns[3] = _mm_div_ps(Matrix.Columns[3], SSEScalar);
+
+    return (Result);
 #else
+    hmm_mat4 Result;
+
     int Columns;
     for(Columns = 0; Columns < 4; ++Columns)
     {
@@ -1502,11 +1526,12 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(DivideMat4f)(hmm_mat4 Matrix, float Scalar)
             Result.Elements[Columns][Rows] = Matrix.Elements[Columns][Rows] / Scalar;
         }
     }
-#endif
 
     return (Result);
+#endif
 }
 
+
 /*
  * Common graphics transformations
  */
@@ -1531,7 +1556,7 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Orthographic)(float Left, float Right, float Bott
 }
 
 COVERAGE(HMM_Perspective, 1)
-HMM_INLINE hmm_mat4 HMM_PREFIX(Perspective)(float FOV, float AspectRatio, float Near, float Far)
+HMM_INLINE hmm_mat4 HMM_PREFIX(Perspective)(float FOVRadians, float AspectRatio, float Near, float Far)
 {
     ASSERT_COVERED(HMM_Perspective);
 
@@ -1539,7 +1564,7 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Perspective)(float FOV, float AspectRatio, float
 
     // See https://www.khronos.org/registry/OpenGL-Refpages/gl2.1/xhtml/gluPerspective.xml
 
-    float Cotangent = 1.0f / HMM_PREFIX(TanF)(FOV * (HMM_PI32 / 360.0f));
+    float Cotangent = 1.0f / HMM_PREFIX(TanF)(FOVRadians / 2.0f);
 
     Result.Elements[0][0] = Cotangent / AspectRatio;
     Result.Elements[1][1] = Cotangent;
@@ -1566,7 +1591,7 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Translate)(hmm_vec3 Translation)
 }
 
 COVERAGE(HMM_Rotate, 1)
-HMM_INLINE hmm_mat4 HMM_PREFIX(Rotate)(float Angle, hmm_vec3 Axis)
+HMM_INLINE hmm_mat4 HMM_PREFIX(Rotate)(float AngleRadians, hmm_vec3 Axis)
 {
     ASSERT_COVERED(HMM_Rotate);
 
@@ -1574,8 +1599,8 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Rotate)(float Angle, hmm_vec3 Axis)
 
     Axis = HMM_PREFIX(NormalizeVec3)(Axis);
 
-    float SinTheta = HMM_PREFIX(SinF)(HMM_PREFIX(ToRadians)(Angle));
-    float CosTheta = HMM_PREFIX(CosF)(HMM_PREFIX(ToRadians)(Angle));
+    float SinTheta = HMM_PREFIX(SinF)(AngleRadians);
+    float CosTheta = HMM_PREFIX(CosF)(AngleRadians);
     float CosValue = 1.0f - CosTheta;
 
     Result.Elements[0][0] = (Axis.X * Axis.X * CosValue) + CosTheta;
@@ -1593,8 +1618,6 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(Rotate)(float Angle, hmm_vec3 Axis)
     return (Result);
 }
 
-
-
 COVERAGE(HMM_Scale, 1)
 HMM_INLINE hmm_mat4 HMM_PREFIX(Scale)(hmm_vec3 Scale)
 {
@@ -1643,6 +1666,7 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(LookAt)(hmm_vec3 Eye, hmm_vec3 Center, hmm_vec3 U
     return (Result);
 }
 
+
 /*
  * Quaternion operations
  */
@@ -1819,25 +1843,29 @@ HMM_INLINE float HMM_PREFIX(DotQuaternion)(hmm_quaternion Left, hmm_quaternion R
     return (Result);
 }
 
-
 COVERAGE(HMM_InverseQuaternion, 1)
-HMM_INLINE hmm_quaternion HMM_PREFIX(InverseQuaternion)(hmm_quaternion Left)
+HMM_INLINE hmm_quaternion HMM_InverseQuaternion(hmm_quaternion Left)
 {
     ASSERT_COVERED(HMM_InverseQuaternion);
 
+    hmm_quaternion Conjugate;
     hmm_quaternion Result;
+    float Norm = 0;
+    float NormSquared = 0;
 
-    Result.X = -Left.X;
-    Result.Y = -Left.Y;
-    Result.Z = -Left.Z;
-    Result.W = Left.W;
+    Conjugate.X = -Left.X;
+    Conjugate.Y = -Left.Y;
+    Conjugate.Z = -Left.Z;
+    Conjugate.W = Left.W;
 
-    Result = HMM_PREFIX(DivideQuaternionF)(Result, (HMM_PREFIX(DotQuaternion)(Left, Left)));
+    Norm = HMM_PREFIX(SquareRootF)(HMM_PREFIX(DotQuaternion)(Left, Left));
+    NormSquared = Norm * Norm;
+
+    Result = HMM_PREFIX(DivideQuaternionF)(Conjugate, NormSquared);
 
     return (Result);
 }
 
-
 COVERAGE(HMM_NormalizeQuaternion, 1)
 HMM_INLINE hmm_quaternion HMM_PREFIX(NormalizeQuaternion)(hmm_quaternion Left)
 {
@@ -1901,7 +1929,7 @@ HMM_INLINE hmm_quaternion HMM_PREFIX(Slerp)(hmm_quaternion Left, float Time, hmm
 }
 
 COVERAGE(HMM_QuaternionToMat4, 1)
-HMM_INLINE hmm_mat4 HMM_PREFIX(QuaternionToMat4)(hmm_quaternion Left)
+HMM_INLINE hmm_mat4 HMM_QuaternionToMat4(hmm_quaternion Left)
 {
     ASSERT_COVERED(HMM_QuaternionToMat4);
 
@@ -1961,7 +1989,7 @@ HMM_INLINE hmm_mat4 HMM_PREFIX(QuaternionToMat4)(hmm_quaternion Left)
 // Don't be confused! Or if you must be confused, at least trust this
 // comment. :)
 COVERAGE(HMM_Mat4ToQuaternion, 4)
-HMM_INLINE hmm_quaternion HMM_PREFIX(Mat4ToQuaternion)(hmm_mat4 M)
+HMM_INLINE hmm_quaternion HMM_Mat4ToQuaternion(hmm_mat4 M)
 {
     float T;
     hmm_quaternion Q;
@@ -2018,17 +2046,17 @@ HMM_INLINE hmm_quaternion HMM_PREFIX(Mat4ToQuaternion)(hmm_mat4 M)
 }
 
 COVERAGE(HMM_QuaternionFromAxisAngle, 1)
-HMM_INLINE hmm_quaternion HMM_PREFIX(QuaternionFromAxisAngle)(hmm_vec3 Axis, float AngleOfRotation)
+HMM_INLINE hmm_quaternion HMM_QuaternionFromAxisAngle(hmm_vec3 Axis, float AngleOfRotationRadians)
 {
     ASSERT_COVERED(HMM_QuaternionFromAxisAngle);
 
     hmm_quaternion Result;
 
     hmm_vec3 AxisNormalized = HMM_PREFIX(NormalizeVec3)(Axis);
-    float SineOfRotation = HMM_PREFIX(SinF)(AngleOfRotation / 2.0f);
+    float SineOfRotation = HMM_PREFIX(SinF)(AngleOfRotationRadians / 2.0f);
 
     Result.XYZ = HMM_PREFIX(MultiplyVec3f)(AxisNormalized, SineOfRotation);
-    Result.W = HMM_PREFIX(CosF)(AngleOfRotation / 2.0f);
+    Result.W = HMM_PREFIX(CosF)(AngleOfRotationRadians / 2.0f);
 
     return (Result);
 }
@@ -2045,6 +2073,7 @@ HMM_INLINE float HMM_PREFIX(Length)(hmm_vec2 A)
     ASSERT_COVERED(HMM_LengthVec2CPP);
 
     float Result = HMM_PREFIX(LengthVec2)(A);
+
     return (Result);
 }
 
@@ -3124,46 +3153,6 @@ HMM_INLINE hmm_bool operator!=(hmm_vec4 Left, hmm_vec4 Right)
     return !HMM_PREFIX(EqualsVec4)(Left, Right);
 }
 
-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;
-    return(Result);
-}
-
-COVERAGE(HMM_UnaryMinusVec3, 1)
-HMM_INLINE hmm_vec3 operator-(hmm_vec3 In)
-{
-    ASSERT_COVERED(HMM_UnaryMinusVec3);
-
-    hmm_vec3 Result;
-    Result.X = -In.X;
-    Result.Y = -In.Y;
-    Result.Z = -In.Z;
-    return(Result);
-}
-
-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));
-#else
-    Result.X = -In.X;
-    Result.Y = -In.Y;
-    Result.Z = -In.Z;
-    Result.W = -In.W;
-#endif
-    return(Result);
-}
-
 #endif /* __cplusplus */
 
 #if defined(__GNUC__) || defined(__clang__)
@@ -3171,6 +3160,3 @@ HMM_INLINE hmm_vec4 operator-(hmm_vec4 In)
 #endif
 
 #endif /* HANDMADE_MATH_H */
-
-
-

README.md

@@ -10,10 +10,6 @@ To get started, go download [the latest release](https://github.com/HandmadeMath
 
 Version         | Changes        |
 ----------------|----------------|
-
-**1.13.0** | Fully inlined HandmadeMath.h. No need for HANDMADE_MATH_IMPLEMENTATION anymore |
-**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)`. |
 **1.10.1** | Removed stdint.h, this doesn't exist on some really old compilers and we didn't really use it anyways. |
@@ -42,7 +38,7 @@ Version         | Changes        |
 **0.5**     | Added scalar operations on vectors and matrices, added += and -= for hmm_mat4, reconciled headers and implementations, tidied up in general |
 **0.4**     | Added SSE Optimized HMM_SqrtF, HMM_RSqrtF, Removed use of C Runtime | 
 **0.3**     | Added +=,-=, *=, /= for hmm_vec2, hmm_vec3, hmm_vec4 | 
-**0.2b**    | Disabled warning C4201 on MSVC, Added 64bit precision on HMM_PI | 
+**0.2b**    | Disabled warning C4201 on MSVC, Added 64bit percision on HMM_PI | 
 **0.2a**    | Prefixed Macros | 
 **0.2**     | Updated Documentation, Fixed C Compliance, Prefixed all functions, and added better operator overloading | 
 **0.1**     | Initial Version | 

test/HandmadeMath.c

@@ -2,6 +2,4 @@
 #include "HandmadeTest.h"
 #endif
 
-#define HANDMADE_MATH_IMPLEMENTATION
-#define HANDMADE_MATH_NO_INLINE
 #include "../HandmadeMath.h"

test/categories/Projection.h

@@ -15,7 +15,7 @@ TEST(Projection, Orthographic)
 
 TEST(Projection, Perspective)
 {
-    hmm_mat4 projection = HMM_Perspective(90.0f, 2.0f, 5.0f, 15.0f);
+    hmm_mat4 projection = HMM_Perspective(HMM_ToRadians(90.0f), 2.0f, 5.0f, 15.0f);
 
     {
         hmm_vec3 original = HMM_Vec3(5.0f, 5.0f, -15.0f);

test/categories/QuaternionOps.h

@@ -111,7 +111,7 @@ TEST(QuaternionOps, Mat4ToQuat)
 
     // Rotate 90 degrees on the X axis
     {
-        hmm_mat4 m = HMM_Rotate(90, HMM_Vec3(1, 0, 0));
+        hmm_mat4 m = HMM_Rotate(HMM_ToRadians(90.0f), HMM_Vec3(1, 0, 0));
         hmm_quaternion result = HMM_Mat4ToQuaternion(m);
 
         float cosf = 0.707107f; // cos(90/2 degrees)
@@ -125,7 +125,7 @@ TEST(QuaternionOps, Mat4ToQuat)
 
     // Rotate 90 degrees on the Y axis (axis not normalized, just for fun)
     {
-        hmm_mat4 m = HMM_Rotate(90, HMM_Vec3(0, 2, 0));
+        hmm_mat4 m = HMM_Rotate(HMM_ToRadians(90.0f), HMM_Vec3(0, 2, 0));
         hmm_quaternion result = HMM_Mat4ToQuaternion(m);
 
         float cosf = 0.707107f; // cos(90/2 degrees)
@@ -139,7 +139,7 @@ TEST(QuaternionOps, Mat4ToQuat)
 
     // Rotate 90 degrees on the Z axis
     {
-        hmm_mat4 m = HMM_Rotate(90, HMM_Vec3(0, 0, 1));
+        hmm_mat4 m = HMM_Rotate(HMM_ToRadians(90.0f), HMM_Vec3(0, 0, 1));
         hmm_quaternion result = HMM_Mat4ToQuaternion(m);
 
         float cosf = 0.707107f; // cos(90/2 degrees)
@@ -153,7 +153,7 @@ TEST(QuaternionOps, Mat4ToQuat)
 
     // Rotate 45 degrees on the X axis (this hits case 4)
     {
-        hmm_mat4 m = HMM_Rotate(45, HMM_Vec3(1, 0, 0));
+        hmm_mat4 m = HMM_Rotate(HMM_ToRadians(45.0f), HMM_Vec3(1, 0, 0));
         hmm_quaternion result = HMM_Mat4ToQuaternion(m);
 
         float cosf = 0.9238795325f; // cos(90/2 degrees)

test/categories/ScalarMath.h

@@ -36,6 +36,13 @@ TEST(ScalarMath, Trigonometry)
     // checking that things work by default.
 }
 
+TEST(ScalarMath, ToDegrees)
+{
+    EXPECT_FLOAT_EQ(HMM_ToDegrees(0.0f), 0.0f);
+    EXPECT_FLOAT_EQ(HMM_ToDegrees(HMM_PI32), 180.0f);
+    EXPECT_FLOAT_EQ(HMM_ToDegrees(-HMM_PI32), -180.0f);
+}
+
 TEST(ScalarMath, ToRadians)
 {
     EXPECT_FLOAT_EQ(HMM_ToRadians(0.0f), 0.0f);

test/categories/Subtraction.h

@@ -199,32 +199,3 @@ TEST(Subtraction, Quaternion)
     EXPECT_FLOAT_EQ(q1.W, -4.0f);
 #endif
 }
-
-#ifdef __cplusplus
-TEST(UnaryMinus, Vec2)
-{
-    hmm_vec2 VectorOne = {1.0f, 2.0f};
-    hmm_vec2 Result = -VectorOne;
-    EXPECT_FLOAT_EQ(Result.X, -1.0f);
-    EXPECT_FLOAT_EQ(Result.Y, -2.0f);
-}
-
-TEST(UnaryMinus, Vec3)
-{
-    hmm_vec3 VectorOne = {1.0f, 2.0f, 3.0f};
-    hmm_vec3 Result = -VectorOne;
-    EXPECT_FLOAT_EQ(Result.X, -1.0f);
-    EXPECT_FLOAT_EQ(Result.Y, -2.0f);
-    EXPECT_FLOAT_EQ(Result.Z, -3.0f);
-}
-
-TEST(UnaryMinus, Vec4)
-{
-    hmm_vec4 VectorOne = {1.0f, 2.0f, 3.0f, 4.0f};
-    hmm_vec4 Result = -VectorOne;
-    EXPECT_FLOAT_EQ(Result.X, -1.0f);
-    EXPECT_FLOAT_EQ(Result.Y, -2.0f);
-    EXPECT_FLOAT_EQ(Result.Z, -3.0f);
-    EXPECT_FLOAT_EQ(Result.W, -4.0f);
-}
-#endif

test/categories/Transformation.h

@@ -17,21 +17,23 @@ TEST(Transformations, Rotate)
 {
     hmm_vec3 original = HMM_Vec3(1.0f, 1.0f, 1.0f);
 
-    hmm_mat4 rotateX = HMM_Rotate(90, HMM_Vec3(1, 0, 0));
+    float angle = HMM_ToRadians(90.0f);
+
+    hmm_mat4 rotateX = HMM_Rotate(angle, HMM_Vec3(1, 0, 0));
     hmm_vec4 rotatedX = HMM_MultiplyMat4ByVec4(rotateX, HMM_Vec4v(original, 1));
     EXPECT_FLOAT_EQ(rotatedX.X, 1.0f);
     EXPECT_FLOAT_EQ(rotatedX.Y, -1.0f);
     EXPECT_FLOAT_EQ(rotatedX.Z, 1.0f);
     EXPECT_FLOAT_EQ(rotatedX.W, 1.0f);
 
-    hmm_mat4 rotateY = HMM_Rotate(90, HMM_Vec3(0, 1, 0));
+    hmm_mat4 rotateY = HMM_Rotate(angle, HMM_Vec3(0, 1, 0));
     hmm_vec4 rotatedY = HMM_MultiplyMat4ByVec4(rotateY, HMM_Vec4v(original, 1));
     EXPECT_FLOAT_EQ(rotatedY.X, 1.0f);
     EXPECT_FLOAT_EQ(rotatedY.Y, 1.0f);
     EXPECT_FLOAT_EQ(rotatedY.Z, -1.0f);
     EXPECT_FLOAT_EQ(rotatedY.W, 1.0f);
 
-    hmm_mat4 rotateZ = HMM_Rotate(90, HMM_Vec3(0, 0, 1));
+    hmm_mat4 rotateZ = HMM_Rotate(angle, HMM_Vec3(0, 0, 1));
     hmm_vec4 rotatedZ = HMM_MultiplyMat4ByVec4(rotateZ, HMM_Vec4v(original, 1));
     EXPECT_FLOAT_EQ(rotatedZ.X, -1.0f);
     EXPECT_FLOAT_EQ(rotatedZ.Y, 1.0f);

test/run_test_clang.bat

@@ -1,18 +0,0 @@
-@echo off
-
-if not exist "build" mkdir build
-pushd build
-
-clang-cl /Fehmm_test_c.exe ..\HandmadeMath.c ..\hmm_test.c
-hmm_test_c
-
-clang-cl /Fehmm_test_c_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.c ..\hmm_test.c
-hmm_test_c_no_sse
-
-clang-cl /Fehmm_test_cpp.exe ..\HandmadeMath.cpp ..\hmm_test.cpp
-hmm_test_cpp
-
-clang-cl /Fehmm_test_cpp_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.cpp ..\hmm_test.cpp
-hmm_test_cpp_no_sse
-
-popd

test/test.bat

@@ -12,16 +12,16 @@ if "%1%"=="travis" (
 if not exist "build" mkdir build
 pushd build
 
-cl /Fehmm_test_c.exe ..\HandmadeMath.c ..\hmm_test.c
+cl /Fehmm_test_c.exe ..\HandmadeMath.c ..\hmm_test.c || popd && exit /B
 hmm_test_c
 
-cl /Fehmm_test_c_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.c ..\hmm_test.c
+cl /Fehmm_test_c_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.c ..\hmm_test.c || popd && exit /B
 hmm_test_c_no_sse
 
-cl /Fehmm_test_cpp.exe ..\HandmadeMath.cpp ..\hmm_test.cpp
+cl /Fehmm_test_cpp.exe ..\HandmadeMath.cpp ..\hmm_test.cpp || popd && exit /B
 hmm_test_cpp
 
-cl /Fehmm_test_cpp_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.cpp ..\hmm_test.cpp
+cl /Fehmm_test_cpp_no_sse.exe /DHANDMADE_MATH_NO_SSE ..\HandmadeMath.cpp ..\hmm_test.cpp || popd && exit /B
 hmm_test_cpp_no_sse
 
 popd