sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Nz::Bitset<> for-range

This commit is contained in:
SirLynix 2023-09-09 20:55:46 +02:00 committed by Jérôme Leclercq
parent c826b537ab
commit 35414ec5d8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nazara/Graphics/ForwardFramePipeline.cpp
View File

@ -301,7 +301,7 @@ namespace Nz
m_transferSet.insert(&viewerInstance->GetViewerInstance()); m_transferSet.insert(&viewerInstance->GetViewerInstance());
UInt32 renderMask = viewerInstance->GetRenderMask(); UInt32 renderMask = viewerInstance->GetRenderMask();
for (std::size_t i = m_shadowCastingLights.FindFirst(); i != m_shadowCastingLights.npos; i = m_shadowCastingLights.FindNext(i)) for (std::size_t i : m_shadowCastingLights.IterBits())
{ {
LightData* lightData = m_lightPool.RetrieveFromIndex(i); LightData* lightData = m_lightPool.RetrieveFromIndex(i);
if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0) if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0)
@ -419,7 +419,7 @@ namespace Nz
m_visibleShadowCastingLights.PerformsAND(m_activeLights, m_shadowCastingLights); m_visibleShadowCastingLights.PerformsAND(m_activeLights, m_shadowCastingLights);
// Shadow map handling (for active lights) // Shadow map handling (for active lights)
for (std::size_t i = m_visibleShadowCastingLights.FindFirst(); i != m_visibleShadowCastingLights.npos; i = m_visibleShadowCastingLights.FindNext(i)) for (std::size_t i : m_visibleShadowCastingLights.IterBits())
{ {
LightData* lightData = m_lightPool.RetrieveFromIndex(i); LightData* lightData = m_lightPool.RetrieveFromIndex(i);
if (!lightData->shadowData->IsPerViewer()) if (!lightData->shadowData->IsPerViewer())
@ -435,7 +435,7 @@ namespace Nz
UInt32 renderMask = viewerData.viewer->GetRenderMask(); UInt32 renderMask = viewerData.viewer->GetRenderMask();
// Per-viewer shadow map handling // Per-viewer shadow map handling
for (std::size_t lightIndex = viewerData.frame.visibleLights.FindFirst(); lightIndex != viewerData.frame.visibleLights.npos; lightIndex = viewerData.frame.visibleLights.FindNext(lightIndex)) for (std::size_t lightIndex : viewerData.frame.visibleLights.IterBits())
{ {
LightData* lightData = m_lightPool.RetrieveFromIndex(lightIndex); LightData* lightData = m_lightPool.RetrieveFromIndex(lightIndex);
if (lightData->shadowData && lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0) if (lightData->shadowData && lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0)
@ -606,7 +606,7 @@ namespace Nz
viewerData.pendingDestruction = true; viewerData.pendingDestruction = true;
UInt32 renderMask = viewerData.viewer->GetRenderMask(); UInt32 renderMask = viewerData.viewer->GetRenderMask();
for (std::size_t i = m_shadowCastingLights.FindFirst(); i != m_shadowCastingLights.npos; i = m_shadowCastingLights.FindNext(i)) for (std::size_t i : m_shadowCastingLights.IterBits())
{ {
LightData* lightData = m_lightPool.RetrieveFromIndex(i); LightData* lightData = m_lightPool.RetrieveFromIndex(i);
if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0) if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0)
@ -710,7 +710,7 @@ namespace Nz
continue; continue;
UInt32 renderMask = viewerData.viewer->GetRenderMask(); UInt32 renderMask = viewerData.viewer->GetRenderMask();
for (std::size_t i = m_shadowCastingLights.FindFirst(); i != m_shadowCastingLights.npos; i = m_shadowCastingLights.FindNext(i)) for (std::size_t i : m_shadowCastingLights.IterBits())
{ {
LightData* lightData = m_lightPool.RetrieveFromIndex(i); LightData* lightData = m_lightPool.RetrieveFromIndex(i);
if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0) if (lightData->shadowData->IsPerViewer() && (renderMask & lightData->renderMask) != 0)

2
src/Nazara/Graphics/ForwardPipelinePass.cpp
View File

@ -307,7 +307,7 @@ namespace Nz
m_directionalLights.clear(); m_directionalLights.clear();
m_pointLights.clear(); m_pointLights.clear();
m_spotLights.clear(); m_spotLights.clear();
for (std::size_t lightIndex = visibleLights.FindFirst(); lightIndex != visibleLights.npos; lightIndex = visibleLights.FindNext(lightIndex)) for (std::size_t lightIndex : visibleLights.IterBits())
{ {
const Light* light = m_pipeline.RetrieveLight(lightIndex); const Light* light = m_pipeline.RetrieveLight(lightIndex);