falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git subrepo pull (merge) lib/sead 

subrepo:
  subdir:   "lib/sead"
  merged:   "14326b350"
upstream:
  origin:   "https://github.com/open-ead/sead"
  branch:   "master"
  commit:   "14326b350"
git-subrepo:
  version:  "0.4.3"
  origin:   "ssh://git@github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"
This commit is contained in:
Léo Lam 2022-03-22 19:26:48 +01:00
parent 0197ca3aba
commit 7ca13b5938
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
5 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/sead/.gitrepo
View File

@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/open-ead/sead
branch = master
commit = 1b66e825d1927254c191028523645541b13c7eab
parent = ffcc7f659ebc9bc9d149e52bec553b906bb47369
commit = 14326b3504f5b3909e4482820ca16a6071f3eb5e
parent = 0197ca3aba7ac2d26b978258ac5615fd35bfcd25
method = merge
cmdver = 0.4.3

6
lib/sead/include/math/seadMathBase.h
View File

@ -74,7 +74,7 @@ struct BaseMtx33
union
{
T m[3][3];
T a[9];
std::array<T, 9> a;
};
};
@ -84,7 +84,7 @@ struct BaseMtx34
union
{
T m[3][4];
T a[12];
std::array<T, 12> a;
};
};
@ -94,7 +94,7 @@ struct BaseMtx44
union
{
T m[4][4];
T a[16];
std::array<T, 16> a;
};
};

5
lib/sead/include/math/seadMatrix.h
View File

@ -283,6 +283,11 @@ const Matrix44<f64> Matrix44<f64>::zero;
template <>
const Matrix44<f64> Matrix44<f64>::ident;
template <typename T>
bool operator==(const Matrix34<T>& lhs, const Matrix34<T>& rhs);
template <typename T>
bool operator!=(const Matrix34<T>& lhs, const Matrix34<T>& rhs);
} // namespace sead
#define SEAD_MATH_MATRIX_H_

12
lib/sead/include/math/seadMatrix.hpp
View File

@ -710,4 +710,16 @@ inline void Matrix44<T>::setRow(s32 row, const Vec4& v)
Matrix44CalcCommon<T>::setRow(*this, row, v);
}
template <typename T>
inline bool operator==(const Matrix34<T>& lhs, const Matrix34<T>& rhs)
{
return lhs.a == rhs.a;
}
template <typename T>
inline bool operator!=(const Matrix34<T>& lhs, const Matrix34<T>& rhs)
{
return lhs.a != rhs.a;
}
} // namespace sead

15
lib/sead/include/math/seadMatrixCalcCommon.hpp
View File

@ -692,20 +692,7 @@ void Matrix33CalcCommon<T>::toQuat(Quat& q, const Base& n)
template <typename T>
void Matrix34CalcCommon<T>::makeIdentity(Base& o)
{
o.m[0][0] = 1;
o.m[0][1] = 0;
o.m[0][2] = 0;
o.m[0][3] = 0;
o.m[1][0] = 0;
o.m[1][1] = 1;
o.m[1][2] = 0;
o.m[1][3] = 0;
o.m[2][0] = 0;
o.m[2][1] = 0;
o.m[2][2] = 1;
o.m[2][3] = 0;
Matrix34CalcCommon<T>::copy(o, Base{{{{1, 0, 0, 0}, {0, 1, 0, 0}, {0, 0, 1, 0}}}});
}
#ifdef cafe