Merge pull request #1129 from anatawa12/vrc-constraints-beta-support

feat: minimal VRCConstraints support
anatawa12 · Aug 1, 2024 · dda37c7 · dda37c7
2 parents 35f0d06 + c2fb8f1
commit dda37c7
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 0 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Experimental VRCConstraints support `#1129`
+  - This only works for VRCSDK `3.6.2-constraints.3` and not works with other versions including future versions.
 
 ### Changed
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Experimental VRCConstraints support `#1129`
+  - This only works for VRCSDK `3.6.2-constraints.3` and not works with other versions including future versions.
 
 ### Changed
 

diff --git a/Editor/APIInternal/ComponentInfos.VRCSDK.cs b/Editor/APIInternal/ComponentInfos.VRCSDK.cs
@@ -14,6 +14,11 @@
 using VRC.SDK3.Dynamics.PhysBone.Components;
 using VRC.SDKBase;
 
+#if AAO_VRCSDK3_AVATARS_CONSTRAINTS
+using VRC.Dynamics.ManagedTypes;
+using VRC.SDK3.Dynamics.Constraint.Components;
+#endif
+
 namespace Anatawa12.AvatarOptimizer.APIInternal.VRCSDK
 {
     [ComponentInformation(typeof(VRCTestMarker))]
@@ -497,5 +502,53 @@ protected override void CollectDependency(VRCHeadChop component, ComponentDepend
         }
     }
 #endif
+
+#if AAO_VRCSDK3_AVATARS_CONSTRAINTS
+    [ComponentInformation(typeof(VRCConstraintBase))]
+    [ComponentInformation(typeof(VRCParentConstraintBase))]
+    [ComponentInformation(typeof(VRCParentConstraint))]
+    [ComponentInformation(typeof(VRCPositionConstraintBase))]
+    [ComponentInformation(typeof(VRCPositionConstraint))]
+    [ComponentInformation(typeof(VRCRotationConstraintBase))]
+    [ComponentInformation(typeof(VRCRotationConstraint))]
+    [ComponentInformation(typeof(VRCScaleConstraintBase))]
+    [ComponentInformation(typeof(VRCScaleConstraint))]
+    internal class VRCConstraintInformation<T> : ComponentInformation<T> where T : VRCConstraintBase
+    {
+        protected override void CollectDependency(T component, ComponentDependencyCollector collector)
+        {
+            collector.AddDependency(component.transform, component)
+                .OnlyIfTargetCanBeEnable()
+                .EvenIfDependantDisabled();
+
+            foreach (var source in component.Sources)
+                collector.AddDependency(source.SourceTransform);
+
+            // we may mark heavy behavior with complex rules but it's extremely difficult to implement
+            // so mark behavior for now
+            collector.MarkBehaviour();
+        }
+
+        protected override void CollectMutations(T component, ComponentMutationsCollector collector)
+        {
+            collector.TransformRotation(component.TargetTransform ? component.TargetTransform : component.transform);
+        }
+    }
+
+    [ComponentInformation(typeof(VRCWorldUpConstraintBase))]
+    [ComponentInformation(typeof(VRCAimConstraintBase))]
+    [ComponentInformation(typeof(VRCAimConstraint))]
+    [ComponentInformation(typeof(VRCLookAtConstraintBase))]
+    [ComponentInformation(typeof(VRCLookAtConstraint))]
+    internal class VRCWorldUpConstraintInformation : VRCConstraintInformation<VRCWorldUpConstraintBase>
+    {
+        protected override void CollectDependency(VRCWorldUpConstraintBase component, ComponentDependencyCollector collector)
+        {
+            base.CollectDependency(component, collector);
+            collector.AddDependency(component.WorldUpTransform);
+        }
+    }
+
+#endif
 }
 #endif
diff --git a/Editor/com.anatawa12.avatar-optimizer.editor.asmdef b/Editor/com.anatawa12.avatar-optimizer.editor.asmdef
@@ -37,6 +37,7 @@
         "VRCSDK3A.dll",
         "VRCSDKBase-Editor.dll",
         "VRCSDKBase.dll",
+        "VRC.SDK3.Dynamics.Constraint.dll",
         "System.Memory.dll"
     ],
     "autoReferenced": false,
@@ -67,6 +68,11 @@
             "expression": "3.5.2",
             "define": "AAO_VRCSDK3_AVATARS_ANIMATOR_PLAY_AUDIO"
         },
+        {
+            "name": "com.vrchat.avatars",
+            "expression": "[3.6.2-constraints.3]",
+            "define": "AAO_VRCSDK3_AVATARS_CONSTRAINTS"
+        },
         {
             "name": "com.vrmc.univrm",
             "expression": "",

diff --git a/Test~/Basic/ComponentWhitelistTest.cs b/Test~/Basic/ComponentWhitelistTest.cs
@@ -109,6 +109,12 @@ public static IEnumerable<Type> KnownTypes()
             "VRC.SDK3.Dynamics.PhysBone.Components.VRCPhysBoneCollider",
             "VRC.SDK3.Dynamics.Contact.Components.VRCContactSender",
             "VRC.SDK3.Dynamics.Contact.Components.VRCContactReceiver",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCAimConstraint",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCLookAtConstraint",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCPositionConstraint",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCRotationConstraint",
+            "VRC.SDK3.Dynamics.Constraint.Components.VRCScaleConstraint",
         };
     }
 }