[Automated] Merged dev into main

Author: actions-user

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [74.0.0]
+- Fixed MovementBodyTrackingForFitness scene so that the UI in the scene is visible to cameras.
+- Updated Project Setup Tool to enable audio-based face tracking when using A2E, and enable face tracking visemes output when using visemes.
+- Fixed bug in VisemeDriver where it was returning if the OVRFaceExpressions reference wasn't null.
+- Updated BlendshapeMappingExample's body mesh, mirrored or not, to animate based on body tracking movements when not visible.
+
 ## [72.0.0]
 - Updated sample scenes to use OpenXRHands.
 - Fixed readme, documentation links and UI path.
@@ -9,9 +15,7 @@
 - New networking sample shows how to efficiently network body movement by compressing the joint-related movement information for transmission and is compatible with common network providers.
 - New Audio To Expressions (A2E) Lina sample, BlendshapeMapping (ARKit) character and other characters modified to support A2E.
 
-
 ## [69.0.0]
-
 - Fixed bug in ISDK scene where controllers were not able to be used
 - Improved performance and removed garbage creation when drawing the debug skeleton
 - Added HMD remount + restart tracking feature via HMDRemountRestartTracking.cs

Editor/Utils/OVRProjectSetupMovementSDKSamples.cs

@@ -1,7 +1,11 @@
 // Copyright (c) Meta Platforms, Inc. and affiliates.
 
+using System.Linq;
+using Meta.XR.Movement.FaceTracking;
+using Meta.XR.Movement.FaceTracking.Samples;
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace Oculus.Movement.Utils
 {
@@ -15,10 +19,7 @@ internal static class OVRProjectSetupMovementSDKSamplesTasks
         /// All character and mirrored character layers should exist based on their indices.
         /// That is because the scene assets are assigned based on layer index.
         /// </summary>
-        private static readonly int[] _expectedLayersIndices =
-        {
-            10, 11
-        };
+        private static readonly int[] _expectedLayersIndices = { 10, 11 };
 
         /// <summary>
         /// The HiddenMesh layer is required for RecalculateNormals to function correctly.
@@ -35,7 +36,7 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                 group: _group,
                 platform: BuildTargetGroup.Android,
                 isDone: group => QualitySettings.skinWeights == SkinWeights.FourBones,
-                message: "You should use four skin weights to avoid skinning problems",
+                message: "Four skin weights should be used to avoid skinning problems.",
                 fix: group =>
                 {
                     QualitySettings.skinWeights = SkinWeights.FourBones;
@@ -48,7 +49,8 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                 level: OVRProjectSetup.TaskLevel.Required,
                 group: _group,
                 platform: BuildTargetGroup.Android,
-                isDone: group => OVRRuntimeSettings.Instance.BodyTrackingFidelity == OVRPlugin.BodyTrackingFidelity2.High,
+                isDone: group =>
+                    OVRRuntimeSettings.Instance.BodyTrackingFidelity == OVRPlugin.BodyTrackingFidelity2.High,
                 message: "Body Tracking Fidelity should be set to High.",
                 fix: group =>
                 {
@@ -62,7 +64,8 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                 level: OVRProjectSetup.TaskLevel.Required,
                 group: _group,
                 platform: BuildTargetGroup.Android,
-                isDone: group => OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingJointSet == OVRPlugin.BodyJointSet.FullBody,
+                isDone: group =>
+                    OVRRuntimeSettings.GetRuntimeSettings().BodyTrackingJointSet == OVRPlugin.BodyJointSet.FullBody,
                 message: "Body Tracking Joint Set should be set to Full Body.",
                 fix: group =>
                 {
@@ -72,13 +75,46 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                 fixMessage: "Set OVRRuntimeSettings.BodyTrackingJointSet = FullBody"
             );
 
+            // Face tracking settings.
+            OVRProjectSetup.AddTask(
+                level: OVRProjectSetup.TaskLevel.Required,
+                group: _group,
+                platform: BuildTargetGroup.Android,
+                isDone: group => FindComponentInScene<FaceDriver>() == null ||
+                                 OVRRuntimeSettings.GetRuntimeSettings().RequestsAudioFaceTracking,
+                message: "The audio to expression feature should be enabled.",
+                fix: group =>
+                {
+                    OVRRuntimeSettings.Instance.RequestsAudioFaceTracking = true;
+                    OVRRuntimeSettings.CommitRuntimeSettings(OVRRuntimeSettings.Instance);
+                },
+                fixMessage: "Set OVRRuntimeSettings.RequestsAudioFaceTracking = true"
+            );
+
+            OVRProjectSetup.AddTask(
+                level: OVRProjectSetup.TaskLevel.Required,
+                group: _group,
+                platform: BuildTargetGroup.Android,
+                isDone: group => FindComponentInScene<VisemeDriver>() == null ||
+                                 OVRRuntimeSettings.GetRuntimeSettings().EnableFaceTrackingVisemesOutput,
+                message: "The visemes feature should be enabled.",
+                fix: group =>
+                {
+                    OVRRuntimeSettings.Instance.RequestsAudioFaceTracking = true;
+                    OVRRuntimeSettings.Instance.EnableFaceTrackingVisemesOutput = true;
+                    OVRRuntimeSettings.CommitRuntimeSettings(OVRRuntimeSettings.Instance);
+                },
+                fixMessage: "Set OVRRuntimeSettings.EnableFaceTrackingVisemesOutput = true"
+            );
+
             // Test layers.
             OVRProjectSetup.AddTask(
                 level: OVRProjectSetup.TaskLevel.Recommended,
                 group: _group,
                 platform: BuildTargetGroup.Android,
                 isDone: group => LayerMask.NameToLayer(_hiddenMeshLayerName) != -1,
-                message: $"The layer '{_hiddenMeshLayerName}' needs to exist for Recalculate Normals to function properly.",
+                message:
+                $"The layer '{_hiddenMeshLayerName}' needs to exist for Recalculate Normals to function properly.",
                 fix: group =>
                 {
                     int unusedLayer = -1;
@@ -90,6 +126,7 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                             break;
                         }
                     }
+
                     if (LayerMask.NameToLayer(_hiddenMeshLayerName) == -1)
                     {
                         if (unusedLayer == -1)
@@ -117,6 +154,7 @@ static OVRProjectSetupMovementSDKSamplesTasks()
                             return false;
                         }
                     }
+
                     return true;
                 },
                 message: "Layers 10 and 11 must be indexed for the samples to display correctly.",
@@ -138,7 +176,8 @@ static OVRProjectSetupMovementSDKSamplesTasks()
 
         private static void SetLayerName(int layer, string name)
         {
-            SerializedObject tagManager = new SerializedObject(AssetDatabase.LoadAssetAtPath<Object>("ProjectSettings/TagManager.asset"));
+            SerializedObject tagManager =
+                new SerializedObject(AssetDatabase.LoadAssetAtPath<Object>("ProjectSettings/TagManager.asset"));
 
             SerializedProperty it = tagManager.GetIterator();
             while (it.NextVisible(true))
@@ -149,7 +188,15 @@ private static void SetLayerName(int layer, string name)
                     break;
                 }
             }
+
             tagManager.ApplyModifiedProperties();
         }
+
+        private static T FindComponentInScene<T>() where T : Component
+        {
+            var scene = SceneManager.GetActiveScene();
+            var rootGameObjects = scene.GetRootGameObjects();
+            return rootGameObjects.FirstOrDefault(go => go.GetComponentInChildren<T>())?.GetComponentInChildren<T>();
+        }
     }
 }

README.md

@@ -9,7 +9,7 @@ The Unity-Movement package is released under the [Oculus License](https://github
   - 2021.3.26f1 (2021 LTS or newer)
   - 2022.3.11f2 (2022 LTS or newer)
   - Unity 6 or newer
-- v72.0 or newer of the Meta XR SDK. You will need the [Meta XR Core SDK](https://assetstore.unity.com/packages/tools/integration/meta-xr-core-sdk-269169) and the [Meta XR Interaction SDK](https://assetstore.unity.com/packages/tools/integration/meta-xr-interaction-sdk-265014) packages found [on this page](https://assetstore.unity.com/publishers/25353).
+- v74.0 or newer of the Meta XR SDK. You will need the [Meta XR Core SDK](https://assetstore.unity.com/packages/tools/integration/meta-xr-core-sdk-269169) and the [Meta XR Interaction SDK](https://assetstore.unity.com/packages/tools/integration/meta-xr-interaction-sdk-265014) packages found [on this page](https://assetstore.unity.com/publishers/25353).
 - A project set up with these [steps](https://developers.meta.com/horizon/documentation/unity/move-unity-getting-started#unity-project-setup).
 
 

Runtime/Scripts/Tracking/Viseme/VisemeDriver.cs

@@ -140,7 +140,7 @@ private FaceViseme GetClosestViseme(string blendshapeName)
 
         private void UpdateVisemes()
         {
-            if (_mesh == null || _visemeMapping.Length == 0 || _ovrFaceExpressions != null)
+            if (_mesh == null || _visemeMapping.Length == 0 || _ovrFaceExpressions == null)
             {
                 return;
             }

Samples.meta

@@ -0,0 +1,153 @@
+o TaperedCube
+v -0.380732 -0.437500 0.000000
+v -0.437500 -0.380732 0.000000
+v -0.432565 -0.489226 0.061564
+v -0.489226 -0.432565 0.061564
+v -0.437500 0.380732 0.000000
+v -0.380732 0.437500 0.000000
+v -0.489226 0.432565 0.061564
+v -0.432565 0.489226 0.061564
+v 0.437500 -0.380732 0.000000
+v 0.380732 -0.437500 0.000000
+v 0.489226 -0.432565 0.061564
+v 0.432565 -0.489226 0.061564
+v 0.432565 0.489226 0.061564
+v 0.489226 0.432565 0.061564
+v 0.380732 0.437500 0.000000
+v 0.437500 0.380732 0.000000
+v -0.335774 -0.279035 0.938436
+v -0.279035 -0.335774 0.938436
+v -0.262500 -0.205522 1.000000
+v -0.205522 -0.262500 1.000000
+v -0.205522 0.262500 1.000000
+v -0.262500 0.205522 1.000000
+v -0.279035 0.335774 0.938436
+v -0.335774 0.279035 0.938436
+v 0.205522 -0.262500 1.000000
+v 0.262500 -0.205522 1.000000
+v 0.279035 -0.335774 0.938436
+v 0.335774 -0.279035 0.938436
+v 0.335774 0.279035 0.938436
+v 0.279035 0.335774 0.938436
+v 0.262500 0.205522 1.000000
+v 0.205522 0.262500 1.000000
+vn -0.9850 -0.0000 0.1724
+vn -0.0000 -0.6433 0.7656
+vn -0.0000 0.7656 -0.6433
+vn -0.0000 0.6433 0.7656
+vn -0.0000 -0.7656 -0.6433
+vn -0.0000 -0.0000 -1.0000
+vn -0.0000 0.9850 0.1724
+vn 0.9850 -0.0000 0.1724
+vn 0.7656 -0.0000 -0.6433
+vn -0.0000 -0.0000 1.0000
+vn -0.6433 -0.0000 0.7656
+vn 0.6433 -0.0000 0.7656
+vn -0.0000 -0.9850 0.1724
+vn -0.4550 0.4550 -0.7654
+vn -0.4550 -0.4550 -0.7654
+vn 0.4550 -0.4550 -0.7654
+vn 0.4550 0.4550 -0.7654
+vn -0.3607 -0.3607 0.8601
+vn -0.3607 0.3607 0.8601
+vn 0.3607 0.3607 0.8601
+vn 0.3607 -0.3607 0.8601
+vn -0.6864 -0.6864 0.2403
+vn -0.6864 0.6864 0.2403
+vn 0.6864 -0.6864 0.2403
+vn 0.6864 0.6864 0.2403
+vn -0.7656 -0.0000 -0.6433
+vt 0.396122 0.015391
+vt 0.603878 0.015391
+vt 0.610523 0.234609
+vt 0.389477 0.234609
+vt 0.375000 0.978878
+vt 0.375000 0.771122
+vt 0.399038 0.795953
+vt 0.399038 0.954047
+vt 0.625000 0.266859
+vt 0.625000 0.483141
+vt 0.609375 0.470183
+vt 0.609375 0.279817
+vt 0.625000 0.771122
+vt 0.625000 0.978878
+vt 0.600962 0.954047
+vt 0.600962 0.795953
+vt 0.375000 0.483141
+vt 0.375000 0.266859
+vt 0.390625 0.279817
+vt 0.390625 0.470183
+vt 0.404817 0.265625
+vt 0.595183 0.265625
+vt 0.609375 0.279817
+vt 0.609375 0.470183
+vt 0.595183 0.484375
+vt 0.404817 0.484375
+vt 0.639477 0.515391
+vt 0.860523 0.515391
+vt 0.853878 0.734609
+vt 0.646122 0.734609
+vt 0.389477 0.515391
+vt 0.610523 0.515391
+vt 0.603878 0.734609
+vt 0.396122 0.734609
+vt 0.610523 0.515391
+vt 0.389477 0.515391
+vt 0.420953 0.774039
+vt 0.579047 0.774039
+vt 0.579047 0.975962
+vt 0.420953 0.975962
+vt 0.579047 0.975962
+vt 0.603878 1.000000
+vt 0.396122 1.000000
+vt 0.579047 0.774039
+vt 0.396122 0.734609
+vt 0.603878 0.734609
+vt 0.139477 0.515391
+vt 0.360523 0.515391
+vt 0.353878 0.734609
+vt 0.146122 0.734609
+vt 0.619990 0.244553
+vt 0.609375 0.265625
+vt 0.380010 0.256839
+vt 0.390625 0.265625
+vt 0.390625 0.484375
+vt 0.380010 0.493160
+vt 0.609375 0.484375
+vt 0.619990 0.505447
+vt 0.618121 0.745892
+vt 0.600962 0.774039
+vt 0.381879 0.756879
+vt 0.399038 0.774039
+vt 0.125000 0.734609
+vt 0.125000 0.517727
+vt 0.625000 0.015391
+vt 0.625000 0.232273
+vt 0.389477 0.234609
+s 1
+f 17/1/1 24/2/1 7/3/1 4/4/1
+f 18/5/2 27/6/2 25/7/2 20/8/2
+f 8/9/3 13/10/3 15/11/3 6/12/3
+f 30/13/4 23/14/4 21/15/4 32/16/4
+f 12/17/5 3/18/5 1/19/5 10/20/5
+f 1/19/6 2/21/6 5/22/6 6/23/6 15/24/6 16/25/6 9/26/6 10/20/6
+f 13/27/7 8/28/7 23/29/7 30/30/7
+f 11/31/8 14/32/8 29/33/8 28/34/8
+f 14/35/9 11/36/9 9/26/9 16/25/9
+f 25/7/10 26/37/10 31/38/10 32/16/10 21/15/10 22/39/10 19/40/10 20/8/10
+f 19/40/11 22/41/11 24/42/11 17/43/11
+f 31/44/12 26/37/12 28/45/12 29/46/12
+f 3/47/13 12/48/13 27/49/13 18/50/13
+f 8/51/14 6/52/14 5/22/14 7/3/14
+f 1/19/15 3/18/15 4/53/15 2/54/15
+f 9/55/16 11/56/16 12/17/16 10/20/16
+f 14/35/17 16/25/17 15/57/17 13/58/17
+f 18/5/18 20/8/18 19/40/18 17/43/18
+f 21/15/19 23/14/19 24/42/19 22/41/19
+f 30/59/20 32/60/20 31/44/20 29/46/20
+f 25/7/21 27/6/21 28/61/21 26/62/21
+f 3/47/22 18/50/22 17/63/22 4/64/22
+f 23/65/23 8/66/23 7/3/23 24/2/23
+f 11/31/24 28/34/24 27/49/24 12/48/24
+f 29/33/25 14/32/25 13/27/25 30/30/25
+f 5/22/26 2/21/26 4/67/26 7/3/26