minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-07-02 00:00:26 +02:00
Code Issues Projects Releases Wiki Activity

Mark some common constructors and other stuff as constexpr

Browse Source
This commit is contained in:
sfan5
2024-03-09 22:05:06 +01:00
parent 1e89db1b80
commit a7dd075dec
11 changed files with 113 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/matrix4.h
View File

@ -62,7 +62,7 @@ namespace core
CMatrix4( eConstructor constructor = EM4CONST_IDENTITY );
//! Constructor with value initialization
CMatrix4(const T& r0c0, const T& r0c1, const T& r0c2, const T& r0c3,
constexpr CMatrix4(const T& r0c0, const T& r0c1, const T& r0c2, const T& r0c3,
const T& r1c0, const T& r1c1, const T& r1c2, const T& r1c3,
const T& r2c0, const T& r2c1, const T& r2c2, const T& r2c3,
const T& r3c0, const T& r3c1, const T& r3c2, const T& r3c3)
@ -119,10 +119,24 @@ namespace core
}
//! Returns true if other matrix is equal to this matrix.
bool operator==(const CMatrix4<T> &other) const;
constexpr bool operator==(const CMatrix4<T> &other) const
{
#if defined ( USE_MATRIX_TEST )
if (definitelyIdentityMatrix && other.definitelyIdentityMatrix)
return true;
#endif
for (s32 i = 0; i < 16; ++i)
if (M[i] != other.M[i])
return false;
return true;
}
//! Returns true if other matrix is not equal to this matrix.
bool operator!=(const CMatrix4<T> &other) const;
constexpr bool operator!=(const CMatrix4<T> &other) const
{
return !(*this == other);
}
//! Add another matrix.
CMatrix4<T> operator+(const CMatrix4<T>& other) const;
@ -1510,28 +1524,6 @@ namespace core
}
template <class T>
inline bool CMatrix4<T>::operator==(const CMatrix4<T> &other) const
{
#if defined ( USE_MATRIX_TEST )
if (definitelyIdentityMatrix && other.definitelyIdentityMatrix)
return true;
#endif
for (s32 i = 0; i < 16; ++i)
if (M[i] != other.M[i])
return false;
return true;
}
template <class T>
inline bool CMatrix4<T>::operator!=(const CMatrix4<T> &other) const
{
return !(*this == other);
}
// Builds a right-handed perspective projection matrix based on a field of view
template <class T>
inline CMatrix4<T>& CMatrix4<T>::buildProjectionMatrixPerspectiveFovRH(