Moving draw gizmo away and remove all reference of authoring from baking

com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.cs

@@ -51,7 +51,6 @@ partial class ProbeGIBaking
     {
         static bool m_IsInit = false;
         static BakingBatch m_BakingBatch;
-        static ProbeReferenceVolumeAuthoring m_BakingReferenceVolumeAuthoring = null;
         static ProbeReferenceVolumeProfile m_BakingProfile = null;
         static ProbeVolumeBakingProcessSettings m_BakingSettings;
 
@@ -664,12 +663,18 @@ public static void RunPlacement()
             ApplySubdivisionResults(result, newRefToWS);
         }
 
-        public static ProbeSubdivisionContext PrepareProbeSubdivisionContext(ProbeReferenceVolumeAuthoring refVolume)
+        public static ProbeSubdivisionContext PrepareProbeSubdivisionContext()
         {
             ProbeSubdivisionContext ctx = new ProbeSubdivisionContext();
 
             // Prepare all the information in the scene for baking GI.
             Vector3 refVolOrigin = Vector3.zero; // TODO: This will need to be center of the world bounds.
+            if (m_BakingProfile == null)
+            {
+                var perSceneDataList = GameObject.FindObjectsOfType<ProbeVolumePerSceneData>();
+                if (perSceneDataList.Length == 0) return ctx;
+                SetBakingContext(perSceneDataList);
+            }
             ctx.Initialize(m_BakingProfile, refVolOrigin);
 
             return ctx;

com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoringEditor.cs

@@ -42,8 +42,12 @@ static void UpdateRealtimeSubdivisionDebug()
 
                 if (Time.realtimeSinceStartupAsDouble - s_LastSubdivisionTime > debugDisplay.subdivisionDelayInSeconds)
                 {
-                    var probeVolumeAuthoring = FindObjectOfType<ProbeReferenceVolumeAuthoring>();
-                    if (probeVolumeAuthoring == null || !probeVolumeAuthoring.isActiveAndEnabled)
+                    var probeVolume = FindObjectOfType<ProbeVolume>();
+                    if (probeVolume == null || !probeVolume.isActiveAndEnabled || ProbeReferenceVolume.instance.sceneData == null)
+                        return;
+
+                    var profile = ProbeReferenceVolume.instance.sceneData.GetProfileForScene(probeVolume.gameObject.scene);
+                    if (profile == null)
                         return;
 
                     if (s_CurrentSubdivision == null)
@@ -55,8 +59,8 @@ static void UpdateRealtimeSubdivisionDebug()
                     // Step the subdivision with the amount of cell per frame in debug menu
                     int updatePerFrame = debugDisplay.subdivisionCellUpdatePerFrame;
                     // From simplification level 5 and higher, the cost of calculating one cell is very high, so we adjust that number.
-                    if (probeVolumeAuthoring.profile.simplificationLevels > 4)
-                        updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, probeVolumeAuthoring.profile.simplificationLevels - 4));
+                    if (profile.simplificationLevels > 4)
+                        updatePerFrame = (int)Mathf.Max(1, updatePerFrame / Mathf.Pow(9, profile.simplificationLevels - 4));
                     for (int i = 0; i < debugDisplay.subdivisionCellUpdatePerFrame; i++)
                     {
                         if (!s_CurrentSubdivision.MoveNext())
@@ -69,12 +73,12 @@ static void UpdateRealtimeSubdivisionDebug()
 
                     IEnumerator Subdivide()
                     {
-                        var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext(probeVolumeAuthoring);
+                        var ctx = ProbeGIBaking.PrepareProbeSubdivisionContext();
 
                         // Cull all the cells that are not visible (we don't need them for realtime debug)
                         ctx.cells.RemoveAll(c =>
                         {
-                            return probeVolumeAuthoring.ShouldCullCell(c.position);
+                            return probeVolume.ShouldCullCell(c.position);
                         });
 
                         Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera;

com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeReferenceVolumeAuthoring.cs

@@ -104,10 +104,6 @@ internal static ProbeReferenceVolumeProfile CreateReferenceVolumeProfile(Scene s
         [SerializeField]
         float m_VirtualOffsetBiasOutOfGeometry = 0.01f;
 
-
-        MeshGizmo brickGizmos;
-        MeshGizmo cellGizmo;
-
         // In some cases Unity will magically popuplate this private field with a correct value even though it should not be serialized.
         // The [NonSerialized] attribute allows to force the asset to be null in case a domain reload happens.
         [NonSerialized]
@@ -155,11 +151,6 @@ internal void QueueAssetRemoval()
                 return;
 
 #if UNITY_EDITOR
-            brickGizmos?.Dispose();
-            brickGizmos = null;
-            cellGizmo?.Dispose();
-            cellGizmo = null;
-
             m_PrevAsset = null;
 #endif
         }
@@ -210,135 +201,6 @@ void OnDestroy()
             QueueAssetRemoval();
         }
 
-        internal bool ShouldCullCell(Vector3 cellPosition, Vector3 originWS = default(Vector3))
-        {
-            if (m_Profile == null)
-                return true;
-
-            var cameraTransform = SceneView.lastActiveSceneView.camera.transform;
-
-            Vector3 cellCenterWS = cellPosition * m_Profile.cellSizeInMeters + originWS + Vector3.one * (m_Profile.cellSizeInMeters / 2.0f);
-
-            // Round down to cell size distance
-            float roundedDownDist = Mathf.Floor(Vector3.Distance(cameraTransform.position, cellCenterWS) / m_Profile.cellSizeInMeters) * m_Profile.cellSizeInMeters;
-
-            if (roundedDownDist > ProbeReferenceVolume.instance.debugDisplay.subdivisionViewCullingDistance)
-                return true;
-
-            var frustumPlanes = GeometryUtility.CalculateFrustumPlanes(SceneView.lastActiveSceneView.camera);
-            var volumeAABB = new Bounds(cellCenterWS, m_Profile.cellSizeInMeters * Vector3.one);
-
-            return !GeometryUtility.TestPlanesAABB(frustumPlanes, volumeAABB);
-        }
-
-        // TODO: We need to get rid of Handles.DrawWireCube to be able to have those at runtime as well.
-        void OnDrawGizmos()
-        {
-            if (!enabled || !gameObject.activeSelf || !ProbeReferenceVolume.instance.isInitialized)
-                return;
-
-            var debugDisplay = ProbeReferenceVolume.instance.debugDisplay;
-
-            if (debugDisplay.drawBricks)
-            {
-                var subdivColors = ProbeReferenceVolume.instance.subdivisionDebugColors;
-
-                IEnumerable<ProbeBrickIndex.Brick> GetVisibleBricks()
-                {
-                    if (debugDisplay.realtimeSubdivision)
-                    {
-                        // realtime subdiv cells are already culled
-                        foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo)
-                        {
-                            var cellVolume = kp.Key;
-
-                            foreach (var brick in kp.Value)
-                            {
-                                yield return brick;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        foreach (var cell in ProbeReferenceVolume.instance.cells.Values)
-                        {
-                            if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS))
-                                continue;
-
-                            if (cell.bricks == null)
-                                continue;
-
-                            foreach (var brick in cell.bricks)
-                                yield return brick;
-                        }
-                    }
-                }
-
-                if (brickGizmos == null)
-                    brickGizmos = new MeshGizmo((int)(Mathf.Pow(3, ProbeBrickIndex.kMaxSubdivisionLevels) * MeshGizmo.vertexCountPerCube));
-
-                brickGizmos.Clear();
-                foreach (var brick in GetVisibleBricks())
-                {
-                    if (brick.subdivisionLevel < 0)
-                        continue;
-
-                    Vector3 scaledSize = Vector3.one * Mathf.Pow(3, brick.subdivisionLevel);
-                    Vector3 scaledPos = brick.position + scaledSize / 2;
-                    brickGizmos.AddWireCube(scaledPos, scaledSize, subdivColors[brick.subdivisionLevel]);
-                }
-
-                brickGizmos.RenderWireframe(ProbeReferenceVolume.instance.GetRefSpaceToWS(), gizmoName: "Brick Gizmo Rendering");
-            }
-
-            if (debugDisplay.drawCells)
-            {
-                IEnumerable<Vector3> GetVisibleCellCenters()
-                {
-                    if (debugDisplay.realtimeSubdivision)
-                    {
-                        foreach (var kp in ProbeReferenceVolume.instance.realtimeSubdivisionInfo)
-                        {
-                            kp.Key.CalculateCenterAndSize(out var center, out var _);
-                            yield return center;
-                        }
-                    }
-                    else
-                    {
-                        foreach (var cell in ProbeReferenceVolume.instance.cells.Values)
-                        {
-                            if (ShouldCullCell(cell.position, ProbeReferenceVolume.instance.GetTransform().posWS))
-                                continue;
-
-                            var positionF = new Vector3(cell.position.x, cell.position.y, cell.position.z);
-                            var center = positionF * m_Profile.cellSizeInMeters + m_Profile.cellSizeInMeters * 0.5f * Vector3.one;
-                            yield return center;
-                        }
-                    }
-                }
-
-                Matrix4x4 trs = Matrix4x4.TRS(ProbeReferenceVolume.instance.GetTransform().posWS, ProbeReferenceVolume.instance.GetTransform().rot, Vector3.one);
-
-                // For realtime subdivision, the matrix from ProbeReferenceVolume.instance can be wrong if the profile changed since the last bake
-                if (debugDisplay.realtimeSubdivision)
-                    trs = Matrix4x4.TRS(transform.position, Quaternion.identity, Vector3.one);
-
-                // Fetching this from components instead of from the reference volume allows the user to
-                // preview how cells will look before they commit to a bake.
-                Gizmos.color = new Color(0, 1, 0.5f, 0.2f);
-                Gizmos.matrix = trs;
-                if (cellGizmo == null)
-                    cellGizmo = new MeshGizmo();
-                cellGizmo.Clear();
-                foreach (var center in GetVisibleCellCenters())
-                {
-                    Gizmos.DrawCube(center, Vector3.one * m_Profile.cellSizeInMeters);
-                    cellGizmo.AddWireCube(center, Vector3.one * m_Profile.cellSizeInMeters, new Color(0, 1, 0.5f, 1));
-                }
-                cellGizmo.RenderWireframe(Gizmos.matrix, gizmoName: "Brick Gizmo Rendering");
-            }
-        }
-
         // IMPORTANT TODO: This is to be deleted when we have the proper setting panel.
         private void Update()
         {