celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work but still broken

Browse Source
This commit is contained in:
Antoine Pilote
2023-07-13 15:57:54 -04:00
parent 8d6b877f7b
commit 44597fbe43
6 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Nuake/src/Core/Maths.cpp
View File

@@ -37,7 +37,14 @@ Quat Nuake::CreateFromAxisAngle(Vector3 axis, float angle)
Quat Nuake::QuatFromEuler(float x, float y, float z)
{
return Quat(Vector3(Rad(z), Rad(y), Rad(x)));
glm::quat yawQuat = glm::angleAxis(Rad(y), glm::vec3(0.0f, 1.0f, 0.0f));
glm::quat rollQuat = glm::angleAxis(Rad(z), glm::vec3(0.0f, 0.0f, 1.0f));
glm::quat pitchQuat = glm::angleAxis(Rad(x), glm::vec3(1.0f, 0.0f, 0.0f));
glm::quat orientation = yawQuat * pitchQuat * rollQuat;
return glm::normalize(orientation);
return Quat(Vector3(Rad(x), Rad(y), Rad(z)));
Quat q;
@@ -57,6 +64,6 @@ Quat Nuake::QuatFromEuler(float x, float y, float z)
Vector3 Nuake::QuatToDirection(const Quat& quat)
{
//return quat * Vector3(0, 0, -1);
return glm::rotate(glm::inverse(quat), glm::vec3(-1.0, 0.0, 0.0));
return glm::normalize(quat * Vector3(0, 0, -1));
//return glm::normalize(glm::rotate(glm::inverse(quat), glm::vec3(-1.0, 0.0, 0.0)));
}