xuanchi/XCEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix world rotation extraction with scaled parents

Browse Source
This commit is contained in:
ssdfasd
2026-04-01 01:25:16 +08:00
parent 618ebed05d
commit 1af3cf87c4
3 changed files with 94 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
engine/src/Core/Math/Matrix.cpp
View File

@@ -308,7 +308,33 @@ Vector3 Matrix4::GetTranslation() const {
}
Quaternion Matrix4::GetRotation() const {
return Quaternion::FromRotationMatrix(*this);
Matrix4 rotationMatrix = *this;
const Vector3 scale = GetScale();
if (scale.x > EPSILON) {
rotationMatrix.m[0][0] /= scale.x;
rotationMatrix.m[1][0] /= scale.x;
rotationMatrix.m[2][0] /= scale.x;
}
if (scale.y > EPSILON) {
rotationMatrix.m[0][1] /= scale.y;
rotationMatrix.m[1][1] /= scale.y;
rotationMatrix.m[2][1] /= scale.y;
}
if (scale.z > EPSILON) {
rotationMatrix.m[0][2] /= scale.z;
rotationMatrix.m[1][2] /= scale.z;
rotationMatrix.m[2][2] /= scale.z;
}
rotationMatrix.m[0][3] = 0.0f;
rotationMatrix.m[1][3] = 0.0f;
rotationMatrix.m[2][3] = 0.0f;
rotationMatrix.m[3][0] = 0.0f;
rotationMatrix.m[3][1] = 0.0f;
rotationMatrix.m[3][2] = 0.0f;
rotationMatrix.m[3][3] = 1.0f;
return Quaternion::FromRotationMatrix(rotationMatrix);
}
Vector3 Matrix4::GetScale() const {