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

Graphics/RenderSystem: Fix invisible graphics/lights unregistration

This commit is contained in:
Jérôme Leclercq 2022-02-23 13:10:33 +01:00
parent 7c630cfe44
commit 004c0d84b1
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Nazara/Graphics/Systems/RenderSystem.cpp
View File

@ -3,6 +3,7 @@
// For conditions of distribution and use, see copyright notice in Config.hpp // For conditions of distribution and use, see copyright notice in Config.hpp
#include <Nazara/Graphics/Systems/RenderSystem.hpp> #include <Nazara/Graphics/Systems/RenderSystem.hpp>
#include <Nazara/Graphics/DeferredFramePipeline.hpp>
#include <Nazara/Graphics/ForwardFramePipeline.hpp> #include <Nazara/Graphics/ForwardFramePipeline.hpp>
#include <Nazara/Graphics/ViewerInstance.hpp> #include <Nazara/Graphics/ViewerInstance.hpp>
#include <Nazara/Graphics/WorldInstance.hpp> #include <Nazara/Graphics/WorldInstance.hpp>
@ -29,6 +30,7 @@ namespace Nz
m_lightDestroyConnection = registry.on_destroy<LightComponent>().connect<&RenderSystem::OnLightDestroy>(this); m_lightDestroyConnection = registry.on_destroy<LightComponent>().connect<&RenderSystem::OnLightDestroy>(this);
m_nodeDestroyConnection = registry.on_destroy<NodeComponent>().connect<&RenderSystem::OnNodeDestroy>(this); m_nodeDestroyConnection = registry.on_destroy<NodeComponent>().connect<&RenderSystem::OnNodeDestroy>(this);
//m_pipeline = std::make_unique<DeferredFramePipeline>();
m_pipeline = std::make_unique<ForwardFramePipeline>(); m_pipeline = std::make_unique<ForwardFramePipeline>();
} }
@ -75,6 +77,7 @@ namespace Nz
GraphicsEntity* graphicsEntity = m_graphicsEntityPool.Allocate(poolIndex); GraphicsEntity* graphicsEntity = m_graphicsEntityPool.Allocate(poolIndex);
graphicsEntity->entity = entity; graphicsEntity->entity = entity;
graphicsEntity->poolIndex = poolIndex; graphicsEntity->poolIndex = poolIndex;
graphicsEntity->renderableIndices.fill(std::numeric_limits<std::size_t>::max());
graphicsEntity->worldInstanceIndex = m_pipeline->RegisterWorldInstance(entityGfx.GetWorldInstance()); graphicsEntity->worldInstanceIndex = m_pipeline->RegisterWorldInstance(entityGfx.GetWorldInstance());
graphicsEntity->onNodeInvalidation.Connect(entityNode.OnNodeInvalidation, [this, graphicsEntity](const Node* /*node*/) graphicsEntity->onNodeInvalidation.Connect(entityNode.OnNodeInvalidation, [this, graphicsEntity](const Node* /*node*/)
{ {
@ -218,7 +221,7 @@ namespace Nz
m_pipeline->Render(renderFrame); m_pipeline->Render(renderFrame);
} }
void RenderSystem::OnCameraDestroy(entt::registry& registry, entt::entity entity) void RenderSystem::OnCameraDestroy(entt::registry& /*registry*/, entt::entity entity)
{ {
auto it = m_cameraEntities.find(entity); auto it = m_cameraEntities.find(entity);
if (it == m_cameraEntities.end()) if (it == m_cameraEntities.end())
@ -247,14 +250,18 @@ namespace Nz
m_newlyVisibleGfxEntities.erase(graphicsEntity); m_newlyVisibleGfxEntities.erase(graphicsEntity);
GraphicsComponent& entityGfx = registry.get<GraphicsComponent>(entity); GraphicsComponent& entityGfx = registry.get<GraphicsComponent>(entity);
for (std::size_t renderableIndex = 0; renderableIndex < GraphicsComponent::MaxRenderableCount; ++renderableIndex) if (entityGfx.IsVisible())
{ {
const auto& renderableEntry = entityGfx.GetRenderableEntry(renderableIndex); for (std::size_t renderableIndex = 0; renderableIndex < GraphicsComponent::MaxRenderableCount; ++renderableIndex)
if (!renderableEntry.renderable) {
continue; const auto& renderableEntry = entityGfx.GetRenderableEntry(renderableIndex);
if (!renderableEntry.renderable)
continue;
m_pipeline->UnregisterRenderable(graphicsEntity->renderableIndices[renderableIndex]); m_pipeline->UnregisterRenderable(graphicsEntity->renderableIndices[renderableIndex]);
}
} }
m_pipeline->UnregisterWorldInstance(graphicsEntity->worldInstanceIndex); m_pipeline->UnregisterWorldInstance(graphicsEntity->worldInstanceIndex);
m_graphicsEntityPool.Free(graphicsEntity->poolIndex); m_graphicsEntityPool.Free(graphicsEntity->poolIndex);
@ -274,13 +281,16 @@ namespace Nz
m_newlyVisibleLightEntities.erase(lightEntity); m_newlyVisibleLightEntities.erase(lightEntity);
LightComponent& entityLight = registry.get<LightComponent>(entity); LightComponent& entityLight = registry.get<LightComponent>(entity);
for (std::size_t lightIndex = 0; lightIndex < LightComponent::MaxLightCount; ++lightIndex) if (entityLight.IsVisible())
{ {
const auto& lightEntry = entityLight.GetLightEntry(lightIndex); for (std::size_t lightIndex = 0; lightIndex < LightComponent::MaxLightCount; ++lightIndex)
if (!lightEntry.light) {
continue; const auto& lightEntry = entityLight.GetLightEntry(lightIndex);
if (!lightEntry.light)
continue;
m_pipeline->UnregisterLight(lightEntity->lightIndices[lightIndex]); m_pipeline->UnregisterLight(lightEntity->lightIndices[lightIndex]);
}
} }
m_lightEntityPool.Free(lightEntity->poolIndex); m_lightEntityPool.Free(lightEntity->poolIndex);