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

CBooRenderer: Don't smash the stack

This commit is contained in:
Luke Street 2020-09-16 13:07:53 -04:00
parent bc8135e896
commit 2361916614
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Runtime/Graphics/CBooRenderer.cpp
View File

@ -223,8 +223,9 @@ CBooRenderer::CAreaListItem::CAreaListItem(const std::vector<CMetroidModelInstan
CBooRenderer::CAreaListItem::~CAreaListItem() = default; CBooRenderer::CAreaListItem::~CAreaListItem() = default;
void CBooRenderer::ActivateLightsForModel(CAreaListItem* item, CBooModel& model) { void CBooRenderer::ActivateLightsForModel(CAreaListItem* item, CBooModel& model) {
constexpr size_t lightCount = 4;
std::vector<CLight> thisLights; std::vector<CLight> thisLights;
thisLights.reserve(4); thisLights.reserve(lightCount);
if (!x300_dynamicLights.empty()) { if (!x300_dynamicLights.empty()) {
u32 lightOctreeWordCount = 0; u32 lightOctreeWordCount = 0;
@ -234,10 +235,10 @@ void CBooRenderer::ActivateLightsForModel(CAreaListItem* item, CBooModel& model)
lightOctreeWords = item->x1c_lightOctreeWords.data(); lightOctreeWords = item->x1c_lightOctreeWords.data();
} }
std::array<float, 4> lightRads{-1.f, -1.f, -1.f, -1.f}; std::array<float, lightCount> lightRads{-1.f, -1.f, -1.f, -1.f};
std::array<CLight*, 4> lightRefs{}; std::array<CLight*, lightCount> lightRefs{};
auto it = x300_dynamicLights.begin(); auto it = x300_dynamicLights.begin();
for (size_t i = 0; i < thisLights.capacity() && it != x300_dynamicLights.end(); for (size_t i = 0; i < lightCount && it != x300_dynamicLights.end();
++it, lightOctreeWords += lightOctreeWordCount) { ++it, lightOctreeWords += lightOctreeWordCount) {
CLight& refLight = *it; CLight& refLight = *it;
if (lightOctreeWords != nullptr && !TestBit(lightOctreeWords, model.x44_areaInstanceIdx)) { if (lightOctreeWords != nullptr && !TestBit(lightOctreeWords, model.x44_areaInstanceIdx)) {