From 9b2c7bf3012d1116cfb90453601e5673937bee15 Mon Sep 17 00:00:00 2001 From: Kyle De'Vir Date: Sun, 29 May 2016 03:39:08 +1000 Subject: [PATCH] Added C++ HMM_MultiplyMat4ByVec4 functionality Added missing prototypes --- HandmadeMath.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/HandmadeMath.h b/HandmadeMath.h index 9856715..8db5f05 100644 --- a/HandmadeMath.h +++ b/HandmadeMath.h @@ -285,6 +285,7 @@ HMMDEF hmm_vec2 HMM_Multiply(int X, int Y); HMMDEF hmm_vec3 HMM_Multiply(int X, int Y, int Z); HMMDEF hmm_vec4 HMM_Multiply(int X, int Y, int Z, int W); HMMDEF hmm_mat4 HMM_Multiply(hmm_mat4 Left, hmm_mat4 Right); +HMMDEF hmm_vec4 HMM_Multiply(hmm_mat4 Matrix, hmm_vec4 Vector); HMMDEF hmm_vec2 HMM_Divide(int X, int Y); HMMDEF hmm_vec3 HMM_Divide(int X, int Y, int Z); @@ -306,6 +307,8 @@ HMMDEF hmm_mat4 operator*(hmm_mat4 Left, hmm_mat4 Right); HMMDEF hmm_vec3 operator*(hmm_vec3 Left, float Right); HMMDEF hmm_vec2 operator*(hmm_vec2 Left, float Right); +HMMDEF hmm_vec4 operator*(hmm_mat4 Matrix, hmm_vec4 Vector); + HMMDEF hmm_vec2 operator/(hmm_vec2 Left, hmm_vec2 Right); HMMDEF hmm_vec3 operator/(hmm_vec3 Left, hmm_vec3 Right); HMMDEF hmm_vec4 operator/(hmm_vec4 Left, hmm_vec4 Right); @@ -1044,14 +1047,6 @@ operator*(hmm_vec4 Left, hmm_vec4 Right) return (Result); } -HINLINE hmm_vec4 -operator*(hmm_mat4 Matrix, hmm_vec4 Vector) -{ - hmm_vec4 Result = Multiply(Matrix, Vector); - - return (Result); -} - HINLINE hmm_mat4 operator*(hmm_mat4 Left, hmm_mat4 Right) { @@ -1060,6 +1055,14 @@ operator*(hmm_mat4 Left, hmm_mat4 Right) return (Result); } +HINLINE hmm_vec4 +operator*(hmm_mat4 Matrix, hmm_vec4 Vector) +{ + hmm_vec4 Result = Multiply(Matrix, Vector); + + return (Result); +} + HINLINE hmm_vec2 operator/(hmm_vec2 Left, hmm_vec2 Right) {