AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 09:47:43 +00:00
Code Issues Projects Releases Wiki Activity

Work on CGameProjectile

Browse Source
This commit is contained in:
Jack Andersen
2018-02-08 21:12:26 -10:00
parent ae6797f24b
commit 083571e693
22 changed files with 446 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Runtime/Character/CModelData.cpp
View File

@@ -364,9 +364,15 @@ void CModelData::RenderUnsortedParts(EWhichModel which, const zeus::CTransform&
const auto& model = PickStaticModel(which);
if (lights)
{
lights->ActivateLights(*model);
}
else
model->ActivateLights({});
{
std::vector<CLight> useLights;
useLights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, x18_ambientColor));
model->ActivateLights(useLights);
}
model->DrawNormal(drawFlags, nullptr, nullptr);
// Set ambient to white
@@ -390,9 +396,15 @@ void CModelData::Render(EWhichModel which, const zeus::CTransform& xf,
{
CSkinnedModel& model = PickAnimatedModel(which);
if (lights)
{
lights->ActivateLights(*model.GetModelInst());
}
else
model.GetModelInst()->ActivateLights({});
{
std::vector<CLight> useLights;
useLights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, x18_ambientColor));
model.GetModelInst()->ActivateLights(useLights);
}
x10_animData->Render(model, drawFlags, {}, nullptr);
}
@@ -400,9 +412,15 @@ void CModelData::Render(EWhichModel which, const zeus::CTransform& xf,
{
const auto& model = PickStaticModel(which);
if (lights)
{
lights->ActivateLights(*model);
}
else
model->ActivateLights({});
{
std::vector<CLight> useLights;
useLights.push_back(CLight::BuildLocalAmbient(zeus::CVector3f::skZero, x18_ambientColor));
model->ActivateLights(useLights);
}
if (x14_24_renderSorted)
model->DrawAlpha(drawFlags, nullptr, nullptr);