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

CBooRenderer: Fix light count in ActivateLightsForModel

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

8
Runtime/Graphics/CBooRenderer.cpp
View File

@ -226,10 +226,10 @@ void CBooRenderer::ActivateLightsForModel(CAreaListItem* item, CBooModel& model)
std::vector<CLight> thisLights; std::vector<CLight> thisLights;
thisLights.reserve(4); thisLights.reserve(4);
if (x300_dynamicLights.size()) { if (!x300_dynamicLights.empty()) {
u32 lightOctreeWordCount = 0; u32 lightOctreeWordCount = 0;
const u32* lightOctreeWords = nullptr; const u32* lightOctreeWords = nullptr;
if (item && model.x44_areaInstanceIdx != UINT32_MAX) { if (item != nullptr && model.x44_areaInstanceIdx != UINT32_MAX) {
lightOctreeWordCount = item->x4_octTree->x14_bitmapWordCount; lightOctreeWordCount = item->x4_octTree->x14_bitmapWordCount;
lightOctreeWords = item->x1c_lightOctreeWords.data(); lightOctreeWords = item->x1c_lightOctreeWords.data();
} }
@ -237,10 +237,10 @@ void CBooRenderer::ActivateLightsForModel(CAreaListItem* item, CBooModel& model)
std::array<float, 4> lightRads{-1.f, -1.f, -1.f, -1.f}; std::array<float, 4> lightRads{-1.f, -1.f, -1.f, -1.f};
std::array<CLight*, 4> lightRefs{}; std::array<CLight*, 4> lightRefs{};
auto it = x300_dynamicLights.begin(); auto it = x300_dynamicLights.begin();
for (size_t i = 0; i < thisLights.size() && it != x300_dynamicLights.end(); for (size_t i = 0; i < thisLights.capacity() && it != x300_dynamicLights.end();
++it, lightOctreeWords += lightOctreeWordCount) { ++it, lightOctreeWords += lightOctreeWordCount) {
CLight& refLight = *it; CLight& refLight = *it;
if (lightOctreeWords && !TestBit(lightOctreeWords, model.x44_areaInstanceIdx)) { if (lightOctreeWords != nullptr && !TestBit(lightOctreeWords, model.x44_areaInstanceIdx)) {
continue; continue;
} }