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

Merge branch stabilization/2110 into development

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-11-04 11:10:26 -07:00
parent e6a132b91e f8aa265253
commit bb1dfd44d2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp
+6 -3
View File
@@ -85,10 +85,13 @@ namespace EMotionFX
if (numLODs != m_lodSampleRates.size()) if (numLODs != m_lodSampleRates.size())
{ {
// Generate the default LOD Sample Rate to 140, 60, 45, 25, 15, 10 // Generate the default LOD Sample Rate to 140, 60, 45, 25, 15, 10, 10, 10, ...
constexpr AZStd::array 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); m_lodSampleRates.resize(numLODs, 10.0f);
AZStd::copy(begin(defaultSampleRate), end(defaultSampleRate), begin(m_lodSampleRates));
// Do not copy more than what fits in defaultSampleRates or numLODs.
size_t copyCount = std::min(defaultSampleRate.size(), numLODs);
AZStd::copy(begin(defaultSampleRate), begin(defaultSampleRate) + copyCount, begin(m_lodSampleRates));
} }
} }