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

refactor vector scale transform function usages in GradientSignal

Browse Source
This commit is contained in:
greerdv
2021-05-28 10:50:35 +01:00
parent 23d481773a
commit fcfb5a7941
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/GradientSignal/Code/Include/GradientSignal/GradientSampler.h
+5 -5
View File
@@ -103,12 +103,12 @@ namespace GradientSignal
//apply transform if set
if (m_enableTransform && GradientSamplerUtil::AreTransformParamsSet(*this))
{
const AZ::Transform transform =
AZ::Transform::CreateTranslation(m_translate) *
AZ::ConvertEulerDegreesToTransform(m_rotate) *
AZ::Transform::CreateScale(m_scale);
AZ::Matrix3x4 matrix3x4;
matrix3x4.SetFromEulerDegrees(m_rotate);
matrix3x4.MultiplyByScale(m_scale);
matrix3x4.SetTranslation(m_translate);
sampleParamsTransformed.m_position = transform.TransformPoint(sampleParamsTransformed.m_position);
sampleParamsTransformed.m_position = matrix3x4 * sampleParamsTransformed.m_position;
}
float output = 0.0f;
Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp
+1 -1
View File
@@ -493,7 +493,7 @@ namespace GradientSignal
if (!m_configuration.m_advancedMode || !m_configuration.m_overrideScale)
{
m_configuration.m_scale = shapeTransform.GetScale();
m_configuration.m_scale = AZ::Vector3(shapeTransform.GetUniformScale());
}
//rebuild bounds from parameters