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

LmbrCentral

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-17 17:24:42 -07:00
committed by Esteban Papp
parent 9c8cc729b1
commit 89c99b15af
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp
+2 -2
View File
@@ -355,7 +355,7 @@ namespace LmbrCentral
return;
}
const AZ::u32 segments = segmentCount * spline->GetSegmentGranularity() + segmentCount - 1;
const AZ::u32 segments = static_cast<AZ::u32>(segmentCount * spline->GetSegmentGranularity() + segmentCount - 1);
const AZ::u32 totalSegments = segments + capSegments * 2;
const AZ::u32 capSegmentTipVerts = capSegments > 0 ? 2 : 0;
const size_t numVerts = sides * (totalSegments + 1) + capSegmentTipVerts;
@@ -594,7 +594,7 @@ namespace LmbrCentral
// to ensure the total radius stays positive
if (GetTotalRadius(AZ::SplineAddress(vertIndex)) < 0.0f)
{
SetVariableRadius(vertIndex, -GetRadius());
SetVariableRadius(static_cast<int>(vertIndex), -GetRadius());
}
}
Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp
+1 -1
View File
@@ -406,7 +406,7 @@ namespace UnitTest
float variableRadius = 0.0f;
LmbrCentral::TubeShapeComponentRequestsBus::EventResult(
variableRadius, entity.GetId(), &LmbrCentral::TubeShapeComponentRequestsBus::Events::GetVariableRadius,
vertIndex);
static_cast<int>(vertIndex));
EXPECT_THAT(totalRadius, FloatEq(radiis.first));
EXPECT_THAT(variableRadius, FloatEq(radiis.second));