Skip to content

Commit 6828a87

Browse files
committed
Removed deprecated zoom gesture
Removed references to zoom gesture as this is not used anymore in the PanZoomBase script. Originally it used Navigation gestures to trigger zoom. This has been replaced with using articulated hand data.
1 parent 01aed9e commit 6828a87

File tree

5 files changed

+154
-171
lines changed

5 files changed

+154
-171
lines changed

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ public abstract class PanZoomBase : MonoBehaviour,
6868
/// </summary>
6969
internal float ZoomMaxScale = 1.0f;
7070

71-
/// <summary>
72-
/// Type of hand gesture to use for zooming
73-
/// </summary>
74-
internal MixedRealityInputAction ZoomGesture;
75-
7671
/// <summary>
7772
/// Size of the GameObject's collider when being looked at.
7873
/// </summary>

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/PanZoom_RectTransf.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ public class PanZoom_RectTransf : PanZoomBase_RectTransf
4040
[SerializeField]
4141
private float zoomTimeInSecToZoom = 0.5f;
4242

43-
[Tooltip("Type of hand gesture to use to zoom in/out.")]
44-
[SerializeField]
45-
private MixedRealityInputAction zoomGesture = MixedRealityInputAction.None;
46-
4743
[Tooltip("Enable or disable hand gestures for zooming on startup.")]
4844
[SerializeField]
4945
private bool zoomGestureEnabledOnStartup = false;
@@ -86,7 +82,6 @@ protected override void Start()
8682
ZoomSpeedMax = zoomSpeedMax;
8783
ZoomMinScale = zoomMinScale;
8884
ZoomMaxScale = zoomMaxScale;
89-
ZoomGesture = zoomGesture;
9085
ZoomGestureEnabledOnStartup = zoomGestureEnabledOnStartup;
9186
timeInSecondsToZoom = zoomTimeInSecToZoom;
9287

@@ -114,7 +109,6 @@ protected override void Update()
114109
UpdateValues(ref ZoomSpeedMax, zoomSpeedMax);
115110
UpdateValues(ref ZoomMinScale, zoomMinScale);
116111
UpdateValues(ref ZoomMaxScale, zoomMaxScale);
117-
UpdateValues(ref ZoomGesture, zoomGesture);
118112
UpdateValues(ref timeInSecondsToZoom, zoomTimeInSecToZoom);
119113

120114
UpdateValues(ref autoGazePanIsActive, panAutoScrollIsActive);

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/PanZoom_Texture.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ public class PanZoom_Texture : PanZoomBase_Texture
3636
[SerializeField]
3737
private float zoomTimeInSecToZoom = 0.5f;
3838

39-
[Tooltip("Type of hand gesture to use to zoom in/out.")]
40-
[SerializeField]
41-
private MixedRealityInputAction zoomGesture = MixedRealityInputAction.None;
42-
4339
[Tooltip("Enable or disable hand gestures for zooming on startup.")]
4440
[SerializeField]
4541
private bool zoomGestureEnabledOnStartup = false;
@@ -79,7 +75,6 @@ protected override void Start()
7975
ZoomSpeedMax = zoomSpeedMax;
8076
ZoomMinScale = zoomMinScale;
8177
ZoomMaxScale = zoomMaxScale;
82-
ZoomGesture = zoomGesture;
8378
ZoomGestureEnabledOnStartup = zoomGestureEnabledOnStartup;
8479
timeInSecondsToZoom = zoomTimeInSecToZoom;
8580

@@ -100,7 +95,6 @@ protected override void Update()
10095
UpdateValues(ref ZoomSpeedMax, zoomSpeedMax);
10196
UpdateValues(ref ZoomMinScale, zoomMinScale);
10297
UpdateValues(ref ZoomMaxScale, zoomMaxScale);
103-
UpdateValues(ref ZoomGesture, zoomGesture);
10498
UpdateValues(ref timeInSecondsToZoom, zoomTimeInSecToZoom);
10599

106100
UpdateValues(ref autoGazePanIsActive, panAutoScrollIsActive);

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/mrtk_eyes_00_RootScene.unity

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6179,7 +6179,7 @@ PrefabInstance:
61796179
objectReference: {fileID: 0}
61806180
- target: {fileID: 658445383, guid: d9db4fe4b37b2024ea85c888f8d74e12, type: 3}
61816181
propertyPath: m_Enabled
6182-
value: 1
6182+
value: 0
61836183
objectReference: {fileID: 0}
61846184
- target: {fileID: 1597255435, guid: d9db4fe4b37b2024ea85c888f8d74e12, type: 3}
61856185
propertyPath: keywords.Array.size

0 commit comments

Comments
 (0)