Skip to content

Fix draw gizmos in Game View #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Looooong merged 1 commit into from
Jul 4, 2020
Merged

Fix draw gizmos in Game View #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
- Upgraded to Unity 2019. Dropped support for Unity 2018.
- Removed `dynamicBatching` from Render Pipeline Asset. Configure dynamic batching in `Project Settings/Player/Others Settings` instead.

### Fixed

- Fixed the gizmos being drawn in Game View.

## [0.0.1]

### Added
Expand Down
13 changes: 11 additions & 2 deletions Runtime/SRP/VXGIRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void RenderDeferred(ScriptableRenderContext renderContext, Camera camera,
RenderTransparent(renderContext, camera);
TriggerCameraEvent(renderContext, camera, CameraEvent.AfterForwardAlpha, vxgi);

renderContext.DrawGizmos(camera, GizmoSubset.PreImageEffects);
RenderGizmos(renderContext, camera, GizmoSubset.PreImageEffects);

TriggerCameraEvent(renderContext, camera, CameraEvent.BeforeImageEffects, vxgi);
RenderPostProcessing(renderContext, camera);
Expand All @@ -123,7 +123,7 @@ public void RenderDeferred(ScriptableRenderContext renderContext, Camera camera,
_command.Clear();
TriggerCameraEvent(renderContext, camera, CameraEvent.AfterImageEffects, vxgi);

renderContext.DrawGizmos(camera, GizmoSubset.PostImageEffects);
RenderGizmos(renderContext, camera, GizmoSubset.PostImageEffects);

TriggerCameraEvent(renderContext, camera, CameraEvent.AfterEverything, vxgi);

Expand Down Expand Up @@ -167,6 +167,15 @@ void RenderGBuffers(ScriptableRenderContext renderContext, Camera camera) {
renderContext.DrawRenderers(_cullingResults, ref drawingSettings, ref _filteringSettings);
}

[System.Diagnostics.Conditional("UNITY_EDITOR")]
void RenderGizmos(ScriptableRenderContext renderContext, Camera camera, GizmoSubset gizmoSubset)
{
if (UnityEditor.SceneView.currentDrawingSceneView?.drawGizmos ?? false)
{
renderContext.DrawGizmos(camera, gizmoSubset);
}
}

void RenderLighting(ScriptableRenderContext renderContext, Camera camera, VXGI vxgi) {
Matrix4x4 clipToWorld = camera.cameraToWorldMatrix * GL.GetGPUProjectionMatrix(camera.projectionMatrix, false).inverse;

Expand Down