Skip to content

Commit 2564023

Browse files
authored
Merge pull request #3816 from keveleigh/pan-interaction
Migrate meta and fix build warnings
2 parents f55dda9 + 7a79549 commit 2564023

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Script/HandInteractionPan.cs.meta renamed to Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPan.cs.meta

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Scripts/Slate/HandInteractionPanZoom.cs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
// Licensed under the MIT License. See LICENSE in the project root for license information.
33

44
using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
5+
using Microsoft.MixedReality.Toolkit.Utilities;
56
using System.Collections.Generic;
6-
using Microsoft.MixedReality.Toolkit.Input;
77
using UnityEngine;
88
using UnityEngine.EventSystems;
99
using UnityEngine.SceneManagement;
1010
using UnityEngine.Serialization;
11-
using Microsoft.MixedReality.Toolkit.Utilities;
12-
1311

1412
namespace Microsoft.MixedReality.Toolkit.Input
1513
{
@@ -38,7 +36,7 @@ protected class HandPanData
3836
[FormerlySerializedAs("enabled")]
3937
private bool isEnabled = true;
4038
public bool Enabled { get => isEnabled; set => isEnabled = value; }
41-
39+
4240
[Header("Behavior")]
4341
[SerializeField]
4442
private bool enableZoom = false;
@@ -69,12 +67,12 @@ protected class HandPanData
6967
[Header("Geometry")]
7068
[SerializeField]
7169
[Tooltip("If affordace geometry is desired to emphasize the touch points(leftPoint and rightPoint) and the center point between them (reticle), assign them here.")]
72-
private GameObject reticle;
70+
private GameObject reticle = null;
7371
[SerializeField]
74-
private GameObject leftPoint;
72+
private GameObject leftPoint = null;
7573
[SerializeField]
76-
private GameObject rightPoint;
77-
74+
private GameObject rightPoint = null;
75+
7876
#endregion Serialized Fields
7977

8078

0 commit comments

Comments
 (0)