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

Now everything works, except rotating while having scale

Browse Source
This commit is contained in:
Antoine Pilote
2023-07-14 11:25:33 -04:00
parent 9f60963102
commit b2f14472f8
3 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,14 +47,11 @@ namespace Nuake
auto& localRot = glm::normalize(transform.GetLocalRotation());
auto& localScale = transform.GetLocalScale();
const Matrix4& translationMatrix = glm::translate(Matrix4(1.0f), localTranslate);
const Matrix4& rotationMatrix = glm::mat4_cast(localRot);
const Matrix4& scaleMatrix = glm::scale(Matrix4(1.0f), localScale);
const Matrix4& newLocalTransform = translationMatrix * rotationMatrix * scaleMatrix;
//localRot *= -1.0f;
//if(localRot.y != 0)
// localRot *= -1.0f;
// if(localRot.y != 0)
// assert(newLocalTransform == transform.GetLocalTransform());
transform.SetLocalTransform(newLocalTransform);
@@ -67,7 +64,6 @@ namespace Nuake
for (auto e : transformView)
{
auto [parent, transform] = transformView.get<ParentComponent, TransformComponent>(e);
if (!parent.HasParent)
{
// If no parents, then globalTransform is local transform.
@@ -99,7 +95,7 @@ namespace Nuake
NameComponent& nameComponent = parentComponent.Parent.GetComponent<NameComponent>();
parentComponent = parentComponent.Parent.GetComponent<ParentComponent>();
}
transform.SetGlobalPosition(globalPosition);
transform.SetGlobalRotation(globalOrientation);
transform.SetGlobalScale(globalScale);