From 8d5f1bb429a116b177ffefd1bd2e61b4e75b11c0 Mon Sep 17 00:00:00 2001 From: Andrew Kim Date: Fri, 15 Dec 2023 16:33:07 -0800 Subject: [PATCH] feat(Editor/Runtime/Samples): Update for v60 Summary: BREAKING CHANGE: Samples rely on scripts found in v60 of the Meta SDK. Editor: - Add OVRProjectSetupMovementSDKSamples task to integrate with the Oculus Project Setup Tool for sample specific tasks - Remove ProjectValidationWindow, as the Project Setup Tool is used instead now Runtime: - Add support for tongue tracking - Add DeformationRig for driving available correctives on the face - Add full body for retargeting - Add full body animation constraints - Add toggle between high and low fidelity upper body tracking (IOBT) - Add body tracking calibration example - Updated helper menus to include setup for full body, and new constraints for upper body - Updated locomotion to support full body, and fix several bugs with locomotion - Updated locomotion to use animation blending between tracking (full body) and the locomotion animator Samples: - Updated the MovementAura scene with tongue support - Updated the MovementRetargeting scene to use a full body - Updated the MovementISDKIntegration scene to use a full body - Updated the MovementLocomotion scene to use a full body DEPRECATED: All legacy scripts have been placed in the Legacy folder. This includes the following: CustomMappings, FullBodyCustomMappings, AnimationConstraintMasker. Reviewed By: sohailshafiiWk Differential Revision: D52219081 fbshipit-source-id: 3dbdebc730609ec9c51ea8dee581ef36c831e9db --- Editor/Utils/OVRProjectSetupMovementSDKSamples.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Editor/Utils/OVRProjectSetupMovementSDKSamples.cs b/Editor/Utils/OVRProjectSetupMovementSDKSamples.cs index cbbf8a09..ba66ddf9 100644 --- a/Editor/Utils/OVRProjectSetupMovementSDKSamples.cs +++ b/Editor/Utils/OVRProjectSetupMovementSDKSamples.cs @@ -34,9 +34,13 @@ static OVRProjectSetupMovementSDKSamplesTasks() level: OVRProjectSetup.TaskLevel.Required, group: _group, platform: BuildTargetGroup.Android, - isDone: group => OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingFidelity == OVRPlugin.BodyTrackingFidelity2.High, + isDone: group => OVRRuntimeSettings.Instance.BodyTrackingFidelity == OVRPlugin.BodyTrackingFidelity2.High, message: "Body Tracking Fidelity should be set to High.", - fix: group => OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingFidelity = OVRPlugin.BodyTrackingFidelity2.High, + fix: group => + { + OVRRuntimeSettings.Instance.BodyTrackingFidelity = OVRPlugin.BodyTrackingFidelity2.High; + OVRRuntimeSettings.CommitRuntimeSettings(OVRRuntimeSettings.Instance); + }, fixMessage: "Set OVRRuntimeSettings.BodyTrackingFidelity = High" ); @@ -46,7 +50,11 @@ static OVRProjectSetupMovementSDKSamplesTasks() platform: BuildTargetGroup.Android, isDone: group => OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingJointSet == OVRPlugin.BodyJointSet.FullBody, message: "Body Tracking Joint Set should be set to Full Body.", - fix: group => OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingJointSet = OVRPlugin.BodyJointSet.FullBody, + fix: group => + { + OVRRuntimeSettings.Instance.BodyTrackingJointSet = OVRPlugin.BodyJointSet.FullBody; + OVRRuntimeSettings.CommitRuntimeSettings(OVRRuntimeSettings.Instance); + }, fixMessage: "Set OVRRuntimeSettings.BodyTrackingJointSet = FullBody" );