Skip to content

Commit 67670ff

Browse files
sohailshafiiWkfacebook-github-bot
authored andcommitted
feat(Runtime): Upgrade to v56.0 SDK
Summary: BREAKING CHANGE: Updates to support v56.0 SDK, depends on script changes in that version. Since `PointableUnityEventWrapper` `UnityEvent`s uses `PointerEvent` as the generic variable now, functions used for `PointerEvent`s had to be updated. See the following changes: 1. `ToggleObjects.cs` 2. `DriveThirdPartySkeleton.cs` 3. `HipPinningCalibration.cs` 4. `ToggleMenu.cs` 5. `BlendshapesMenuToggle.cs` 6. `ButtonToggleIcon.cs` Reviewed By: andkim-meta Differential Revision: D48727866 fbshipit-source-id: 6cc0d502cb3b594a607b781fbe8626bc170e3c62
1 parent 40bfb0e commit 67670ff

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

Runtime/Scripts/Tracking/Body/Legacy/DriveThirdPartySkeleton.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using static Oculus.Movement.Tracking.Deprecated.HumanBodyBonesMappings;
1212
using static Oculus.Movement.Tracking.Deprecated.HumanBodyBonesMappings.BodyTrackingBoneId;
1313
using static Oculus.Movement.Tracking.Deprecated.SkeletonMetadata;
14+
using Oculus.Interaction;
1415

1516
namespace Oculus.Movement.Tracking.Deprecated
1617
{
@@ -413,15 +414,15 @@ public void ToggleUpdatePositions()
413414
/// <summary>
414415
/// Toggles the ability to see skeletal debugging.
415416
/// </summary>
416-
public void ToggleSkeletalDebugViews()
417+
public void ToggleSkeletalDebugViews(PointerEvent pointerEvent)
417418
{
418419
_showSkeletalDebugViews = !_showSkeletalDebugViews;
419420
}
420421

421422
/// <summary>
422423
/// Toggles the ability to see debug axes.
423424
/// </summary>
424-
public void ToggleDebugAxes()
425+
public void ToggleDebugAxes(PointerEvent pointerEvent)
425426
{
426427
_showDebugAxes = !_showDebugAxes;
427428
}

Runtime/Scripts/UI/BlendshapesMenuToggle.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3+
using Oculus.Interaction;
34
using UnityEngine;
45
using UnityEngine.Assertions;
56

@@ -27,7 +28,7 @@ private void Awake()
2728
/// <summary>
2829
/// Toggles blendshapes menus on and off. Called via UI in scene.
2930
/// </summary>
30-
public void ToggleBlendshapesMenuEnableState()
31+
public void ToggleBlendshapesMenuEnableState(PointerEvent pointerEvent)
3132
{
3233
foreach (var blendShapesMenu in _blendShapesMenus)
3334
{

Runtime/Scripts/UI/ButtonToggleIcon.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3+
using Oculus.Interaction;
34
using UnityEngine;
45
using UnityEngine.Assertions;
56

@@ -59,7 +60,7 @@ private void OnDestroy()
5960
/// <summary>
6061
/// Toggles the select icon state.
6162
/// </summary>
62-
public void ToggleSelectIcon()
63+
public void ToggleSelectIcon(PointerEvent pointerEvent)
6364
{
6465
_selectState = !_selectState;
6566
_toggleMaterial.SetColor(_colorId, _selectState ?

Runtime/Scripts/UI/Legacy/HipPinningCalibration.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Meta Platforms, Inc. and affiliates.
22

3+
using Oculus.Interaction;
34
using Oculus.Movement.Effects.Deprecated;
45
using UnityEngine;
56
using UnityEngine.Assertions;
@@ -119,7 +120,7 @@ private void ExitHipPinning(HipPinningTarget target)
119120
/// <summary>
120121
/// Calibrate the hip pinning target transform with the current tracked hip position
121122
/// </summary>
122-
public void Calibrate()
123+
public void Calibrate(PointerEvent pointerEvent)
123124
{
124125
Vector3 hipTranslation = _skeleton.CustomBones[(int)OVRSkeleton.BoneId.Body_Hips].localPosition;
125126
var mainChairTransform = _mainChairProp.transform;

Runtime/Scripts/UI/Legacy/TogglesMenu.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private void Start()
121121
/// <summary>
122122
/// Toggles correctives on and off.
123123
/// </summary>
124-
public void ToggleCorrectives()
124+
public void ToggleCorrectives(PointerEvent pointerEvent)
125125
{
126126
_faceTrackingSystem.CorrectivesEnabled =
127127
!_faceTrackingSystem.CorrectivesEnabled;
@@ -139,7 +139,7 @@ private void UpdateCorrectivesButtonText()
139139
/// <summary>
140140
/// Toggles normal recalculation on and off.
141141
/// </summary>
142-
public void ToggleNormalRecalc()
142+
public void ToggleNormalRecalc(PointerEvent pointerEvent)
143143
{
144144
_recalculateNormals.RunRecalculation =
145145
!_recalculateNormals.RunRecalculation;

0 commit comments

Comments
 (0)