Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions Runtime/SRP/VXGIRenderPipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,19 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c
foreach (var camera in cameras) {
BeginCameraRendering(renderContext, camera);

if (camera.TryGetComponent<VXGI>(out var vxgi) && vxgi.isActiveAndEnabled) {
vxgi.Render(renderContext, _renderer);
if (camera.cameraType == CameraType.Game) {
if (camera.TryGetComponent<VXGI>(out var vxgi) && vxgi.isActiveAndEnabled) {
vxgi.Render(renderContext, _renderer);
} else {
RenderFallback(renderContext, camera);
}
} else {
#if UNITY_EDITOR
if (camera.cameraType == CameraType.SceneView) {
ScriptableRenderContext.EmitWorldGeometryForSceneView(camera);
}

if (mainCamera != null && mainCamera.TryGetComponent<VXGI>(out vxgi) && vxgi.isActiveAndEnabled) {
if (mainCamera != null && mainCamera.TryGetComponent<VXGI>(out var vxgi) && vxgi.isActiveAndEnabled) {
vxgi.Render(renderContext, camera, _renderer);
} else {
RenderFallback(renderContext, camera);
Expand All @@ -80,24 +84,25 @@ protected override void Render(ScriptableRenderContext renderContext, Camera[] c
void RenderFallback(ScriptableRenderContext renderContext, Camera camera) {
TriggerCameraCallback(camera, "OnPreRender", Camera.onPreRender);

_command.ClearRenderTarget(true, true, Color.black);
renderContext.ExecuteCommandBuffer(_command);
_command.Clear();
if (!camera.TryGetCullingParameters(out _cullingParameters)) return;

TriggerCameraCallback(camera, "OnPreCull", Camera.onPreCull);

if (!camera.TryGetCullingParameters(out _cullingParameters)) return;

var cullingResults = renderContext.Cull(ref _cullingParameters);
var drawingSettings = new DrawingSettings { perObjectData = PerObjectData };
drawingSettings.SetShaderPassName(0, ShaderTagIDs.Deferred);
drawingSettings.SetShaderPassName(0, ShaderTagIDs.ForwardBase);
drawingSettings.SetShaderPassName(1, ShaderTagIDs.PrepassBase);
drawingSettings.SetShaderPassName(2, ShaderTagIDs.Always);
drawingSettings.SetShaderPassName(3, ShaderTagIDs.Vertex);
drawingSettings.SetShaderPassName(4, ShaderTagIDs.VertexLMRGBM);
drawingSettings.SetShaderPassName(5, ShaderTagIDs.VertexLM);

renderContext.SetupCameraProperties(camera);

_command.ClearRenderTarget(true, true, camera.backgroundColor);
renderContext.ExecuteCommandBuffer(_command);
_command.Clear();

renderContext.DrawRenderers(cullingResults, ref drawingSettings, ref _filteringSettings);
renderContext.DrawSkybox(camera);

Expand Down
1 change: 1 addition & 0 deletions Shaders/Standard.shader
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
{
Tags { "RenderPipeline"="VXGI" }

UsePass "Standard/FORWARD"
UsePass "Standard/DEFERRED"
UsePass "Hidden/VXGI/Voxelization/VOXELIZATION"
}
Expand Down