AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules

This commit is contained in:
Jack Andersen 2016-09-07 20:16:46 -10:00
parent f5db2527e4
commit 5c386d02a8
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/main.cpp
View File

@ -115,6 +115,7 @@ int wmain(int argc, const boo::SystemChar** argv)
int main(int argc, const boo::SystemChar** argv) int main(int argc, const boo::SystemChar** argv)
#endif #endif
{ {
logvisor::RegisterStandardExceptions();
logvisor::RegisterConsoleLogger(); logvisor::RegisterConsoleLogger();
atSetExceptionHandler(AthenaExc); atSetExceptionHandler(AthenaExc);
urde::Application appCb; urde::Application appCb;

16
Runtime/Character/CPASAnimState.cpp
View File

@ -173,19 +173,19 @@ float CPASAnimState::ComputePercentErrorWeight(u32 idx, const CPASAnimParm& parm
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_int - info.GetWeightMaxValue().m_int); 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) else if (parm.GetParameterType() == CPASAnimParm::EParmType::UInt32)
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_uint - info.GetWeightMaxValue().m_uint); 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) else if (parm.GetParameterType() == CPASAnimParm::EParmType::Float)
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); 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) 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]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); 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) if (range > FLT_EPSILON)
@ -213,19 +213,19 @@ float CPASAnimState::ComputeAngularPercentErrorWeight(u32 idx, const CPASAnimPar
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_int - info.GetWeightMaxValue().m_int); 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) else if (parm.GetParameterType() == CPASAnimParm::EParmType::UInt32)
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_uint - info.GetWeightMaxValue().m_uint); 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) else if (parm.GetParameterType() == CPASAnimParm::EParmType::Float)
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); 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) else if (parm.GetParameterType() == CPASAnimParm::EParmType::Bool)
{ {
@ -235,7 +235,7 @@ float CPASAnimState::ComputeAngularPercentErrorWeight(u32 idx, const CPASAnimPar
{ {
const CPASParmInfo& info = x4_parms[idx]; const CPASParmInfo& info = x4_parms[idx];
range = float(info.GetWeightMinValue().m_float - info.GetWeightMaxValue().m_float); 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) if (range > FLT_EPSILON)

2
hecl

@ -1 +1 @@
Subproject commit c4206ca8007bf9d0b7fd9752be932b9a285905ef Subproject commit 354b9c853d6782d58c0184489b86d10f2771ed2a

2
nod

@ -1 +1 @@
Subproject commit a80369b13bfd27acf2dec4a192f61a3511d2e935 Subproject commit e55a4322abc3954d3a4ea89de45f95515d8ca76a