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

fixes for Code/CryEngine

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-25 13:28:51 -07:00
committed by Esteban Papp
parent 81d26d322d
commit f6cdcddc52
12 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
+2 -2
View File
@@ -49,7 +49,7 @@ namespace AZ
double totalFramesAtDefaultTimeStep = totalTicks / AssImpAnimationImporter::s_defaultTimeStepBetweenFrames + 1;
if (!AZ::IsClose(totalFramesAtDefaultTimeStep, numKeys, 1))
{
numKeys = AZStd::ceilf(totalFramesAtDefaultTimeStep);
numKeys = AZStd::ceilf(static_cast<float>(totalFramesAtDefaultTimeStep));
}
return numKeys;
}
@@ -620,7 +620,7 @@ namespace AZ
for (unsigned int valIdx = 0; valIdx < key.mNumValuesAndWeights; ++valIdx)
{
int currentValue = key.mValues[valIdx];
KeyData thisKey(key.mWeights[valIdx], key.mTime);
KeyData thisKey(static_cast<float>(key.mWeights[valIdx]), key.mTime);
valueToKeyDataMap[currentValue].insert(
AZStd::upper_bound(valueToKeyDataMap[currentValue].begin(), valueToKeyDataMap[currentValue].end(),thisKey),
thisKey);