🐛 fix: Status Indicator as GameObject

esnya · May 17, 2022 · 3b71bf8 · 3b71bf8
1 parent e877ced
commit 3b71bf8
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 124 deletions.
diff --git a/Assets/SerializedUdonPrograms/00b1b96886267264684ade035feca167.asset b/Assets/SerializedUdonPrograms/00b1b96886267264684ade035feca167.asset
diff --git a/Assets/UdonRadioCommunication/Scripts/Transmitter.asset b/Assets/UdonRadioCommunication/Scripts/Transmitter.asset
@@ -43,7 +43,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 13
+      Data: 12
     - Name: 
       Entry: 7
       Data: 
@@ -352,7 +352,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: statusActive
+      Data: statusInactive
     - Name: $v
       Entry: 7
       Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
@@ -379,10 +379,10 @@ MonoBehaviour:
       Data: UnityEngineMaterial
     - Name: symbolOriginalName
       Entry: 1
-      Data: statusActive
+      Data: statusInactive
     - Name: symbolUniqueName
       Entry: 1
-      Data: statusActive
+      Data: statusInactive
     - Name: symbolDefaultValue
       Entry: 6
       Data: 
@@ -415,7 +415,7 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: statusDeactivating
+      Data: statusActive
     - Name: $v
       Entry: 7
       Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
@@ -436,10 +436,10 @@ MonoBehaviour:
       Data: UnityEngineMaterial
     - Name: symbolOriginalName
       Entry: 1
-      Data: statusDeactivating
+      Data: statusActive
     - Name: symbolUniqueName
       Entry: 1
-      Data: statusDeactivating
+      Data: statusActive
     - Name: symbolDefaultValue
       Entry: 6
       Data: 
@@ -463,22 +463,16 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: indicatorAsLocal
+      Data: statusDeactivating
     - Name: $v
       Entry: 7
       Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: fieldSymbol
       Entry: 7
       Data: 27|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
-      Entry: 7
-      Data: 28|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.Boolean, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 22
     - Name: declarationType
       Entry: 3
       Data: 1
@@ -487,31 +481,22 @@ MonoBehaviour:
       Data: 0
     - Name: symbolResolvedTypeName
       Entry: 1
-      Data: SystemBoolean
+      Data: UnityEngineMaterial
     - Name: symbolOriginalName
       Entry: 1
-      Data: indicatorAsLocal
+      Data: statusDeactivating
     - Name: symbolUniqueName
       Entry: 1
-      Data: indicatorAsLocal
+      Data: statusDeactivating
     - Name: symbolDefaultValue
       Entry: 6
       Data: 
     - Name: 
       Entry: 8
       Data: 
     - Name: fieldAttributes
-      Entry: 7
-      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 23
     - Name: userBehaviourSource
       Entry: 6
       Data: 
@@ -526,37 +511,37 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: urc
+      Data: indicatorAsLocal
     - Name: $v
       Entry: 7
-      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: fieldSymbol
       Entry: 7
-      Data: 31|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
+      Data: 29|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
       Entry: 7
-      Data: 32|System.RuntimeType, mscorlib
+      Data: 30|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime
+      Data: System.Boolean, mscorlib
     - Name: 
       Entry: 8
       Data: 
     - Name: declarationType
       Entry: 3
-      Data: 2
+      Data: 1
     - Name: syncMode
       Entry: 3
       Data: 0
     - Name: symbolResolvedTypeName
       Entry: 1
-      Data: VRCUdonUdonBehaviour
+      Data: SystemBoolean
     - Name: symbolOriginalName
       Entry: 1
-      Data: urc
+      Data: indicatorAsLocal
     - Name: symbolUniqueName
       Entry: 1
-      Data: urc
+      Data: indicatorAsLocal
     - Name: symbolDefaultValue
       Entry: 6
       Data: 
@@ -565,16 +550,10 @@ MonoBehaviour:
       Data: 
     - Name: fieldAttributes
       Entry: 7
-      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 1
-    - Name: 
-      Entry: 7
-      Data: 34|System.NonSerializedAttribute, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -595,19 +574,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: indiatorRenderer
+      Data: urc
     - Name: $v
       Entry: 7
-      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: fieldSymbol
       Entry: 7
-      Data: 36|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
+      Data: 33|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
       Entry: 7
-      Data: 37|System.RuntimeType, mscorlib
+      Data: 34|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UnityEngine.Renderer, UnityEngine.CoreModule
+      Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -619,13 +598,13 @@ MonoBehaviour:
       Data: 0
     - Name: symbolResolvedTypeName
       Entry: 1
-      Data: UnityEngineRenderer
+      Data: VRCUdonUdonBehaviour
     - Name: symbolOriginalName
       Entry: 1
-      Data: indiatorRenderer
+      Data: urc
     - Name: symbolUniqueName
       Entry: 1
-      Data: indiatorRenderer
+      Data: urc
     - Name: symbolDefaultValue
       Entry: 6
       Data: 
@@ -634,67 +613,16 @@ MonoBehaviour:
       Data: 
     - Name: fieldAttributes
       Entry: 7
-      Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 0
-    - Name: 
-      Entry: 13
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: userBehaviourSource
-      Entry: 6
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 8
-      Data: 
+      Data: 1
     - Name: 
       Entry: 7
-      Data: 
-    - Name: $k
-      Entry: 1
-      Data: statusInactive
-    - Name: $v
-      Entry: 7
-      Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: fieldSymbol
-      Entry: 7
-      Data: 40|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
-    - Name: internalType
-      Entry: 9
-      Data: 22
-    - Name: declarationType
-      Entry: 3
-      Data: 2
-    - Name: syncMode
-      Entry: 3
-      Data: 0
-    - Name: symbolResolvedTypeName
-      Entry: 1
-      Data: UnityEngineMaterial
-    - Name: symbolOriginalName
-      Entry: 1
-      Data: statusInactive
-    - Name: symbolUniqueName
-      Entry: 1
-      Data: statusInactive
-    - Name: symbolDefaultValue
-      Entry: 6
-      Data: 
+      Data: 36|System.NonSerializedAttribute, mscorlib
     - Name: 
       Entry: 8
       Data: 
-    - Name: fieldAttributes
-      Entry: 7
-      Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 0
     - Name: 
       Entry: 13
       Data: 
@@ -718,10 +646,10 @@ MonoBehaviour:
       Data: lastActivatedTime
     - Name: $v
       Entry: 7
-      Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: fieldSymbol
       Entry: 7
-      Data: 43|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
+      Data: 38|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
       Entry: 9
       Data: 4
@@ -748,7 +676,7 @@ MonoBehaviour:
       Data: 
     - Name: fieldAttributes
       Entry: 7
-      Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0
@@ -775,13 +703,13 @@ MonoBehaviour:
       Data: _active
     - Name: $v
       Entry: 7
-      Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: fieldSymbol
       Entry: 7
-      Data: 46|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
+      Data: 41|UdonSharp.Compiler.SymbolDefinition, UdonSharp.Editor
     - Name: internalType
       Entry: 9
-      Data: 28
+      Data: 30
     - Name: declarationType
       Entry: 3
       Data: 2
@@ -805,19 +733,19 @@ MonoBehaviour:
       Data: 
     - Name: fieldAttributes
       Entry: 7
-      Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 2
     - Name: 
       Entry: 7
-      Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
     - Name: 
       Entry: 8
       Data: 
     - Name: 
       Entry: 7
-      Data: 49|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+      Data: 44|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
     - Name: 
       Entry: 8
       Data: 

diff --git a/Assets/UdonRadioCommunication/Scripts/Transmitter.cs b/Assets/UdonRadioCommunication/Scripts/Transmitter.cs
@@ -13,13 +13,11 @@ public class Transmitter : UdonSharpBehaviour
         public float minDistance = 5.0f;
         public GameObject indicator;
         public GameObject statusIndicator;
-        public Material statusActive, statusDeactivating;
+        public Material statusInactive, statusActive, statusDeactivating;
         public bool indicatorAsLocal = false;
 
         [System.NonSerialized] public UdonSharpBehaviour urc;
 
-        private Renderer indiatorRenderer;
-        private Material statusInactive;
         private float lastActivatedTime;
         [UdonSynced][FieldChangeCallback(nameof(Active))] private bool _active;
         public bool Active
@@ -35,7 +33,6 @@ public bool Active
 
         private void Start()
         {
-            if (statusIndicator) statusInactive = statusIndicator.GetComponent<Renderer>().sharedMaterial;
             Active = false;
         }
 
@@ -85,7 +82,7 @@ private void SetIndicatorMateial(Material material)
             foreach (var renderer in statusIndicator.GetComponentsInChildren<Renderer>(true))
             {
                 if (!renderer) continue;
-                 renderer.sharedMaterial = statusDeactivating;
+                 renderer.sharedMaterial = material;
             }
         }
     }