update more calls to Transform to use uniform scale
This commit is contained in:
@@ -243,14 +243,14 @@ namespace AZ
|
||||
{
|
||||
// apply offset in world-space
|
||||
finalTransform = m_targetEntityTransform * m_targetBoneTransform;
|
||||
finalTransform.SetScale(AZ::Vector3::CreateOne());
|
||||
finalTransform.SetUniformScale(1.0f);
|
||||
finalTransform *= m_targetOffset;
|
||||
}
|
||||
else if (m_scaleSource == AttachmentConfiguration::ScaleSource::TargetEntityScale)
|
||||
{
|
||||
// apply offset in target-entity-space (ignoring bone scale)
|
||||
AZ::Transform boneNoScale = m_targetBoneTransform;
|
||||
boneNoScale.SetScale(AZ::Vector3::CreateOne());
|
||||
boneNoScale.SetUniformScale(1.0f);
|
||||
|
||||
finalTransform = m_targetEntityTransform * boneNoScale * m_targetOffset;
|
||||
}
|
||||
|
||||
@@ -309,7 +309,7 @@ namespace Vegetation
|
||||
|
||||
// Create a Transform that represents our instance.
|
||||
AZ::Transform world = AZ::Transform::CreateFromQuaternionAndTranslation(instanceData.m_alignment * instanceData.m_rotation, instanceData.m_position);
|
||||
world.MultiplyByScale(AZ::Vector3(instanceData.m_scale));
|
||||
world.MultiplyByUniformScale(instanceData.m_scale);
|
||||
|
||||
// Request a new dynamic slice instance.
|
||||
AzFramework::SliceInstantiationTicket* ticket = new AzFramework::SliceInstantiationTicket();
|
||||
|
||||
Reference in New Issue
Block a user