Skip to content

Commit cdcc724

Browse files
committed
[Automated] Merged dev into main
2 parents 45d8864 + a9f2b67 commit cdcc724

File tree

813 files changed

+278946
-2061
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

813 files changed

+278946
-2061
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## [76.0.0]
2+
- Replaced retargeting system with a more efficient, data-driven CharacterRetargeter.
3+
- Added powerful and easy-to-use tooling system to create retargeted characters.
4+
- Revised body tracking, networking, ISDK, hip pinning and locomotion scenes to use new retargeting system.
5+
16
## [74.0.0]
27
- Fixed MovementBodyTrackingForFitness scene so that the UI in the scene is visible to cameras.
38
- Updated Project Setup Tool to enable audio-based face tracking when using A2E, and enable face tracking visemes output when using visemes.

Editor/Native/Meta.XR.Movement.Editor.asmdef

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
"rootNamespace": "",
44
"references": [
55
"GUID:f64c9ebcd7899c3448a08dc9f9ddbe30",
6+
"GUID:d2761a0af0f567748a72629d4bb18a26",
7+
"GUID:2a230cb87a1d3ba4a98bdc0ddae76e6c",
8+
"GUID:93bda9a2bc9dddc43930634fa65d6e42",
69
"GUID:f4af9e3560e85174f90917cb2bbcda01",
7-
"GUID:8e76fd86d1fdc9243a341ca50624a575"
10+
"GUID:8e76fd86d1fdc9243a341ca50624a575",
11+
"GUID:75469ad4d38634e559750d17036d5f7c"
812
],
913
"includePlatforms": [
1014
"Editor"
@@ -15,6 +19,12 @@
1519
"precompiledReferences": [],
1620
"autoReferenced": true,
1721
"defineConstraints": [],
18-
"versionDefines": [],
22+
"versionDefines": [
23+
{
24+
"name": "com.meta.xr.sdk.interaction",
25+
"expression": "",
26+
"define": "INTERACTION_OVR_DEFINED"
27+
}
28+
],
1929
"noEngineReferences": false
2030
}

Editor/Native/Poses.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Native/Poses/Squatting.sbn

252 KB
Binary file not shown.

Editor/Native/Poses/Squatting.sbn.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Native/Poses/Walking.sbn

666 KB
Binary file not shown.

Editor/Native/Poses/Walking.sbn.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Editor/Native/Scripts/Block.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
2+
3+
4+
using System.Collections.Generic;
5+
using Meta.XR.Movement.Editor;
6+
using UnityEditor;
7+
using UnityEngine;
8+
9+
namespace Meta.XR.BuildingBlocks.Editor
10+
{
11+
/// <summary>
12+
/// The character retargeter building block.
13+
/// </summary>
14+
public class CharacterRetargeterBlockData : BlockData
15+
{
16+
protected override bool UsesPrefab => false;
17+
18+
protected override List<GameObject> InstallRoutine(GameObject selectedGameObject)
19+
{
20+
selectedGameObject = Selection.activeGameObject;
21+
MSDKUtilityEditor.AddCharacterRetargeter();
22+
return new List<GameObject> { selectedGameObject };
23+
}
24+
}
25+
}

Editor/Native/Scripts/Block/CharacterRetargeterBlockData.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)