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

fix w4018

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-18 17:45:51 -07:00
committed by Esteban Papp
parent 97354ce90a
commit 10f950b726
33 changed files with 72 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiImageComponent.cpp
+6 -6
View File
@@ -224,9 +224,9 @@ namespace
IDraw2d::Rounding pixelRounding = isPixelAligned ? IDraw2d::Rounding::Nearest : IDraw2d::Rounding::None;
float z = 1.0f;
int i = 0;
for (int y = 0; y < numY; ++y)
for (uint32 y = 0; y < numY; ++y)
{
for (int x = 0; x < numX; x += 1)
for (uint32 x = 0; x < numX; x += 1)
{
AZ::Vector3 point3(xValues[x], yValues[y], z);
point3 = transform * point3;
@@ -2030,7 +2030,7 @@ void UiImageComponent::ClipValuesForSlicedLinearFill(uint32 numValues, float* xV
float previousPercentage = 0;
int previousIndex = startClip;
int clampIndex = -1; // to clamp all values greater than m_fillAmount in specified direction.
for (int arrayPos = 1; arrayPos < numValues; ++arrayPos)
for (uint32 arrayPos = 1; arrayPos < numValues; ++arrayPos)
{
int currentIndex = startClip + arrayPos * clipInc;
float thisPercentage = (clipPosition[currentIndex] - clipPosition[startClip]) / totalLength;
@@ -2102,7 +2102,7 @@ void UiImageComponent::ClipAndRenderForSlicedRadialFill(uint32 numVertsPerSide,
if (m_fillAmount < 0.5f)
{
// Clips against first half line and then rotating line and adds results to render list.
for (int currentIndex = 0; currentIndex < totalIndices; currentIndex += 3)
for (uint32 currentIndex = 0; currentIndex < totalIndices; currentIndex += 3)
{
SVF_P2F_C4B_T2F_F4B intermediateVerts[maxTemporaryVerts];
uint16 intermediateIndices[maxTemporaryIndices];
@@ -2118,7 +2118,7 @@ void UiImageComponent::ClipAndRenderForSlicedRadialFill(uint32 numVertsPerSide,
else
{
// Clips against first half line and adds results to render list then clips against the second half line and rotating line and also adds those results to render list.
for (int currentIndex = 0; currentIndex < totalIndices; currentIndex += 3)
for (uint32 currentIndex = 0; currentIndex < totalIndices; currentIndex += 3)
{
SVF_P2F_C4B_T2F_F4B intermediateVerts[maxTemporaryVerts];
uint16 intermediateIndices[maxTemporaryIndices];
@@ -2201,7 +2201,7 @@ void UiImageComponent::ClipAndRenderForSlicedRadialCornerOrEdgeFill(uint32 numVe
int numIndicesToRender = 0;
int vertexOffset = 0;
for (int ix = 0; ix < totalIndices; ix += 3)
for (uint32 ix = 0; ix < totalIndices; ix += 3)
{
int indicesUsed = ClipToLine(verts, &indices[ix], renderVerts, renderIndices, vertexOffset, numIndicesToRender, lineOrigin, lineEnd);
numIndicesToRender += indicesUsed;