initiliaze globals properly

z3y · Oct 23, 2023 · 662e713 · 662e713
1 parent df90963
commit 662e713
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/Runtime/CBIRPLight.cs b/Runtime/CBIRPLight.cs
@@ -95,7 +95,7 @@ async void CopyShadowMaskID()
         {
             await Task.Delay(1000);
 
-            if (Application.isPlaying)
+            if (Application.isPlaying || !_unityLight)
             {
                 return;
             }

diff --git a/Runtime/CBIRPManager.cs b/Runtime/CBIRPManager.cs
@@ -4,7 +4,6 @@
 
 #if UNITY_EDITOR && !COMPILER_UDONSHARP
 using UnityEditor;
-using System.Threading.Tasks;
 #endif
 
 namespace CBIRP

diff --git a/Runtime/CBIRPManagerEditor.cs b/Runtime/CBIRPManagerEditor.cs
@@ -1,6 +1,7 @@
 #if !COMPILER_UDONSHARP && UNITY_EDITOR
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
@@ -14,6 +15,21 @@ public class CBIRPManagerEditor : IProcessSceneWithReport, IActiveBuildTargetCha
     {
         public int callbackOrder => 0;
 
+        [InitializeOnLoadMethod]
+        public async static void InitliazeGlobals()
+        {
+            await Task.Delay(1000);
+
+            var manager = GameObject.FindObjectOfType<CBIRPManager>();
+            if (!manager)
+            {
+                return;
+            }
+
+            manager.OnValidate();
+        }
+
+
         public void OnActiveBuildTargetChanged(BuildTarget previousTarget, BuildTarget newTarget)
         {
             // clear out packed texture arrays to not destroy performance on android
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,7 @@ async void CopyShadowMaskID() @@
             {
                 await Task.Delay(1000);
-                if (Application.isPlaying)
+                if (Application.isPlaying || !_unityLight)
                 {
                     return;
                 }
@@ Expand Down @@