Merge remote-tracking branch 'origin/1.5' into dotnet7

This commit is contained in:
Wojtek Figat
2023-01-08 15:05:56 +01:00
14 changed files with 275 additions and 91 deletions

View File

@@ -43,6 +43,15 @@ public:
{
return GetEnabled();
}
/// <summary>
/// Gets a value indicating whether this effect can be rendered.
/// </summary>
/// <param name="renderContext">The target render context.</param>
API_FUNCTION() virtual bool CanRender(const RenderContext& renderContext) const
{
return CanRender();
}
/// <summary>
/// Pre-rendering event called before scene rendering begin. Can be used to perform custom rendering or customize render view/setup.

View File

@@ -238,13 +238,13 @@ void SceneRenderTask::OnCollectDrawCalls(RenderContextBatch& renderContextBatch,
{
for (PostProcessEffect* fx : GlobalCustomPostFx)
{
if (fx && fx->CanRender())
if (fx && fx->CanRender(renderContext))
postFx.Add(fx);
}
}
for (PostProcessEffect* fx : CustomPostFx)
{
if (fx && fx->CanRender())
if (fx && fx->CanRender(renderContext))
postFx.Add(fx);
}
if (const auto* camera = Camera.Get())
@@ -252,7 +252,7 @@ void SceneRenderTask::OnCollectDrawCalls(RenderContextBatch& renderContextBatch,
for (Script* script : camera->Scripts)
{
auto* fx = Cast<PostProcessEffect>(script);
if (fx && fx->CanRender())
if (fx && fx->CanRender(renderContext))
postFx.Add(fx);
}
}