Skip to content

Enable "Shaded Wireframe" scene view mode in HDRP & URP [Need C++ PR not backport on 2020.1 #356

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
merged 3 commits into from
May 22, 2020
Merged

Enable "Shaded Wireframe" scene view mode in HDRP & URP [Need C++ PR not backport on 2020.1 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cca5a48
Enable "Shaded Wireframe" scene view mode in HDRP & URP
aras-p May 4, 2020
d449210
Use new DrawWireOverlay API point to render wireframe
aras-p May 4, 2020
ab03ee1
Merge branch 'master' into scene/enable-textured-wire
sebastienlagarde May 22, 2020
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
15 changes: 15 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/HDRenderPipeline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,6 +2791,9 @@ void Callback(CommandBuffer c, HDCamera cam)
// We need to make sure the viewport is correctly set for the editor rendering. It might have been changed by debug overlay rendering just before.
cmd.SetViewport(hdCamera.finalViewport);

if (camera.cameraType == CameraType.SceneView)
RenderWireOverlay(cmd, camera, renderContext);

// Render overlay Gizmos
if (showGizmos)
RenderGizmos(cmd, camera, renderContext, GizmoSubset.PostImageEffects);
Expand Down Expand Up @@ -3111,6 +3114,18 @@ void RenderGizmos(CommandBuffer cmd, Camera camera, ScriptableRenderContext rend
#endif
}

#if UNITY_EDITOR
void RenderWireOverlay(CommandBuffer cmd, Camera camera, ScriptableRenderContext renderContext)
{
using (new ProfilingScope(cmd, ProfilingSampler.Get(HDProfileId.RenderWireFrame)))
{
renderContext.ExecuteCommandBuffer(cmd);
cmd.Clear();
renderContext.DrawWireOverlay(camera);
}
}
#endif

static RendererListDesc CreateOpaqueRendererListDesc(
CullingResults cull,
Camera camera,
Expand Down
3 changes: 1 addition & 2 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/SceneViewDrawMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ class SceneViewDrawMode

static private bool RejectDrawMode(SceneView.CameraMode cameraMode)
{
if (cameraMode.drawMode == DrawCameraMode.TexturedWire ||
cameraMode.drawMode == DrawCameraMode.ShadowCascades ||
if (cameraMode.drawMode == DrawCameraMode.ShadowCascades ||
cameraMode.drawMode == DrawCameraMode.RenderPaths ||
cameraMode.drawMode == DrawCameraMode.AlphaChannel ||
cameraMode.drawMode == DrawCameraMode.Overdraw ||
Expand Down
3 changes: 1 addition & 2 deletions com.unity.render-pipelines.universal/Runtime/SceneViewDrawMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ internal static class SceneViewDrawMode

static bool RejectDrawMode(SceneView.CameraMode cameraMode)
{
if (cameraMode.drawMode == DrawCameraMode.TexturedWire ||
cameraMode.drawMode == DrawCameraMode.ShadowCascades ||
if (cameraMode.drawMode == DrawCameraMode.ShadowCascades ||
cameraMode.drawMode == DrawCameraMode.RenderPaths ||
cameraMode.drawMode == DrawCameraMode.AlphaChannel ||
cameraMode.drawMode == DrawCameraMode.Overdraw ||
Expand Down
9 changes: 9 additions & 0 deletions com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ public void Execute(ScriptableRenderContext context, ref RenderingData rendering

EndXRRendering(cmd, context, ref renderingData.cameraData);

DrawWireOverlay(context, camera);
DrawGizmos(context, camera, GizmoSubset.PostImageEffects);

InternalFinishRendering(context, cameraData.resolveFinalTarget);
Expand Down Expand Up @@ -809,6 +810,14 @@ void DrawGizmos(ScriptableRenderContext context, Camera camera, GizmoSubset gizm
#endif
}

[Conditional("UNITY_EDITOR")]
void DrawWireOverlay(ScriptableRenderContext context, Camera camera)
{
#if UNITY_EDITOR
context.DrawWireOverlay(camera);
#endif
}

// Fill in render pass indices for each block. End index is startIndex + 1.
void FillBlockRanges(NativeArray<RenderPassEvent> blockEventLimits, NativeArray<int> blockRanges)
{
Expand Down