feat: global culling

mob-sakai · Nov 16, 2023 · be0c648 · be0c648
1 parent c812962
commit be0c648
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/Assets/ProjectSettings/CompositeCanvasRenderer.asset b/Assets/ProjectSettings/CompositeCanvasRenderer.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 8b894cfc7d9884b4d9a048119fbfde1e, type: 3}
  m_Name: CompositeCanvasRenderer
  m_EditorClassIdentifier: 
- m_DownSamplingRate: 1
  m_TransformSensitivity: 1
- m_EnableCullingInEditor: 0
+ m_EnableCullingInPlayMode: 1
+ m_EnableCullingInEditMode: 1
  m_AutoIncludeShaders: 1
diff --git a/Packages/src/Runtime/CompositeCanvasRenderer.cs b/Packages/src/Runtime/CompositeCanvasRenderer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using CompositeCanvas.Effects;
 using CompositeCanvas.Enums;
+using CompositeCanvas.ProjectSettings;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.Profiling;
@@ -289,7 +290,7 @@ public override Texture mainTexture
  /// </summary>
  public bool culling
  {
- get => m_Culling;
+ get => CompositeCanvasRendererProjectSettings.enableCulling && m_Culling;
  set
  {
  if (m_Culling == value) return;
@@ -766,6 +767,7 @@ internal void Unregister(CompositeCanvasSource canvasSource)
  private bool IsAnySourceInRenderer()
  {
  if (!transform.lossyScale.IsVisible()) return false;
+ if (!culling) return true;
 
  for (var i = 0; i < sources.Count; i++)
  {
@@ -781,6 +783,8 @@ private bool IsAnySourceInRenderer()
 
  private bool IsInCanvasViewport()
  {
+ if (!culling) return true;
+
  if (FrameCache.TryGet(this, nameof(IsInCanvasViewport), out bool result))
  {
  return result;

diff --git a/Packages/src/Runtime/ProjectSettings/CompositeCanvasRendererProjectSettings.cs b/Packages/src/Runtime/ProjectSettings/CompositeCanvasRendererProjectSettings.cs
@@ -12,12 +12,32 @@ public class CompositeCanvasRendererProjectSettings
  [SerializeField]
  private TransformSensitivity m_TransformSensitivity = TransformSensitivity.Medium;
 
+ [SerializeField]
+ private bool m_EnableCullingInPlayMode = true;
+
+ [SerializeField]
+ private bool m_EnableCullingInEditMode = true;
+
 #if UNITY_EDITOR
  [Header("Shader")]
  [SerializeField]
  private bool m_AutoIncludeShaders = true;
 #endif
 
+ public static bool enableCulling
+ {
+ get
+ {
+#if UNITY_EDITOR
+ if (!Application.isPlaying)
+ {
+ return instance.m_EnableCullingInEditMode;
+ }
+#endif
+ return instance.m_EnableCullingInPlayMode;
+ }
+ }
+
  public static TransformSensitivity transformSensitivity
  {
  get => instance.m_TransformSensitivity;