ContactParameterProvider ParameterType (#209)

* ContactParameterProvider ParameterType * test * changelog
bdunderscore · Mar 26, 2024 · 79e7f08 · 79e7f08
1 parent 1359f7a
commit 79e7f08
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Specify zh-* font to make the font normal
 
 ### Changed
+- In ParameterProvider, the parameter type of PhysBone Contact Receiver is now the type corresponding to the receiver type. (#209)
 
 ### Removed
 

diff --git a/Editor/VRChat/ParameterIntrospection/VRChatProviders/ContactParameterProvider.cs b/Editor/VRChat/ParameterIntrospection/VRChatProviders/ContactParameterProvider.cs
@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using VRC.SDK3.Dynamics.Contact.Components;
+using VRC.Dynamics;
+using UnityEngine;
 
 #endregion
 
@@ -26,7 +28,7 @@ public IEnumerable<ProvidedParameter> GetSuppliedParameters(BuildContext context
             return new[]
             {
                 new ProvidedParameter(_component.parameter, ParameterNamespace.Animator, _component,
-                    VRChatBuiltinProviderPlugin.Instance, null)
+                    VRChatBuiltinProviderPlugin.Instance,  _component.receiverType == ContactReceiver.ReceiverType.Proximity ? AnimatorControllerParameterType.Float : AnimatorControllerParameterType.Bool)
                 {
                     IsAnimatorOnly = true,
                     WantSynced = false,
@@ -40,4 +42,4 @@ public void RemapParameters(ref ImmutableDictionary<(ParameterNamespace, string)
             // no-op
         }
     }
-}
+}
diff --git a/UnitTests~/ParameterIntrospection/VRChatBindingsTest.cs b/UnitTests~/ParameterIntrospection/VRChatBindingsTest.cs
@@ -4,6 +4,7 @@
 using nadena.dev.ndmf;
 using NUnit.Framework;
 using UnityEngine;
+using VRC.Dynamics;
 using VRC.SDK3.Avatars.Components;
 using VRC.SDK3.Avatars.ScriptableObjects;
 using VRC.SDK3.Dynamics.Contact.Components;
@@ -78,17 +79,20 @@ public void VRCParams()
             Assert.AreEqual(1, parameters["syncedBool"].BitUsage);
             Assert.AreEqual(ParameterNamespace.Animator, parameters["syncedBool"].Namespace);
             Assert.IsTrue(parameters["syncedBool"].WantSynced);
-        }
-
-        [Test]
-        public void TestContact()
+        }
+
+        [TestCase(ContactReceiver.ReceiverType.Constant, AnimatorControllerParameterType.Bool)]
+        [TestCase(ContactReceiver.ReceiverType.OnEnter, AnimatorControllerParameterType.Bool)]
+        [TestCase(ContactReceiver.ReceiverType.Proximity, AnimatorControllerParameterType.Float)]
+        public void TestContact(ContactReceiver.ReceiverType receiverType, AnimatorControllerParameterType parameterType)
         {
             var root = CreateRoot("avatar");
             var desc = root.GetComponent<VRCAvatarDescriptor>();
             desc.expressionParameters = ScriptableObject.CreateInstance<VRCExpressionParameters>();
 
             var obj = CreateChild(root, "foo");
             var contact = obj.AddComponent<VRCContactReceiver>();
+            contact.receiverType = receiverType;
 
             var parameters = ParameterInfo.ForUI.GetParametersForObject(obj)
                 .ToImmutableDictionary(p => p.EffectiveName, p => p);
@@ -100,7 +104,7 @@ public void TestContact()
 
             Assert.AreEqual(1, parameters.Count);
             var param = parameters["abc"];
-            Assert.AreEqual(null, param.ParameterType);
+            Assert.AreEqual(parameterType, param.ParameterType);
             Assert.AreEqual(0, param.BitUsage);
             Assert.AreEqual(ParameterNamespace.Animator, param.Namespace);
             Assert.IsFalse(param.WantSynced);