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

Convert EMotionFX editor uint32 -> size_t

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-06-02 16:33:36 -07:00
parent 4034195bdc
commit 120ee64144
125 changed files with 1503 additions and 2128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp
+8 -11
View File
@@ -71,13 +71,13 @@ namespace EMotionFX
m_lodDistances.clear();
}
void SimpleLODComponent::Configuration::GenerateDefaultValue(AZ::u32 numLODs)
void SimpleLODComponent::Configuration::GenerateDefaultValue(size_t numLODs)
{
if (numLODs != m_lodDistances.size())
{
// Generate the default LOD (max) distance to 10, 20, 30....
m_lodDistances.resize(numLODs);
for (AZ::u32 i = 0; i < numLODs; ++i)
for (size_t i = 0; i < numLODs; ++i)
{
m_lodDistances[i] = i * 10.0f + 10.0f;
}
@@ -86,12 +86,9 @@ namespace EMotionFX
if (numLODs != m_lodSampleRates.size())
{
// Generate the default LOD Sample Rate to 140, 60, 45, 25, 15, 10
const float defaultSampleRate[] = {140.0f, 60.0f, 45.0f, 25.0f, 15.0f, 10.0f};
constexpr AZStd::array defaultSampleRate {140.0f, 60.0f, 45.0f, 25.0f, 15.0f, 10.0f};
m_lodSampleRates.resize(numLODs);
for (AZ::u32 i = 0; i < numLODs; ++i)
{
m_lodSampleRates[i] = defaultSampleRate[i];
}
AZStd::copy(begin(defaultSampleRate), end(defaultSampleRate), begin(m_lodSampleRates));
}
}
@@ -171,7 +168,7 @@ namespace EMotionFX
UpdateLodLevelByDistance(m_actorInstance, m_configuration, GetEntityId());
}
AZ::u32 SimpleLODComponent::GetLodByDistance(const AZStd::vector<float>& distances, float distance)
size_t SimpleLODComponent::GetLodByDistance(const AZStd::vector<float>& distances, float distance)
{
const size_t max = distances.size();
for (size_t i = 0; i < max; ++i)
@@ -179,11 +176,11 @@ namespace EMotionFX
const float rDistance = distances[i];
if (distance < rDistance)
{
return static_cast<AZ::u32>(i);
return i;
}
}
return static_cast<AZ::u32>(max - 1);
return max - 1;
}
void SimpleLODComponent::UpdateLodLevelByDistance(EMotionFX::ActorInstance * actorInstance, const Configuration& configuration, AZ::EntityId entityId)
@@ -204,7 +201,7 @@ namespace EMotionFX
AZ::RPI::ViewportContextPtr defaultViewportContext =
viewportContextManager->GetViewportContextByName(viewportContextManager->GetDefaultViewportContextName());
const float distance = worldPos.GetDistance(defaultViewportContext->GetCameraTransform().GetTranslation());
const AZ::u32 lodByDistance = GetLodByDistance(configuration.m_lodDistances, distance);
const size_t lodByDistance = GetLodByDistance(configuration.m_lodDistances, distance);
actorInstance->SetLODLevel(lodByDistance);
if (configuration.m_enableLodSampling)