Skip to content

Commit a8af0df

Browse files
luval-microsoftluval-microsoft
committed
Merge branch 'mrtk_development' into feature/input_docs
2 parents 79c7896 + ef13f90 commit a8af0df

File tree

336 files changed

+23430
-17030
lines changed

Some content is hidden

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

336 files changed

+23430
-17030
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ GameObject:
694694
- component: {fileID: 1701341181}
695695
- component: {fileID: 1701341185}
696696
- component: {fileID: 1701341188}
697-
- component: {fileID: 1701341187}
697+
- component: {fileID: 1701341186}
698698
m_Layer: 0
699699
m_Name: Main Camera
700700
m_TagString: MainCamera
@@ -796,7 +796,7 @@ MonoBehaviour:
796796
gazeTransform: {fileID: 0}
797797
minHeadVelocityThreshold: 0.5
798798
maxHeadVelocityThreshold: 2
799-
--- !u!114 &1701341187
799+
--- !u!114 &1701341186
800800
MonoBehaviour:
801801
m_ObjectHideFlags: 0
802802
m_CorrespondingSourceObject: {fileID: 0}
@@ -805,16 +805,9 @@ MonoBehaviour:
805805
m_GameObject: {fileID: 1701341180}
806806
m_Enabled: 1
807807
m_EditorHideFlags: 0
808-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
808+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
809809
m_Name:
810810
m_EditorClassIdentifier:
811-
m_HorizontalAxis: Horizontal
812-
m_VerticalAxis: Vertical
813-
m_SubmitButton: Submit
814-
m_CancelButton: Cancel
815-
m_InputActionsPerSecond: 10
816-
m_RepeatDelay: 0.5
817-
m_ForceModuleActive: 0
818811
--- !u!114 &1701341188
819812
MonoBehaviour:
820813
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ GameObject:
498498
- component: {fileID: 1460686211}
499499
- component: {fileID: 1460686215}
500500
- component: {fileID: 1460686217}
501-
- component: {fileID: 1460686218}
501+
- component: {fileID: 1460686216}
502502
m_Layer: 0
503503
m_Name: Main Camera
504504
m_TagString: MainCamera
@@ -600,7 +600,7 @@ MonoBehaviour:
600600
gazeTransform: {fileID: 0}
601601
minHeadVelocityThreshold: 0.5
602602
maxHeadVelocityThreshold: 2
603-
--- !u!114 &1460686217
603+
--- !u!114 &1460686216
604604
MonoBehaviour:
605605
m_ObjectHideFlags: 0
606606
m_CorrespondingSourceObject: {fileID: 0}
@@ -609,13 +609,10 @@ MonoBehaviour:
609609
m_GameObject: {fileID: 1460686210}
610610
m_Enabled: 1
611611
m_EditorHideFlags: 0
612-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
612+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
613613
m_Name:
614614
m_EditorClassIdentifier:
615-
m_FirstSelected: {fileID: 0}
616-
m_sendNavigationEvents: 1
617-
m_DragThreshold: 10
618-
--- !u!114 &1460686218
615+
--- !u!114 &1460686217
619616
MonoBehaviour:
620617
m_ObjectHideFlags: 0
621618
m_CorrespondingSourceObject: {fileID: 0}
@@ -624,16 +621,12 @@ MonoBehaviour:
624621
m_GameObject: {fileID: 1460686210}
625622
m_Enabled: 1
626623
m_EditorHideFlags: 0
627-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
624+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
628625
m_Name:
629626
m_EditorClassIdentifier:
630-
m_HorizontalAxis: Horizontal
631-
m_VerticalAxis: Vertical
632-
m_SubmitButton: Submit
633-
m_CancelButton: Cancel
634-
m_InputActionsPerSecond: 10
635-
m_RepeatDelay: 0.5
636-
m_ForceModuleActive: 0
627+
m_FirstSelected: {fileID: 0}
628+
m_sendNavigationEvents: 1
629+
m_DragThreshold: 10
637630
--- !u!1 &1552166284
638631
GameObject:
639632
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,7 @@ GameObject:
715715
- component: {fileID: 1491404207}
716716
- component: {fileID: 1491404211}
717717
- component: {fileID: 1491404205}
718-
- component: {fileID: 1491404210}
718+
- component: {fileID: 1491404206}
719719
m_Layer: 0
720720
m_Name: Main Camera
721721
m_TagString: MainCamera
@@ -759,6 +759,18 @@ MonoBehaviour:
759759
gazeTransform: {fileID: 0}
760760
minHeadVelocityThreshold: 0.5
761761
maxHeadVelocityThreshold: 2
762+
--- !u!114 &1491404206
763+
MonoBehaviour:
764+
m_ObjectHideFlags: 0
765+
m_CorrespondingSourceObject: {fileID: 0}
766+
m_PrefabInstance: {fileID: 0}
767+
m_PrefabAsset: {fileID: 0}
768+
m_GameObject: {fileID: 1491404203}
769+
m_Enabled: 1
770+
m_EditorHideFlags: 0
771+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
772+
m_Name:
773+
m_EditorClassIdentifier:
762774
--- !u!81 &1491404207
763775
AudioListener:
764776
m_ObjectHideFlags: 0
@@ -817,25 +829,6 @@ Camera:
817829
m_OcclusionCulling: 1
818830
m_StereoConvergence: 10
819831
m_StereoSeparation: 0.022
820-
--- !u!114 &1491404210
821-
MonoBehaviour:
822-
m_ObjectHideFlags: 0
823-
m_CorrespondingSourceObject: {fileID: 0}
824-
m_PrefabInstance: {fileID: 0}
825-
m_PrefabAsset: {fileID: 0}
826-
m_GameObject: {fileID: 1491404203}
827-
m_Enabled: 1
828-
m_EditorHideFlags: 0
829-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
830-
m_Name:
831-
m_EditorClassIdentifier:
832-
m_HorizontalAxis: Horizontal
833-
m_VerticalAxis: Vertical
834-
m_SubmitButton: Submit
835-
m_CancelButton: Cancel
836-
m_InputActionsPerSecond: 10
837-
m_RepeatDelay: 0.5
838-
m_ForceModuleActive: 0
839832
--- !u!114 &1491404211
840833
MonoBehaviour:
841834
m_ObjectHideFlags: 0

‎Assets/MixedRealityToolkit.Examples/Demos/Diagnostics/Scenes/DiagnosticsDemo.unity‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ GameObject:
199199
- component: {fileID: 469757470}
200200
- component: {fileID: 469757468}
201201
- component: {fileID: 469757473}
202-
- component: {fileID: 469757472}
202+
- component: {fileID: 469757469}
203203
m_Layer: 0
204204
m_Name: Main Camera
205205
m_TagString: MainCamera
@@ -243,6 +243,18 @@ MonoBehaviour:
243243
gazeTransform: {fileID: 0}
244244
minHeadVelocityThreshold: 0.5
245245
maxHeadVelocityThreshold: 2
246+
--- !u!114 &469757469
247+
MonoBehaviour:
248+
m_ObjectHideFlags: 0
249+
m_CorrespondingSourceObject: {fileID: 0}
250+
m_PrefabInstance: {fileID: 0}
251+
m_PrefabAsset: {fileID: 0}
252+
m_GameObject: {fileID: 469757466}
253+
m_Enabled: 1
254+
m_EditorHideFlags: 0
255+
m_Script: {fileID: 11500000, guid: 7a21b486d0bb44444b1418aaa38b44de, type: 3}
256+
m_Name:
257+
m_EditorClassIdentifier:
246258
--- !u!81 &469757470
247259
AudioListener:
248260
m_ObjectHideFlags: 0
@@ -293,25 +305,6 @@ Camera:
293305
m_OcclusionCulling: 1
294306
m_StereoConvergence: 10
295307
m_StereoSeparation: 0.022
296-
--- !u!114 &469757472
297-
MonoBehaviour:
298-
m_ObjectHideFlags: 0
299-
m_CorrespondingSourceObject: {fileID: 0}
300-
m_PrefabInstance: {fileID: 0}
301-
m_PrefabAsset: {fileID: 0}
302-
m_GameObject: {fileID: 469757466}
303-
m_Enabled: 1
304-
m_EditorHideFlags: 0
305-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
306-
m_Name:
307-
m_EditorClassIdentifier:
308-
m_HorizontalAxis: Horizontal
309-
m_VerticalAxis: Vertical
310-
m_SubmitButton: Submit
311-
m_CancelButton: Cancel
312-
m_InputActionsPerSecond: 10
313-
m_RepeatDelay: 0.5
314-
m_ForceModuleActive: 0
315308
--- !u!114 &469757473
316309
MonoBehaviour:
317310
m_ObjectHideFlags: 0
@@ -558,16 +551,6 @@ PrefabInstance:
558551
propertyPath: m_Text
559552
value: DiagnosticDemoControls.cs
560553
objectReference: {fileID: 0}
561-
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
562-
type: 3}
563-
propertyPath: m_Text
564-
value: ' Toggle Diagnostics'
565-
objectReference: {fileID: 0}
566-
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
567-
type: 3}
568-
propertyPath: m_Text
569-
value: ' Toggle Profiler'
570-
objectReference: {fileID: 0}
571554
- target: {fileID: 224849082003076088, guid: a900c08743a94c328074df8bbe3eb63c,
572555
type: 3}
573556
propertyPath: m_AnchoredPosition.y
@@ -583,6 +566,16 @@ PrefabInstance:
583566
propertyPath: m_AnchoredPosition.y
584567
value: 0.055
585568
objectReference: {fileID: 0}
569+
- target: {fileID: 114186135864427680, guid: a900c08743a94c328074df8bbe3eb63c,
570+
type: 3}
571+
propertyPath: m_Text
572+
value: ' Toggle Profiler'
573+
objectReference: {fileID: 0}
574+
- target: {fileID: 114121190672569774, guid: a900c08743a94c328074df8bbe3eb63c,
575+
type: 3}
576+
propertyPath: m_Text
577+
value: ' Toggle Diagnostics'
578+
objectReference: {fileID: 0}
586579
m_RemovedComponents: []
587580
m_SourcePrefab: {fileID: 100100000, guid: a900c08743a94c328074df8bbe3eb63c, type: 3}
588581
--- !u!4 &1776170452 stripped

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase_RectTransf.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ public class PanZoomBase_RectTransf : PanZoomBase
1515
internal RectTransform viewportRectTransf = null;
1616
internal bool isScrollText = false;
1717

18-
private bool IsValid
19-
{
20-
get { return (navRectTransf != null); }
21-
}
18+
private bool IsValid => navRectTransf != null;
2219

2320
public override void Initialize()
2421
{

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/BaseClasses/PanZoomBase_Texture.cs‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
1111
/// </summary>
1212
public class PanZoomBase_Texture : PanZoomBase
1313
{
14-
internal new Renderer renderer = null;
14+
protected Renderer textureRenderer = null;
1515

16-
private const string c_DefaultTextureShaderProperty = "_MainTex";
17-
private int textureTargetID = Shader.PropertyToID(c_DefaultTextureShaderProperty);
18-
private string textureShaderProperty = c_DefaultTextureShaderProperty;
16+
private const string DefaultTextureShaderProperty = "_MainTex";
17+
private int textureTargetID = Shader.PropertyToID(DefaultTextureShaderProperty);
18+
private string textureShaderProperty = DefaultTextureShaderProperty;
1919
public string TextureShaderProperty
2020
{
21-
get
22-
{
23-
return textureShaderProperty;
24-
}
21+
get { return textureShaderProperty; }
2522
set
2623
{
2724
textureShaderProperty = value;
@@ -31,12 +28,10 @@ public string TextureShaderProperty
3128

3229
[SerializeField]
3330
private float DefaultAspectRatio = 1.0f;
31+
3432
private float aspectRatio = -1;
3533

36-
private bool IsValid
37-
{
38-
get { return ((renderer != null) && (renderer.enabled)); }
39-
}
34+
private bool IsValid => (textureRenderer != null) && textureRenderer.enabled;
4035

4136
public override void Initialize()
4237
{
@@ -58,13 +53,13 @@ public void Initialize(float newAspectRatio)
5853

5954
//# Compute and set new scale
6055
ZoomStop();
61-
scale = new Vector2(renderer.transform.localScale.x / aspectRatio, 1f);
62-
renderer.materials[0].SetTextureScale(textureTargetID, scale);
56+
scale = new Vector2(textureRenderer.transform.localScale.x / aspectRatio, 1f);
57+
textureRenderer.materials[0].SetTextureScale(textureTargetID, scale);
6358

6459
//# Update new values for original ratio
6560
originalRatio = new Vector3(scale.x, scale.y);
6661

67-
BoxCollider bcoll = renderer.gameObject.GetComponent<BoxCollider>();
62+
BoxCollider bcoll = textureRenderer.gameObject.GetComponent<BoxCollider>();
6863
if (bcoll != null)
6964
{
7065
origColliderSize = bcoll.size;
@@ -129,8 +124,8 @@ public override void UpdatePanZoom()
129124
}
130125

131126
// Assign new values
132-
renderer.materials[0].SetTextureOffset(textureTargetID, offset); // Pan
133-
renderer.materials[0].SetTextureScale(textureTargetID, scale); // Zoom
127+
textureRenderer.materials[0].SetTextureOffset(textureTargetID, offset); // Pan
128+
textureRenderer.materials[0].SetTextureScale(textureTargetID, scale); // Zoom
134129
}
135130
}
136131

@@ -173,7 +168,7 @@ private void ZoomInOut(float speed, Vector2 pivot)
173168

174169
// Update the offset based on the scale diff and the zoom pivot.
175170
offsetRate_Zoom = (oldScale - newScale) * pivot;
176-
171+
177172
// Update the texture's scale to the computed value.
178173
scale = newScale;
179174
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public class PanZoom_Texture : PanZoomBase_Texture
7171
protected override void Start()
7272
{
7373
// Assigning values to base PanZoom class
74-
renderer = RendererOfTextureToBeNavigated;
74+
textureRenderer = RendererOfTextureToBeNavigated;
7575

7676
ZoomAcceleration = Zoom_Acceleration;
7777
ZoomSpeedMax = Zoom_SpeedMax;
@@ -91,7 +91,7 @@ protected override void Start()
9191

9292
protected override void Update()
9393
{
94-
UpdateValues(ref renderer, RendererOfTextureToBeNavigated);
94+
UpdateValues(ref textureRenderer, RendererOfTextureToBeNavigated);
9595

9696
UpdateValues(ref ZoomAcceleration, Zoom_Acceleration);
9797
UpdateValues(ref ZoomSpeedMax, Zoom_SpeedMax);

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/Scroll_Texture.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected override void Start()
5454
PanSpeedLeftRight = ScrollSpeed_x;
5555
MinDistFromCenterForAutoPan = MinDistFromCenterForAutoScroll;
5656
customColliderSizeOnLookAt = OnLookAt_ColliderSize;
57-
renderer = TextureRendererToBeScrolled;
57+
textureRenderer = TextureRendererToBeScrolled;
5858
useSkimProof = UseSkimProofing;
5959

6060
base.Start();
@@ -69,7 +69,7 @@ protected override void Update()
6969
UpdateValues(ref MinDistFromCenterForAutoPan, MinDistFromCenterForAutoScroll);
7070
UpdateValues(ref MinDistFromCenterForAutoPan, MinDistFromCenterForAutoScroll);
7171
UpdateValues(ref customColliderSizeOnLookAt, OnLookAt_ColliderSize);
72-
UpdateValues(ref renderer, TextureRendererToBeScrolled);
72+
UpdateValues(ref textureRenderer, TextureRendererToBeScrolled);
7373
UpdateValues(ref useSkimProof, UseSkimProofing);
7474

7575
if (UpdateValues(ref skimproof_UpdateSpeedFromUser, SkimProofUpdateSpeed))
@@ -79,6 +79,5 @@ protected override void Update()
7979

8080
base.Update();
8181
}
82-
8382
}
8483
}

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_ScrollPanZoom/Scripts/Target_MoveToCamera.cs‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
1111
public class Target_MoveToCamera : BaseEyeFocusHandler
1212
{
1313
public static Target_MoveToCamera currentlyFocusedTarget;
14+
1415
public MonoBehaviour[] ActivateBehaviorsWhenInFront;
1516

1617
public float DistanceToCamera = 6f;
17-
public float speed = 1f;
18-
public bool isEnabled = false;
1918

20-
public float minDistToStopTransition = 1f;
21-
public float minIncr = 0.01f;
22-
public bool setToAutoRotateIfFocused = true;
19+
[SerializeField]
20+
private float speed = 1f;
21+
22+
[SerializeField]
23+
private bool isEnabled = false;
24+
25+
[SerializeField]
26+
private float minDistToStopTransition = 1f;
27+
28+
[SerializeField]
29+
private bool setToAutoRotateIfFocused = true;
2330

2431
private Vector3 originalPosition;
2532
private bool inTransition = false;

0 commit comments

Comments
 (0)