Merge pull request #58 from Looooong/use-handles-to-check-whether-to-draw-gizmos-or-not

Looooong · web-flow · commit 1ae24058daa7 · 2020-07-07T15:16:12.000+07:00
Use Handles to check whether to draw gizmos or not
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Fixed
 
 - Fixed the gizmos being drawn in Game View.
+- Fixed camera stacking.
 
 ## [0.0.1]
 
diff --git a/Runtime/SRP/VXGIRenderer.cs b/Runtime/SRP/VXGIRenderer.cs
@@ -172,10 +172,12 @@ void RenderGBuffers(ScriptableRenderContext renderContext, Camera camera) {
   [System.Diagnostics.Conditional("UNITY_EDITOR")]
   void RenderGizmos(ScriptableRenderContext renderContext, Camera camera, GizmoSubset gizmoSubset)
   {
-    if (UnityEditor.SceneView.currentDrawingSceneView?.drawGizmos ?? false)
+#if UNITY_EDITOR
+    if (UnityEditor.Handles.ShouldRenderGizmos())
     {
       renderContext.DrawGizmos(camera, gizmoSubset);
     }
+#endif
   }
 
   void RenderLighting(ScriptableRenderContext renderContext, Camera camera, VXGI vxgi) {

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,12 @@ void RenderGBuffers(ScriptableRenderContext renderContext, Camera camera) {`
`172`	`172`	`[System.Diagnostics.Conditional("UNITY_EDITOR")]`
`173`	`173`	`void RenderGizmos(ScriptableRenderContext renderContext, Camera camera, GizmoSubset gizmoSubset)`
`174`	`174`	`{`
`175`		`- if (UnityEditor.SceneView.currentDrawingSceneView?.drawGizmos ?? false)`
	`175`	`+#if UNITY_EDITOR`
	`176`	`+ if (UnityEditor.Handles.ShouldRenderGizmos())`
`176`	`177`	`{`
`177`	`178`	`renderContext.DrawGizmos(camera, gizmoSubset);`
`178`	`179`	`}`
	`180`	`+#endif`
`179`	`181`	`}`
`180`	`182`
`181`	`183`	`void RenderLighting(ScriptableRenderContext renderContext, Camera camera, VXGI vxgi) {`