AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:07:42 +00:00
Code Issues Projects Releases Wiki Activity

Metal API adjustments; MSAA support

Browse Source
This commit is contained in:
Jack Andersen
2018-01-06 19:19:49 -10:00
parent fd33d05fc0
commit 4e5c991424
45 changed files with 327 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Character/CModelData.cpp
View File

@@ -101,8 +101,10 @@ CSkinnedModel& CModelData::PickAnimatedModel(EWhichModel which) const
{
case EWhichModel::XRay:
ret = x10_animData->xf4_xrayModel.get();
break;
case EWhichModel::Thermal:
ret = x10_animData->xf8_infraModel.get();
break;
default: break;
}
if (ret)
@@ -117,11 +119,13 @@ const std::unique_ptr<CBooModel>& CModelData::PickStaticModel(EWhichModel which)
{
case EWhichModel::XRay:
ret = &m_xrayModelInst;
break;
case EWhichModel::Thermal:
ret = &m_infraModelInst;
break;
default: break;
}
if (ret)
if (ret && *ret)
return *ret;
return m_normalModelInst;
}