From df7bc64aec74a43851b9fa71a5ff821602565801 Mon Sep 17 00:00:00 2001
From: Trinton Bullard <trintonbullard@gmail.com>
Date: Mon, 19 Dec 2016 15:32:27 -0700
Subject: [PATCH] Removed gbmath includes

---
 HandmadeMath.h                 |  53 +++++++++++++++++++++++----------
 test/.vs/HandmadeMath/v14/.suo | Bin 0 -> 5120 bytes
 test/HandmadeMath.cpp          |   5 ++--
 3 files changed, 39 insertions(+), 19 deletions(-)
 create mode 100644 test/.vs/HandmadeMath/v14/.suo

diff --git a/HandmadeMath.h b/HandmadeMath.h
index ee59212..e9be89b 100644
--- a/HandmadeMath.h
+++ b/HandmadeMath.h
@@ -473,13 +473,13 @@ HMMDEF hmm_mat4 HMM_LookAt(hmm_vec3 Eye, hmm_vec3 Center, hmm_vec3 Up);
 
 HMMDEF hmm_quaternion HMM_Quaternion(float X, float Y, float Z, float W);
 HMMDEF hmm_quaternion HMM_QuaternionV4(hmm_vec4 Vector);
-HMMDEF hmm_quaternion HMM_AddQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
-HMMDEF hmm_quaternion HMM_SubQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
-HMMDEF hmm_quaternion HMM_MulQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
-HMMDEF hmm_quaternion HMM_DivQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
+HMMDEF hmm_quaternion HMM_Quaternion_Addition(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
+HMMDEF hmm_quaternion HMM_Quaternion_Subtraction(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
+HMMDEF hmm_quaternion HMM_Multiply_Quaternion(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
+HMMDEF hmm_quaternion HMM_Multiply_Quaternion_Float(hmm_quaternion QuaternionOne, float Multiplicative);
+HMMDEF hmm_quaternion HMM_Quaternion_Divide(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
 HMMDEF float HMM_DotQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo);
-//HMMDef hmm_quaternion HMM_Slerp(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo, float time);
-//TODO(Trent): Don't forget the line numbers!
+HMMDEF hmm_quaternion HMM_Slerp(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo, float time);
 
 #ifdef __cplusplus
 }
@@ -1517,7 +1517,7 @@ HMM_QuaternionV4(hmm_vec4 Vector)
 }
 
 HINLINE hmm_quaternion
-HMM_AddQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
+HMM_Quaternion_Addition(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 {
     hmm_quaternion Result = {0};
 
@@ -1530,7 +1530,7 @@ HMM_AddQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 }
 
 HINLINE hmm_quaternion
-HMM_SubQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
+HMM_Quaternion_Subtraction(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 {
     hmm_quaternion Result = {0};
 
@@ -1543,20 +1543,33 @@ HMM_SubQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 }
 
 HINLINE hmm_quaternion
-HMM_MulQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
+HMM_Multiply_Quaternion(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 {
     hmm_quaternion Result = {0};
 
-    Result.X = QuaternionOne.X * QuaternionTwo.X;
-    Result.Y = QuaternionOne.Y * QuaternionTwo.Y;
-    Result.Z = QuaternionOne.Z * QuaternionTwo.Z;
-    Result.W = QuaternionOne.W * QuaternionTwo.W;
+    Result.X = QuaternionOne.X * QuaternionTwo.W + QuaternionOne.Y * QuaternionTwo.Z - QuaternionOne.Z * QuaternionTwo.Y + QuaternionOne.W * QuaternionTwo.X;
+    Result.Y = -QuaternionOne.X * QuaternionTwo.Z + QuaternionOne.Y * QuaternionTwo.W + QuaternionOne.Z * QuaternionTwo.X + QuaternionOne.W * QuaternionTwo.Y;
+    Result.Z = QuaternionOne.X * QuaternionTwo.Y - QuaternionOne.Y * QuaternionTwo.X + QuaternionOne.Z * QuaternionTwo.W + QuaternionOne.W * QuaternionTwo.Z;
+    Result.W = -QuaternionOne.X * QuaternionTwo.X - QuaternionOne.Y * QuaternionTwo.Y - QuaternionOne.Z * QuaternionTwo.Z + QuaternionOne.W * QuaternionTwo.W;
 
     return(Result);
 }
 
 HINLINE hmm_quaternion
-HMM_DivQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
+HMM_Multiply_Quaternion_Float(hmm_quaternion QuaternionOne, float Multiplicative)
+{
+    hmm_quaternion Result = {0};
+
+    Result.X = QuaternionOne.X * Multiplicative;
+    Result.Y = QuaternionOne.Y * Multiplicative;
+    Result.Z = QuaternionOne.Z * Multiplicative;
+    Result.W = QuaternionOne.W * Multiplicative;
+
+    return(Result);
+}
+
+HINLINE hmm_quaternion
+HMM_Division_Quaternion(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 {
     hmm_quaternion Result = {0};
 
@@ -1569,7 +1582,7 @@ HMM_DivQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 }
 
 HINLINE float
-HMM_DotQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
+HMM_Dot_Quaternion(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 {
     float Result = 0.00f;
 
@@ -1579,7 +1592,7 @@ HMM_DotQuat(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo)
 }
 
 HINLINE hmm_quaternion
-HMM_Slerp(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo, float time)
+HMM_Quaternion_Slerp(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo, float time)
 {
     hmm_quaternion Result = {0};
     hmm_quaternion QuaternionLeft = {0};
@@ -1615,6 +1628,14 @@ HMM_Slerp(hmm_quaternion QuaternionOne, hmm_quaternion QuaternionTwo, float time
     return(Result);
 }
 
+HINLINE hmm_mat4
+HMM_Quaternion_To_Mat4(hmm_quaternion Quaternion)
+{
+    hmm_mat4 Result = {0};
+
+    Result.
+}
+
 #ifdef HANDMADE_MATH_CPP_MODE
 
 HMMDEF float 
diff --git a/test/.vs/HandmadeMath/v14/.suo b/test/.vs/HandmadeMath/v14/.suo
new file mode 100644
index 0000000000000000000000000000000000000000..cd716b5e92e9e19814e87ae73f30dc846454ea0a
GIT binary patch
literal 5120
zcmca`Uhu)fjZzO8(10BSGsD0CoD6J8;*1Oo3`{V-00RRH0|Ns{?BD<Y|3Sjc3=9na
zN5PN^fgpx_hJ1z+1_cIJhCGH6h9ZVaP*f6)#TZ!OaSl%#ICO7td2r=^;3Y<O1_lNP
zP{LtgU<hC+V#sI6V(?_hV@PAjXK-bxz@Zzvuowdq+<s8NV^@VL3QD&EP$7SYQic+S
z9EMDWJTOjY2xcf@NMtBsNCmsa5ULIrrNY3(2=WRn?c-91F1`gS5X_LwkPHolGKNfs
z6oyoWA_hH%V1|5#9I)Fm8S)wO81xu?81fks8B!RW8S)uQ!EpsL!j268gWL)V1CV}D
z-u(*-I5Z3r2VpefQSLAc0ea?thVaeTK>42ol<=U11r_o?BXX30j3$IZ<<Bt6|BRr#
z3=0E7eh0}T=YN<!Rt5$JP&oj~^B@cpM`pvsM(N=b0-(AJlodho48ovv0BZAr*dRQ7
zd^+kAY#~6X{bK|wFz{d%GTI-Y@@g3#Gf9;~_7|yosiA%-+mD|ANAo;#Yz}{RAEPsa
z6+;X|C_^#0=TXcM!w|wy1nvu!fO{S>3@!}$49N_o47m)c;C=^44XoXk%8<-Z!T=KS
zU`S-hV@P4h1@}@?8FU$Z!TqQVh8S>fs+ggKA%+266-<pDLo!1FLjeQp<ldUuWv^{F
zbY4w;T<E(Elt0m90VD>)pt|dp^ygy=_B!X^&v@Vp6DOA5@@R7>CHjfAXRxXp>G9vd
qm`sQCk2}?8Fch?^JvDIipE5OYa$CWQ@Ry*Jf-l8`<Pn(C^a}ty(+l(f

literal 0
HcmV?d00001

diff --git a/test/HandmadeMath.cpp b/test/HandmadeMath.cpp
index 7bb4719..6542904 100644
--- a/test/HandmadeMath.cpp
+++ b/test/HandmadeMath.cpp
@@ -2,6 +2,5 @@
 #define HANDMADE_MATH_IMPLEMENTATION
 #define HANDMADE_MATH_CPP_MODE
 #define HANDMADE_MATH_NO_INLINE
-#define GB_MATH_IMPLEMENTATION
-#include "../HandmadeMath.h"
-#include "../gb_math.h"
\ No newline at end of file
+
+#include "../HandmadeMath.h"
\ No newline at end of file