diff --git a/Editor/main.cpp b/Editor/main.cpp index 85a1b32d8..63d01d67b 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -115,6 +115,7 @@ int wmain(int argc, const boo::SystemChar** argv) int main(int argc, const boo::SystemChar** argv) #endif { + logvisor::RegisterStandardExceptions(); logvisor::RegisterConsoleLogger(); atSetExceptionHandler(AthenaExc); urde::Application appCb; diff --git a/Runtime/Character/CPASAnimState.cpp b/Runtime/Character/CPASAnimState.cpp index 7c609abcb..202531621 100644 --- a/Runtime/Character/CPASAnimState.cpp +++ b/Runtime/Character/CPASAnimState.cpp @@ -173,19 +173,19 @@ float CPASAnimState::ComputePercentErrorWeight(u32 idx, const CPASAnimParm& parm { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_int - info.GetWeightMaxValue().m_int); - val = float(fabs(parmVal.m_int - parm.GetInt32Value())); + val = float(std::abs(parmVal.m_int - parm.GetInt32Value())); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::UInt32) { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_uint - info.GetWeightMaxValue().m_uint); - val = float(fabs(parmVal.m_uint - parm.GetUint32Value())); + val = float(std::abs(int(parmVal.m_uint) - int(parm.GetUint32Value()))); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::Float) { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); - val = float(fabs(parmVal.m_float - parm.GetReal32Value())); + val = float(std::fabs(parmVal.m_float - parm.GetReal32Value())); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::Bool) { @@ -195,7 +195,7 @@ float CPASAnimState::ComputePercentErrorWeight(u32 idx, const CPASAnimParm& parm { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); - val = float(fabs(parmVal.m_float - parm.GetReal32Value())); + val = float(std::fabs(parmVal.m_float - parm.GetReal32Value())); } if (range > FLT_EPSILON) @@ -213,19 +213,19 @@ float CPASAnimState::ComputeAngularPercentErrorWeight(u32 idx, const CPASAnimPar { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_int - info.GetWeightMaxValue().m_int); - val = float(fabs(parmVal.m_int - parm.GetInt32Value())); + val = float(std::abs(parmVal.m_int - parm.GetInt32Value())); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::UInt32) { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_uint - info.GetWeightMaxValue().m_uint); - val = float(fabs(parmVal.m_uint - parm.GetUint32Value())); + val = float(std::abs(int(parmVal.m_uint) - int(parm.GetUint32Value()))); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::Float) { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); - val = float(fabs(parmVal.m_float - parm.GetReal32Value())); + val = float(std::fabs(parmVal.m_float - parm.GetReal32Value())); } else if (parm.GetParameterType() == CPASAnimParm::EParmType::Bool) { @@ -235,7 +235,7 @@ float CPASAnimState::ComputeAngularPercentErrorWeight(u32 idx, const CPASAnimPar { const CPASParmInfo& info = x4_parms[idx]; range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); - val = float(fabs(parmVal.m_float - parm.GetReal32Value())); + val = float(std::fabs(parmVal.m_float - parm.GetReal32Value())); } if (range > FLT_EPSILON) diff --git a/hecl b/hecl index c4206ca80..354b9c853 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit c4206ca8007bf9d0b7fd9752be932b9a285905ef +Subproject commit 354b9c853d6782d58c0184489b86d10f2771ed2a diff --git a/nod b/nod index a80369b13..e55a4322a 160000 --- a/nod +++ b/nod @@ -1 +1 @@ -Subproject commit a80369b13bfd27acf2dec4a192f61a3511d2e935 +Subproject commit e55a4322abc3954d3a4ea89de45f95515d8ca76a