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

AtomLyIntegration

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
pappeste 5 years ago committed by Esteban Papp
parent e9b4f48f71
commit 33cbc2db21
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorInstance.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ namespace AZ
const AZ::Color skeletonColor(0.604f, 0.804f, 0.196f, 1.0f); const AZ::Color skeletonColor(0.604f, 0.804f, 0.196f, 1.0f);
RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs; RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
lineArgs.m_verts = m_auxVertices.data(); lineArgs.m_verts = m_auxVertices.data();
lineArgs.m_vertCount = aznumeric_caster(m_auxVertices.size()); lineArgs.m_vertCount = static_cast<uint32_t>(m_auxVertices.size());
lineArgs.m_colors = &skeletonColor; lineArgs.m_colors = &skeletonColor;
lineArgs.m_colorCount = 1; lineArgs.m_colorCount = 1;
lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off; lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
@ -202,9 +202,9 @@ namespace AZ
RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs; RPI::AuxGeomDraw::AuxGeomDynamicDrawArguments lineArgs;
lineArgs.m_verts = m_auxVertices.data(); lineArgs.m_verts = m_auxVertices.data();
lineArgs.m_vertCount = aznumeric_caster(m_auxVertices.size()); lineArgs.m_vertCount = static_cast<uint32_t>(m_auxVertices.size());
lineArgs.m_colors = m_auxColors.data(); lineArgs.m_colors = m_auxColors.data();
lineArgs.m_colorCount = aznumeric_caster(m_auxColors.size()); lineArgs.m_colorCount = static_cast<uint32_t>(m_auxColors.size());
lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off; lineArgs.m_depthTest = RPI::AuxGeomDraw::DepthTest::Off;
auxGeom->DrawLines(lineArgs); auxGeom->DrawLines(lineArgs);
} }
@ -861,7 +861,7 @@ namespace AZ
// Set the weights for any active masks // Set the weights for any active masks
for (size_t i = 0; i < m_wrinkleMaskWeights.size(); ++i) for (size_t i = 0; i < m_wrinkleMaskWeights.size(); ++i)
{ {
wrinkleMaskObjectSrg->SetConstant(wrinkleMaskWeightsIndex, m_wrinkleMaskWeights[i], aznumeric_caster(i)); wrinkleMaskObjectSrg->SetConstant(wrinkleMaskWeightsIndex, m_wrinkleMaskWeights[i], static_cast<uint32_t>(i));
} }
AZ_Error("AtomActorInstance", m_wrinkleMaskWeights.size() <= s_maxActiveWrinkleMasks, "The skinning shader supports no more than %d active morph targets with wrinkle masks.", s_maxActiveWrinkleMasks); AZ_Error("AtomActorInstance", m_wrinkleMaskWeights.size() <= s_maxActiveWrinkleMasks, "The skinning shader supports no more than %d active morph targets with wrinkle masks.", s_maxActiveWrinkleMasks);
} }

Write Preview
Loading…
Cancel
Save