update probe in editor

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

Hide file tree

Showing 5 changed files with 157 additions and 6 deletions.
diff --git a/Runtime/CBIRPReflectionProbe.cs b/Runtime/CBIRPReflectionProbe.cs
@@ -1,8 +1,14 @@
-
-using UdonSharp;
+using UdonSharp;
 using UnityEngine;
 using VRC.SDKBase;
 using VRC.Udon;
+using UdonSharpEditor;
+
+#if UNITY_EDITOR && !COMPILER_UDONSHARP
+using UnityEditor;
+using System.Collections;
+using System.Collections.Generic;
+#endif
 
 namespace CBIRP
 {
@@ -56,8 +62,10 @@ void Start()
         public void UpdateProbe()
         {
             meshRenderer.sortingOrder = 128 - probe.importance;
-
-            _propertyBlock = new MaterialPropertyBlock();
+            if (_propertyBlock == null)
+            {
+                _propertyBlock = new MaterialPropertyBlock();
+            }
 
             //float intensity = probe.textureHDRDecodeValues.x;
             _data0.x = probe.intensity;
@@ -75,7 +83,13 @@ public void UpdateProbe()
             meshRenderer.SetPropertyBlock(_propertyBlock);
         }
 
-#if UNITY_EDITOR
+#if UNITY_EDITOR && !COMPILER_UDONSHARP
+
+        private void Update()
+        {
+            Debug.Log("aaa");
+        }
+
         public void OnValidate()
         {
             if (!_initialized)
@@ -89,4 +103,24 @@ public void OnValidate()
         }
 #endif
     }
+
+#if UNITY_EDITOR && !COMPILER_UDONSHARP
+    [CustomEditor(typeof(CBIRPReflectionProbe))]
+    public class CBIRPReflectionProbeEditor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return;
+
+            base.OnInspectorGUI();
+
+            if (Application.isPlaying)
+            {
+                return;
+            }
+            var probe = (CBIRPReflectionProbe)target;
+            probe.UpdateProbe();
+        }
+    }
+#endif
 }
diff --git a/Shaders/CBIRP_Internal_Uniforms_Lights.mat b/Shaders/CBIRP_Internal_Uniforms_Lights.mat
@@ -20,5 +20,6 @@ Material:
     serializedVersion: 3
     m_TexEnvs: []
     m_Floats:
+    - _Clear: 0
     - _ReflectionProbe: 0
     m_Colors: []
diff --git a/Shaders/Standard.shader.meta b/Shaders/Standard.shader.meta
diff --git a/Shaders/dfg-multiscatter 1.exr b/Shaders/dfg-multiscatter 1.exr
diff --git a/Shaders/dfg-multiscatter 1.exr.meta b/Shaders/dfg-multiscatter 1.exr.meta