birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor vector scale transform function usages in trackview

Browse Source
This commit is contained in:
greerdv
2021-05-28 10:37:44 +01:00
parent e4f73d44fe
commit 23d481773a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/TrackView/TrackViewSequence.cpp
+2 -2
View File
@@ -828,7 +828,7 @@ void CTrackViewSequence::SyncSelectedTracksToBase()
const Vec3 scale = pAnimNode->GetScale();
AZ::Transform transform = AZ::Transform::CreateIdentity();
transform.SetScale(LYVec3ToAZVec3(scale));
transform.SetUniformScale(LYVec3ToAZVec3(scale).GetMaxElement());
transform.SetRotation(LYQuaternionToAZQuaternion(rotation));
transform.SetTranslation(LYVec3ToAZVec3(position));
@@ -870,7 +870,7 @@ void CTrackViewSequence::SyncSelectedTracksFromBase()
pAnimNode->SetPos(AZVec3ToLYVec3(transform.GetTranslation()));
pAnimNode->SetRotation(AZQuaternionToLYQuaternion(transform.GetRotation()));
pAnimNode->SetScale(AZVec3ToLYVec3(transform.GetScale()));
pAnimNode->SetScale(AZVec3ToLYVec3(AZ::Vector3(transform.GetUniformScale())));
bNothingWasSynced = false;
}
Gems/Maestro/Code/Source/Cinematics/AnimComponentNode.cpp
+5 -5
View File
@@ -324,11 +324,11 @@ void CAnimComponentNode::ConvertBetweenWorldAndLocalRotation(Quat& rotation, ETr
{
AZ::Quaternion rot(rotation.v.x, rotation.v.y, rotation.v.z, rotation.w);
AZ::Transform rotTransform = AZ::Transform::CreateFromQuaternion(rot);
rotTransform.ExtractScale();
rotTransform.ExtractUniformScale();
AZ::Transform parentTransform = AZ::Transform::Identity();
GetParentWorldTransform(parentTransform);
parentTransform.ExtractScale();
parentTransform.ExtractUniformScale();
if (conversionDirection == eTransformConverstionDirection_toLocalSpace)
{
parentTransform.Invert();
@@ -344,7 +344,7 @@ void CAnimComponentNode::ConvertBetweenWorldAndLocalRotation(Quat& rotation, ETr
void CAnimComponentNode::ConvertBetweenWorldAndLocalScale(Vec3& scale, ETransformSpaceConversionDirection conversionDirection) const
{
AZ::Transform parentTransform = AZ::Transform::Identity();
AZ::Transform scaleTransform = AZ::Transform::CreateScale(AZ::Vector3(scale.x, scale.y, scale.z));
AZ::Transform scaleTransform = AZ::Transform::CreateUniformScale(AZ::Vector3(scale.x, scale.y, scale.z).GetMaxElement());
GetParentWorldTransform(parentTransform);
if (conversionDirection == eTransformConverstionDirection_toLocalSpace)
@@ -353,8 +353,8 @@ void CAnimComponentNode::ConvertBetweenWorldAndLocalScale(Vec3& scale, ETransfor
}
scaleTransform = parentTransform * scaleTransform;
AZ::Vector3 vScale = scaleTransform.GetScale();
scale.Set(vScale.GetX(), vScale.GetY(), vScale.GetZ());
const float uniformScale = scaleTransform.GetUniformScale();
scale.Set(uniformScale, uniformScale, uniformScale);
}
//////////////////////////////////////////////////////////////////////////