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

Work on implementing quaternion

Browse Source
This commit is contained in:
antopilo
2022-06-29 20:05:08 -04:00
parent b2f59a189b
commit 32e63a5137
7 changed files with 48 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Nuake/src/Scene/Systems/TransformSystem.cpp
View File

@@ -51,9 +51,7 @@ namespace Nuake {
Matrix4 localTransform = Matrix4(1.0f);
localTransform = glm::translate(localTransform, transform.Translation);
localTransform = glm::rotate(localTransform, glm::radians(transform.Rotation.x), Vector3(1, 0, 0));
localTransform = glm::rotate(localTransform, glm::radians(transform.Rotation.y), Vector3(0, 1, 0));
localTransform = glm::rotate(localTransform, glm::radians(transform.Rotation.z), Vector3(0, 0, 1));
localTransform *= glm::toMat4(transform.Orientation);
localTransform = glm::scale(localTransform, transform.Scale);
transform.LocalTransform = localTransform;
@@ -69,13 +67,14 @@ namespace Nuake {
{
// If no parents, then globalTransform is local transform.
transform.GlobalTransform = transform.LocalTransform;
continue;
}
Entity currentParent = Entity((entt::entity)e, m_Scene);
Matrix4 globalTransform = transform.LocalTransform;
Vector3 globalPosition = transform.Translation;
Vector3 globalRotation = transform.Rotation;
Quat globalOrientation = transform.Orientation;
Vector3 globalScale = transform.Scale;
ParentComponent parentComponent = currentParent.GetComponent<ParentComponent>();
@@ -86,15 +85,14 @@ namespace Nuake {
globalTransform = transformComponent.LocalTransform * globalTransform;
globalPosition += transformComponent.Translation;
globalRotation += transformComponent.Rotation;
globalOrientation *= transformComponent.Orientation;
globalScale *= transformComponent.Scale;
parentComponent = parentComponent.Parent.GetComponent<ParentComponent>();
}
transform.GlobalTranslation = globalPosition;
transform.GlobalRotation = globalRotation;
transform.GlobalOrientation = globalOrientation;
transform.GlobalScale = globalScale;
transform.GlobalTransform = globalTransform;