feat: World Fixed Object now uses VRCParentConstraint and supports Android builds (#1502)

Closes: #1417

CHANGELOG-PRERELEASE-jp.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   アニメーションがブロックされたときにオーディオソースを無効にするように変更。
 - [#1489] `Merge Blend Tree` やリアクティブコンポーネントとMMDワールドの互換性の問題を修正。
   詳細は[ドキュメント](https://modular-avatar.nadena.dev/docs/general-behavior/mmd)を参照してください。
+- [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。
 
 ### Removed
 

CHANGELOG-PRERELEASE.md

@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1437] Create Toggle for Selection now creates submenus as necessary when multiple items are selected, and creates toggles as children.
 - [#1499] When an audio source is controlled by an Object Toggle, disable the audio source when animations are blocked
   to avoid it unintentionally being constantly active.
+- [#1502] `World Fixed Object` now uses `VRCParentConstraint` and is therefore compatible with Android builds
 
 ### Removed
 

CHANGELOG-jp.md

@@ -29,6 +29,7 @@ Modular Avatarの主な変更点をこのファイルで記録しています。
 - [#1437] Create Toggle for Selectionにおいて、複数選択時時に必要に応じてサブメニューを生成し、子としてトグルを生成するように変更されました。
 - [#1499] `Object Toggle`で制御される`Audio Source`がアニメーションブロックされたときに常にアクティブにならないように、
     アニメーションがブロックされたときにオーディオソースを無効にするように変更。
+- [#1502] `World Fixed Object` は `VRCParentConstraint` を使用するようになり、Androidビルドで使用可能になりました。
 
 ### Removed
 

CHANGELOG.md

@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#1437] Create Toggle for Selection now creates submenus as necessary when multiple items are selected, and creates toggles as children.
 - [#1499] When an audio source is controlled by an Object Toggle, disable the audio source when animations are blocked
   to avoid it unintentionally being constantly active.
+- [#1502] `World Fixed Object` now uses `VRCParentConstraint` and is therefore compatible with Android builds 
 
 ### Removed
 

Editor/WorldFixedObjectProcessor.cs

@@ -1,9 +1,14 @@
 using System.Linq;
 using nadena.dev.modular_avatar.editor.ErrorReporting;
-using nadena.dev.ndmf;
 using UnityEditor;
 using UnityEngine;
+using VRC.Dynamics;
+#if MA_VRCSDK3_AVATARS
+using VRC.SDK3.Dynamics.Constraint.Components;
+
+#else
 using UnityEngine.Animations;
+#endif
 
 namespace nadena.dev.modular_avatar.core.editor
 {
@@ -31,17 +36,6 @@ namespace nadena.dev.modular_avatar.core.editor
 
         void Process(ModularAvatarWorldFixedObject target)
         {
-            switch (EditorUserBuildSettings.activeBuildTarget)
-            {
-                case BuildTarget.StandaloneWindows:
-                case BuildTarget.StandaloneWindows64:
-                case BuildTarget.StandaloneLinux64: // for CI
-                    break;
-                default:
-                    BuildReport.Log(ErrorSeverity.NonFatal, "world_fixed_object.err.unsupported_platform");
-                    return;
-            }
-            
             var retargeter = new ActiveAnimationRetargeter(
                 _context,
                 new BoneDatabase(),
@@ -86,7 +80,30 @@ namespace nadena.dev.modular_avatar.core.editor
             obj.transform.localRotation = Quaternion.identity;
             obj.transform.localScale = Vector3.one;
 
-            var constraint = obj.AddComponent<ParentConstraint>();
+            CreateConstraint(obj, fixedGameObject);
+
+            _proxy = obj.transform;
+
+            return obj.transform;
+        }
+#if MA_VRCSDK3_AVATARS
+        private static void CreateConstraint(GameObject target, GameObject fixedGameObject)
+        {
+            var constraint = target.AddComponent<VRCParentConstraint>();
+            constraint.Sources.Add(new VRCConstraintSource
+            {
+                Weight = 1.0f,
+                SourceTransform = fixedGameObject.transform,
+                ParentRotationOffset = Vector3.zero,
+                ParentPositionOffset = Vector3.zero
+            });
+            constraint.IsActive = true;
+            constraint.Locked = true;
+        }
+#else
+private static void CreateConstraint(GameObject target, GameObject fixedGameObject)
+        {
+            var constraint = target.AddComponent<ParentConstraint>();
             constraint.AddSource(new ConstraintSource()
             {
                 weight = 1.0f,
@@ -96,10 +113,7 @@ namespace nadena.dev.modular_avatar.core.editor
             constraint.locked = true;
             constraint.rotationOffsets = new[] {Vector3.zero};
             constraint.translationOffsets = new[] {Vector3.zero};
-
-            _proxy = obj.transform;
-
-            return obj.transform;
         }
+#endif
     }
 }

UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs

@@ -4,7 +4,12 @@ using nadena.dev.modular_avatar.core;
 using nadena.dev.modular_avatar.core.editor;
 using nadena.dev.ndmf.animator;
 using NUnit.Framework;
+#if MA_VRCSDK3_AVATARS
+using VRC.SDK3.Dynamics.Constraint.Components;
+#else
 using UnityEngine.Animations;
+#endif
+
 
 public class WorldFixedObjectTest : TestBase
 {
@@ -26,7 +31,11 @@ public class WorldFixedObjectTest : TestBase
 
         // fixed root is created
         Assert.That(fixedRoot, Is.Not.Null);
+        #if MA_VRCSDK3_AVATARS
+        Assert.That(fixedRoot.GetComponent<VRCParentConstraint>(), Is.Not.Null);
+        #else
         Assert.That(fixedRoot.GetComponent<ParentConstraint>(), Is.Not.Null);
+        #endif
 
         // objects are moved to fixed root
         Assert.That(movedFixedObject, Is.Not.Null);
@@ -53,7 +62,11 @@ public class WorldFixedObjectTest : TestBase
 
         // fixed root is created
         Assert.That(fixedRoot, Is.Not.Null);
+#if MA_VRCSDK3_AVATARS
+        Assert.That(fixedRoot.GetComponent<VRCParentConstraint>(), Is.Not.Null);
+#else
         Assert.That(fixedRoot.GetComponent<ParentConstraint>(), Is.Not.Null);
+#endif
 
         // objects are moved to fixed root
         Assert.That(movedFixedObject, Is.Not.Null);