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

CWorldLight: Eliminate variable shadowing 

While we're at it, we can make use of structured bindings.
This commit is contained in:
Lioncash 2020-04-23 07:25:05 -04:00
parent 4e3363a98b
commit 4a6c3cde3c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/World/CWorldLight.cpp
View File

@ -57,14 +57,12 @@ CLight CWorldLight::GetAsCGraphicsLight() const {
CLight::BuildSpot(x10_position, x1c_direction.normalized(), CLight::BuildSpot(x10_position, x1c_direction.normalized(),
zeus::CColor{x4_color.x(), x4_color.y(), x4_color.z(), 1.f}, x2c_cutoffAngle * .5f); zeus::CColor{x4_color.x(), x4_color.y(), x4_color.z(), 1.f}, x2c_cutoffAngle * .5f);
float c, l, q; const auto [constant, linear, quadratic] = CalculateLightFalloff(x3c_falloff, x28_q);
std::tie(c, l, q) = CalculateLightFalloff(x3c_falloff, x28_q); light.SetAttenuation(constant, linear, quadratic);
light.SetAttenuation(c, l, q);
return light; return light;
} }
float distC, distL, distQ;
std::tie(distC, distL, distQ) = CalculateLightFalloff(x3c_falloff, x28_q); const auto [distC, distL, distQ] = CalculateLightFalloff(x3c_falloff, x28_q);
return CLight::BuildCustom(x10_position, zeus::CVector3f{0.f, 1.f, 0.f}, return CLight::BuildCustom(x10_position, zeus::CVector3f{0.f, 1.f, 0.f},
zeus::CColor{x4_color.x(), x4_color.y(), x4_color.z(), 1.f}, distC, distL, distQ, 1.f, 0.f, zeus::CColor{x4_color.x(), x4_color.y(), x4_color.z(), 1.f}, distC, distL, distQ, 1.f, 0.f,
0.f); 0.f);