💥 pref!: Use RefrectionProbe tpye

esnya · Apr 13, 2021 · 97bfef7 · 97bfef7
1 parent 6fa261e
commit 97bfef7
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 60 deletions.
diff --git a/Assets/UdonSunController/Scripts/PickupController.cs b/Assets/UdonSunController/Scripts/PickupController.cs
@@ -1,15 +1,8 @@
 using UdonSharp;
 using UdonToolkit;
 using UnityEngine;
-using VRC.SDKBase;
-using VRC.Udon;
 using VRC.Udon.Common.Interfaces;
 
-#if UNITY_EDITOR && !COMPILER_UDONSHARP
-using UdonSharpEditor;
-using UnityEditor;
-#endif
-
 namespace EsnyaFactory.UdonSunController
 {
     [CustomName("Pickup Controller")]
@@ -53,7 +46,7 @@ public class PickupController : UdonSharpBehaviour
         [ListView("OnDrop Target List")][Popup("behaviour", "onDropTargets", true)][UTEditor]
         public string[] onDropEvents;
 
-        
+
         #endregion
 
         #region Private Variables

diff --git a/Assets/UdonSunController/Scripts/ReflectionProbeController.cs b/Assets/UdonSunController/Scripts/ReflectionProbeController.cs
diff --git a/Assets/UdonSunController/Scripts/ReflectionProbeUpdater.cs b/Assets/UdonSunController/Scripts/ReflectionProbeUpdater.cs
@@ -0,0 +1,27 @@
+
+using UdonSharp;
+using UdonToolkit;
+using UnityEngine;
+
+namespace EsnyaFactory.UdonSunController
+{
+    [CustomName("Reflection Probe Updater")]
+    [HelpMessage("Updates ReflectionProbe at runtime. Currently, only the \"RenderProbe\" event is available to update the in real-time mode.")]
+    public class ReflectionProbeUpdater : UdonSharpBehaviour
+    {
+        public ReflectionProbe reflectionProbe;
+        public bool renderOnStart;
+
+        void Start()
+        {
+            if (renderOnStart) RenderProbe();
+        }
+
+        public void RenderProbe()
+        {
+            if (reflectionProbe == null) return;
+            Debug.Log($"[{gameObject.name}] ReflectionProbe rendering");
+            reflectionProbe.RenderProbe();
+        }
+    }
+}
diff --git a/...Scripts/ReflectionProbeController.cs.meta → ...er/Scripts/ReflectionProbeUpdater.cs.meta b/...Scripts/ReflectionProbeController.cs.meta → ...er/Scripts/ReflectionProbeUpdater.cs.meta
diff --git a/Assets/UdonSunController/SerializedUdonPrograms/e30134c8ded0d6e4ab0c52acdb2319c9.asset b/Assets/UdonSunController/SerializedUdonPrograms/e30134c8ded0d6e4ab0c52acdb2319c9.asset
diff --git a/Assets/UdonSunController/SunController.prefab b/Assets/UdonSunController/SunController.prefab
diff --git a/...ramAssets/ReflectionProbeController.asset → ...rogramAssets/ReflectionProbeUpdater.asset b/...ramAssets/ReflectionProbeController.asset → ...rogramAssets/ReflectionProbeUpdater.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
-  m_Name: ReflectionProbeController
+  m_Name: ReflectionProbeUpdater
   m_EditorClassIdentifier: 
   serializedUdonProgramAsset: {fileID: 11400000, guid: 0f573cf5c13741b4982dcd0b517ca042,
     type: 2}
@@ -60,7 +60,7 @@ MonoBehaviour:
       Data: 4|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UnityEngine.GameObject, UnityEngine.CoreModule
+      Data: UnityEngine.ReflectionProbe, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -72,7 +72,7 @@ MonoBehaviour:
       Data: 0
     - Name: symbolResolvedTypeName
       Entry: 1
-      Data: UnityEngineGameObject
+      Data: UnityEngineReflectionProbe
     - Name: symbolOriginalName
       Entry: 1
       Data: reflectionProbe
@@ -182,14 +182,8 @@ MonoBehaviour:
       Entry: 7
       Data: 11|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
-      Entry: 7
-      Data: 12|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: UnityEngine.ReflectionProbe, UnityEngine.CoreModule
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 4
     - Name: declarationType
       Entry: 3
       Data: 2
@@ -213,7 +207,7 @@ MonoBehaviour:
       Data: 
     - Name: fieldAttributes
       Entry: 7
-      Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0

diff --git a/...sets/ReflectionProbeController.asset.meta → ...mAssets/ReflectionProbeUpdater.asset.meta b/...sets/ReflectionProbeController.asset.meta → ...mAssets/ReflectionProbeUpdater.asset.meta