celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Physics now calculates proper local transform if body has parent

Browse Source
This commit is contained in:
Antoine Pilote
2024-04-25 21:43:48 -04:00
parent db7002f92d
commit 508881091a
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Nuake/src/Physics/DynamicWorld.cpp
View File

@@ -33,6 +33,7 @@
#include <Jolt/Core/TempAllocator.h>
#include <dependencies/JoltPhysics/Jolt/Physics/Collision/CollisionCollectorImpl.h>
#include <src/Scene/Components/ParentComponent.h>
namespace Nuake
{
@@ -529,14 +530,23 @@ namespace Nuake
joltTransform(0, 3), joltTransform(1, 3), joltTransform(2, 3), joltTransform(3, 3)
);
Entity entity = { (entt::entity)entId, Engine::GetCurrentScene().get() };
if (entity.GetComponent<ParentComponent>().HasParent)
{
auto& parent = entity.GetComponent<ParentComponent>().Parent;
auto& parentTransformComponent = parent.GetComponent<TransformComponent>();
const Matrix4& parentTransform = parentTransformComponent.GetGlobalTransform();
transform = glm::inverse(parentTransform) * transform;
}
Vector3 scale = Vector3();
Quat rotation = Quat();
Vector3 pos = Vector3();
Vector3 skew = Vector3();
Vector4 pesp = Vector4();
glm::decompose(transform, scale, rotation, pos, skew, pesp);
Entity entity = { (entt::entity)entId, Engine::GetCurrentScene().get() };
auto& transformComponent = entity.GetComponent<TransformComponent>();
transformComponent.SetLocalPosition(pos);
transformComponent.SetLocalRotation(Quat(bodyRotation.GetW(), bodyRotation.GetX(), bodyRotation.GetY(), bodyRotation.GetZ()));
@@ -563,6 +573,15 @@ namespace Nuake
joltTransform(0, 3), joltTransform(1, 3), joltTransform(2, 3), joltTransform(3, 3)
);
if(entity.GetComponent<ParentComponent>().HasParent)
{
auto& parent = entity.GetComponent<ParentComponent>().Parent;
auto& parentTransformComponent = parent.GetComponent<TransformComponent>();
const Matrix4& parentTransform = parentTransformComponent.GetGlobalTransform();
transform = glm::inverse(parentTransform) * transform;
}
Vector3 scale = Vector3();
Quat rotation = Quat();
Vector3 pos = Vector3();