DevKit7/citro3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Fixes series

Browse Source 
- Added a missing @param[in].
- Added @mtheall 's Mtx_Multiply() enhancement.
This commit is contained in:
Thompson Lee 2016-08-04 07:05:25 -04:00 committed by Michael Theall
parent dc4d81eea9
commit 59b0311f48
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/c3d/maths.h
View File

@ -346,9 +346,10 @@ static inline C3D_FVec Mtx_MultiplyFVecH(const C3D_Mtx* mtx, C3D_FVec v)
/** /**
* @brief 3D translation * @brief 3D translation
* @param[in,out] mtx Matrix to translate * @param[in,out] mtx Matrix to translate
* @param[in] x X component to translate * @param[in] x X component to translate
* @param[in] y Y component to translate * @param[in] y Y component to translate
* @param[in] z Z component to translate * @param[in] z Z component to translate
* @param[in] bRightSide Whether to transform from the right side
*/ */
void Mtx_Translate(C3D_Mtx* mtx, float x, float y, float z, bool bRightSide); void Mtx_Translate(C3D_Mtx* mtx, float x, float y, float z, bool bRightSide);

9
source/maths/mtx_multiply.c
View File

@ -2,6 +2,15 @@
void Mtx_Multiply(C3D_Mtx* out, const C3D_Mtx* a, const C3D_Mtx* b) void Mtx_Multiply(C3D_Mtx* out, const C3D_Mtx* a, const C3D_Mtx* b)
{ {
// if out is a or b, then we need to avoid overwriting them
if(out == a || out == b)
{
C3D_Mtx tmp;
Mtx_Multiply(&tmp, a, b);
Mtx_Copy(out, &tmp);
return;
}
// http://www.wolframalpha.com/input/?i={{a,b,c,d},{e,f,g,h},{i,j,k,l},{m,n,o,p}}{{α,β,γ,δ},{ε,θ,ι,κ},{λ,μ,ν,ξ},{ο,π,ρ,σ}} // http://www.wolframalpha.com/input/?i={{a,b,c,d},{e,f,g,h},{i,j,k,l},{m,n,o,p}}{{α,β,γ,δ},{ε,θ,ι,κ},{λ,μ,ν,ξ},{ο,π,ρ,σ}}
int i, j; int i, j;
for (j = 0; j < 4; ++j) for (j = 0; j < 4; ++j)