Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-20 06:33:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming conventions for CMatrix4::set(Inverse)RotationRadians() (#15204)

Browse Source
This commit is contained in:
Christian Betancourt Dias 2024-11-19 07:38:19 -05:00 committed by GitHub
parent 15e8f9e6a0
commit b63e988bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
irr/include/matrix4.h
View File

@ -856,27 +856,27 @@ inline CMatrix4<T> &CMatrix4<T>::setInverseRotationDegrees(const vector3d<T> &ro
template <class T> template <class T>
inline CMatrix4<T> &CMatrix4<T>::setRotationRadians(const vector3d<T> &rotation) inline CMatrix4<T> &CMatrix4<T>::setRotationRadians(const vector3d<T> &rotation)
{ {
const f64 cr = cos(rotation.X); const f64 cPitch = cos(rotation.X);
const f64 sr = sin(rotation.X); const f64 sPitch = sin(rotation.X);
const f64 cp = cos(rotation.Y); const f64 cYaw = cos(rotation.Y);
const f64 sp = sin(rotation.Y); const f64 sYaw = sin(rotation.Y);
const f64 cy = cos(rotation.Z); const f64 cRoll = cos(rotation.Z);
const f64 sy = sin(rotation.Z); const f64 sRoll = sin(rotation.Z);
M[0] = (T)(cp * cy); M[0] = (T)(cYaw * cRoll);
M[1] = (T)(cp * sy); M[1] = (T)(cYaw * sRoll);
M[2] = (T)(-sp); M[2] = (T)(-sYaw);
const f64 srsp = sr * sp; const f64 sPitch_sYaw = sPitch * sYaw;
const f64 crsp = cr * sp; const f64 cPitch_sYaw = cPitch * sYaw;
M[4] = (T)(srsp * cy - cr * sy); M[4] = (T)(sPitch_sYaw * cRoll - cPitch * sRoll);
M[5] = (T)(srsp * sy + cr * cy); M[5] = (T)(sPitch_sYaw * sRoll + cPitch * cRoll);
M[6] = (T)(sr * cp); M[6] = (T)(sPitch * cYaw);
M[8] = (T)(crsp * cy + sr * sy); M[8] = (T)(cPitch_sYaw * cRoll + sPitch * sRoll);
M[9] = (T)(crsp * sy - sr * cy); M[9] = (T)(cPitch_sYaw * sRoll - sPitch * cRoll);
M[10] = (T)(cr * cp); M[10] = (T)(cPitch * cYaw);
#if defined(USE_MATRIX_TEST) #if defined(USE_MATRIX_TEST)
definitelyIdentityMatrix = false; definitelyIdentityMatrix = false;
#endif #endif
@ -960,27 +960,27 @@ inline core::vector3d<T> CMatrix4<T>::getRotationDegrees() const
template <class T> template <class T>
inline CMatrix4<T> &CMatrix4<T>::setInverseRotationRadians(const vector3d<T> &rotation) inline CMatrix4<T> &CMatrix4<T>::setInverseRotationRadians(const vector3d<T> &rotation)
{ {
f64 cr = cos(rotation.X); f64 cPitch = cos(rotation.X);
f64 sr = sin(rotation.X); f64 sPitch = sin(rotation.X);
f64 cp = cos(rotation.Y); f64 cYaw = cos(rotation.Y);
f64 sp = sin(rotation.Y); f64 sYaw = sin(rotation.Y);
f64 cy = cos(rotation.Z); f64 cRoll = cos(rotation.Z);
f64 sy = sin(rotation.Z); f64 sRoll = sin(rotation.Z);
M[0] = (T)(cp * cy); M[0] = (T)(cYaw * cRoll);
M[4] = (T)(cp * sy); M[4] = (T)(cYaw * sRoll);
M[8] = (T)(-sp); M[8] = (T)(-sYaw);
f64 srsp = sr * sp; f64 sPitch_sYaw = sPitch * sYaw;
f64 crsp = cr * sp; f64 cPitch_sYaw = cPitch * sYaw;
M[1] = (T)(srsp * cy - cr * sy); M[1] = (T)(sPitch_sYaw * cRoll - cPitch * sRoll);
M[5] = (T)(srsp * sy + cr * cy); M[5] = (T)(sPitch_sYaw * sRoll + cPitch * cRoll);
M[9] = (T)(sr * cp); M[9] = (T)(sPitch * cYaw);
M[2] = (T)(crsp * cy + sr * sy); M[2] = (T)(cPitch_sYaw * cRoll + sPitch * sRoll);
M[6] = (T)(crsp * sy - sr * cy); M[6] = (T)(cPitch_sYaw * sRoll - sPitch * cRoll);
M[10] = (T)(cr * cp); M[10] = (T)(cPitch * cYaw);
#if defined(USE_MATRIX_TEST) #if defined(USE_MATRIX_TEST)
definitelyIdentityMatrix = false; definitelyIdentityMatrix = false;
#endif #endif