Add handling for DisableInteractive

MerlinVR · MerlinVR · commit 44b47e8e4b36 · 2021-06-05T08:42:12.000-07:00
diff --git a/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs b/Assets/UdonSharp/Editor/UdonSharpExpressionCapture.cs
@@ -385,6 +385,9 @@ private MethodInfo GetUdonGetMethodInfo()
             if (captureProperty.ReflectedType == typeof(VRC.Udon.UdonBehaviour))
             {
                 PropertyInfo property = typeof(Component).GetProperty(captureProperty.Name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
+                if (property == null)
+                    property = typeof(VRC.Udon.UdonBehaviour).GetProperty(captureProperty.Name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
+
                 if (property == null)
                     return null;
 
@@ -402,10 +405,14 @@ private MethodInfo GetUdonSetMethodInfo()
             if (captureProperty.ReflectedType == typeof(VRC.Udon.UdonBehaviour))
             {
                 PropertyInfo property = typeof(Component).GetProperty(captureProperty.Name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
+
+                if (property == null)
+                    property = typeof(VRC.Udon.UdonBehaviour).GetProperty(captureProperty.Name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static);
+
                 if (property == null)
                     return null;
 
-                return property.GetGetMethod();
+                return property.GetSetMethod();
             }
 
             return captureProperty.GetSetMethod();
@@ -2349,7 +2356,7 @@ private bool HandleLocalUdonBehaviourPropertyLookup(string localUdonPropertyName
         {
             PropertyInfo[] foundProperties = _componentProperties.Where(e => e.Name == localUdonPropertyName).ToArray();
             
-            if (localUdonPropertyName == "enabled")
+            if (localUdonPropertyName == "enabled" || localUdonPropertyName == "DisableInteractive")
                 foundProperties = _udonEventReceiverProperties.Where(e => e.Name == localUdonPropertyName).ToArray();
 
             if (foundProperties.Length == 0)
diff --git a/Assets/UdonSharp/Scripts/UdonSharpBehaviour.cs b/Assets/UdonSharp/Scripts/UdonSharpBehaviour.cs
@@ -77,6 +77,11 @@ public void SendCustomEventDelayedSeconds(string eventName, float delaySeconds,
         /// <param name="eventTiming"></param>
         public void SendCustomEventDelayedFrames(string eventName, int delayFrames, VRC.Udon.Common.Enums.EventTiming eventTiming = VRC.Udon.Common.Enums.EventTiming.Update) { }
 
+        /// <summary>
+        /// Disables Interact events on this UdonBehaviour and disables the interact outline on the object this is attached to
+        /// </summary>
+        public bool DisableInteractive { get; set; }
+
         public static GameObject VRCInstantiate(GameObject original)
         {
             return Instantiate(original);
diff --git a/Assets/UdonSharp/Tests/TestScripts/Core/MethodCallsTest.cs b/Assets/UdonSharp/Tests/TestScripts/Core/MethodCallsTest.cs
@@ -104,6 +104,21 @@ public void ExecuteTests()
             tester.TestAssertion("Transform detach parent (null parameter method finding)", transform.parent == null);
 
             transform.SetParent(currentParent);
+
+            selfUdon.DisableInteractive = true;
+
+            tester.TestAssertion("DisableInteractive true", selfUdon.DisableInteractive); 
+            
+            self.DisableInteractive = false;
+
+            tester.TestAssertion("DisableInteractive false", !self.DisableInteractive);
+
+            DisableInteractive = true;
+
+            tester.TestAssertion("DisableInteractive true 2", DisableInteractive);
+
+            DisableInteractive = false;
+            tester.TestAssertion("DisableInteractive false 2", !DisableInteractive);
         }
     }
 }
