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

Graphics/FramePipeline: Fix UpdateViewerRenderMask name (=> RenderOrder)

This commit is contained in:
SirLynix 2023-09-06 13:21:23 +02:00 committed by Jérôme Leclercq
parent 9aebb4f745
commit 96504a0a21
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Graphics/ForwardFramePipeline.hpp
View File

@ -74,7 +74,7 @@ namespace Nz
void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) override; void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) override;
void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) override; void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) override;
void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) override; void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) override;
void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) override; void UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder) override;
ForwardFramePipeline& operator=(const ForwardFramePipeline&) = delete; ForwardFramePipeline& operator=(const ForwardFramePipeline&) = delete;
ForwardFramePipeline& operator=(ForwardFramePipeline&&) = delete; ForwardFramePipeline& operator=(ForwardFramePipeline&&) = delete;

5
include/Nazara/Graphics/FramePipeline.hpp
View File

@ -50,7 +50,8 @@ namespace Nz
virtual std::size_t RegisterWorldInstance(WorldInstancePtr worldInstance) = 0; virtual std::size_t RegisterWorldInstance(WorldInstancePtr worldInstance) = 0;
virtual const Light* RetrieveLight(std::size_t lightIndex) const = 0; virtual const Light* RetrieveLight(std::size_t lightIndex) const = 0;
virtual const Texture* RetrieveLightShadowmap(std::size_t lightIndex) const = 0; virtual const LightShadowData* RetrieveLightShadowData(std::size_t lightIndex) const = 0;
virtual const Texture* RetrieveLightShadowmap(std::size_t lightIndex, const AbstractViewer* viewer) const = 0;
virtual void Render(RenderFrame& renderFrame) = 0; virtual void Render(RenderFrame& renderFrame) = 0;
@ -64,7 +65,7 @@ namespace Nz
virtual void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) = 0; virtual void UpdateRenderableRenderMask(std::size_t renderableIndex, UInt32 renderMask) = 0;
virtual void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) = 0; virtual void UpdateRenderableScissorBox(std::size_t renderableIndex, const Recti& scissorBox) = 0;
virtual void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) = 0; virtual void UpdateRenderableSkeletonInstance(std::size_t renderableIndex, std::size_t skeletonIndex) = 0;
virtual void UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) = 0; virtual void UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder) = 0;
FramePipeline& operator=(const FramePipeline&) = delete; FramePipeline& operator=(const FramePipeline&) = delete;
FramePipeline& operator=(FramePipeline&&) = delete; FramePipeline& operator=(FramePipeline&&) = delete;

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

@ -682,7 +682,7 @@ namespace Nz
} }
} }
void ForwardFramePipeline::UpdateViewerRenderMask(std::size_t viewerIndex, Int32 renderOrder) void ForwardFramePipeline::UpdateViewerRenderOrder(std::size_t viewerIndex, Int32 renderOrder)
{ {
ViewerData* viewerData = m_viewerPool.RetrieveFromIndex(viewerIndex); ViewerData* viewerData = m_viewerPool.RetrieveFromIndex(viewerIndex);
assert(!viewerData->pendingDestruction); assert(!viewerData->pendingDestruction);