AnimeFunsion/modular-avatar
1
0
Fork 0
mirror of https://github.com/bdunderscore/modular-avatar.git synced 2024-12-29 02:35:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use VRCParentConstraint instead of constraint hack for world fixed objects when available (#1326)

Browse Source 
* Fixes error when merging same parameter with different type in RC menu item.

* Rollback ReactiveObjectPass, use another approach

* Set defaults to ModularAvatarMergeAnimator to prevent potential errors

* Use VRCParentConstraint instead of constraint hack
for world fixed objects when available

* Make sure the VRC constraint only applies on VRChat avatars

* Extract creation logic to external method

* Rearrange method

* Get rid of unit test

* Fix unit test build error

* Fix assert fail
This commit is contained in:
Jeremy Lam aka. Vistanz 2024-11-17 11:02:09 +08:00 committed by GitHub
parent 7980d933c2
commit a984cf8673
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Editor/WorldFixedObjectProcessor.cs
View File

@ -86,6 +86,15 @@ namespace nadena.dev.modular_avatar.core.editor
obj.transform.localRotation = Quaternion.identity; obj.transform.localRotation = Quaternion.identity;
obj.transform.localScale = Vector3.one; obj.transform.localScale = Vector3.one;
if (!TryCreateVRCConstraint(avatarRoot, obj)) CreateConstraint(obj, fixedGameObject);
_proxy = obj.transform;
return obj.transform;
}
private void CreateConstraint(GameObject obj, GameObject fixedGameObject)
{
var constraint = obj.AddComponent<ParentConstraint>(); var constraint = obj.AddComponent<ParentConstraint>();
constraint.AddSource(new ConstraintSource() constraint.AddSource(new ConstraintSource()
{ {
@ -96,10 +105,31 @@ namespace nadena.dev.modular_avatar.core.editor
constraint.locked = true; constraint.locked = true;
constraint.rotationOffsets = new[] {Vector3.zero}; constraint.rotationOffsets = new[] {Vector3.zero};
constraint.translationOffsets = new[] {Vector3.zero}; constraint.translationOffsets = new[] {Vector3.zero};
_proxy = obj.transform;
return obj.transform;
} }
#if MA_VRCSDK3_AVATARS_3_7_0_OR_NEWER
private bool TryCreateVRCConstraint(Transform avatarRoot, GameObject obj)
{
var isVrcAvatar = avatarRoot.TryGetComponent(out VRC.SDKBase.VRC_AvatarDescriptor _);
if (!isVrcAvatar) return false;
var constraint = obj.AddComponent(
System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint")
) as VRC.Dynamics.ManagedTypes.VRCParentConstraintBase;
constraint.IsActive = true;
constraint.Locked = true;
constraint.AffectsPositionX = true;
constraint.AffectsPositionY = true;
constraint.AffectsPositionZ = true;
constraint.AffectsRotationX = true;
constraint.AffectsRotationY = true;
constraint.AffectsRotationZ = true;
constraint.FreezeToWorld = true;
return true;
}
#else
private bool TryCreateVRCConstraint(Transform avatarRoot, GameObject obj) => false;
#endif
} }
} }

23
UnitTests~/WorldFixedObjectTest/WorldFixedObjectTest.cs
View File

@ -3,6 +3,7 @@ using nadena.dev.modular_avatar.animation;
using nadena.dev.modular_avatar.core; using nadena.dev.modular_avatar.core;
using nadena.dev.modular_avatar.core.editor; using nadena.dev.modular_avatar.core.editor;
using NUnit.Framework; using NUnit.Framework;
using UnityEngine;
using UnityEngine.Animations; using UnityEngine.Animations;
public class WorldFixedObjectTest : TestBase public class WorldFixedObjectTest : TestBase
@ -25,7 +26,16 @@ public class WorldFixedObjectTest : TestBase
// fixed root is created // fixed root is created
Assert.That(fixedRoot, Is.Not.Null); Assert.That(fixedRoot, Is.Not.Null);
Assert.That(fixedRoot.GetComponent<ParentConstraint>(), Is.Not.Null); bool isVrcAvatar = false;
System.Type vrcParentConstraintType = null;
#if MA_VRCSDK3_AVATARS
isVrcAvatar = avatar.TryGetComponent(out VRC.SDKBase.VRC_AvatarDescriptor _);
vrcParentConstraintType = System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint");
#endif
Component constraint = isVrcAvatar && vrcParentConstraintType != null ?
fixedRoot.GetComponent(vrcParentConstraintType) :
fixedRoot.GetComponent<ParentConstraint>();
Assert.That(constraint, Is.Not.Null);
// objects are moved to fixed root // objects are moved to fixed root
Assert.That(movedFixedObject, Is.Not.Null); Assert.That(movedFixedObject, Is.Not.Null);
@ -52,7 +62,16 @@ public class WorldFixedObjectTest : TestBase
// fixed root is created // fixed root is created
Assert.That(fixedRoot, Is.Not.Null); Assert.That(fixedRoot, Is.Not.Null);
Assert.That(fixedRoot.GetComponent<ParentConstraint>(), Is.Not.Null); bool isVrcAvatar = false;
System.Type vrcParentConstraintType = null;
#if MA_VRCSDK3_AVATARS
isVrcAvatar = avatar.TryGetComponent(out VRC.SDKBase.VRC_AvatarDescriptor _);
vrcParentConstraintType = System.Type.GetType("VRC.SDK3.Dynamics.Constraint.Components.VRCParentConstraint, VRC.SDK3.Dynamics.Constraint");
#endif
Component constraint = isVrcAvatar && vrcParentConstraintType != null ?
fixedRoot.GetComponent(vrcParentConstraintType) :
fixedRoot.GetComponent<ParentConstraint>();
Assert.That(constraint, Is.Not.Null);
// objects are moved to fixed root // objects are moved to fixed root
Assert.That(movedFixedObject, Is.Not.Null); Assert.That(movedFixedObject, Is.Not.Null);