Skip to content

Commit 6b4a739

Browse files
djohnsomsftdjohnsomsft
committed
Merge branch 'mrtk_development' into inputsimulation_activecontrollers
2 parents 285b4e5 + 6a1ae09 commit 6b4a739

File tree

356 files changed

+4829
-1443
lines changed

Some content is hidden

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

356 files changed

+4829
-1443
lines changed

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider.prefab renamed to Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider - Horizontal.prefab

Lines changed: 195 additions & 75 deletions
Large diffs are not rendered by default.

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider.prefab.meta renamed to Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider - Horizontal.prefab.meta

File renamed without changes.

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider - Vertical.prefab‎

Lines changed: 1803 additions & 0 deletions
Large diffs are not rendered by default.

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Demo_TargetPositioning/Prefabs/3DSlider - Vertical.prefab.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.

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Profiles/EyeTrackingDemoInputSystemProfile.asset‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ MonoBehaviour:
4949
runtimePlatform: -1
5050
deviceManagerProfile: {fileID: 0}
5151
- componentType:
52-
reference: Microsoft.MixedReality.Toolkit.Input.InputSimulationService, Microsoft.MixedReality.Toolkit.Services.InputSimulation
52+
reference: Microsoft.MixedReality.Toolkit.Input.InputSimulationService, Microsoft.MixedReality.Toolkit.Services.InputSimulation.Editor
5353
componentName: Input Simulation Service
5454
priority: 0
5555
runtimePlatform: 16
56-
deviceManagerProfile: {fileID: 11400000, guid: 0e54184c8f9cca44aad8fdda3f62fd82,
56+
deviceManagerProfile: {fileID: 11400000, guid: 41478039094d47641bf4e09c20e61a5a,
5757
type: 2}
5858
- componentType:
5959
reference: Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input.WindowsMixedRealityEyeGazeDataProvider,

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Profiles/EyeTrackingDemoPointerProfile.asset‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ MonoBehaviour:
2424
type: 3}
2525
gazeProviderType:
2626
reference: Microsoft.MixedReality.Toolkit.Input.GazeProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
27-
showCursorWithEyeGaze: 0
2827
pointerOptions:
2928
- controllerType: 256
3029
handedness: 7

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Scripts/TargetBehaviors/LoadAdditiveScene.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,17 @@ private IEnumerator LoadNewScene(string sceneName)
5050
AudioFeedbackPlayer.Instance.PlaySound(audio_OnSelect);
5151

5252
// Let's find out the name of the currently loaded additive scene to unload
53-
if ((lastSceneLoaded == "") && (SceneManager.sceneCount > 1))
53+
if (SceneManager.sceneCount > 1)
5454
{
5555
lastSceneLoaded = SceneManager.GetSceneAt(1).name;
56-
}
57-
58-
Debug.Log($"Last scene name: {lastSceneLoaded}");
5956

60-
// Let's wait in case we don't want to switch scenes too abruptly
61-
yield return new WaitForSeconds(waitTimeInSecBeforeLoading);
57+
Debug.Log($"Last scene name: {lastSceneLoaded}");
6258

59+
// Let's wait in case we don't want to switch scenes too abruptly
60+
yield return new WaitForSeconds(waitTimeInSecBeforeLoading);
6361

64-
SceneManager.UnloadSceneAsync(lastSceneLoaded);
62+
SceneManager.UnloadSceneAsync(lastSceneLoaded);
63+
}
6564

6665
Debug.Log($"New scene name: {SceneToBeLoaded}");
6766
lastSceneLoaded = SceneToBeLoaded;

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

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5974,7 +5974,7 @@ MeshRenderer:
59745974
m_RenderingLayerMask: 4294967295
59755975
m_RendererPriority: 0
59765976
m_Materials:
5977-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
5977+
- {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
59785978
m_StaticBatchInfo:
59795979
firstSubMesh: 0
59805980
subMeshCount: 0
@@ -6543,8 +6543,9 @@ MonoBehaviour:
65436543
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
65446544
m_text: Visualizer
65456545
m_isRightToLeft: 0
6546-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
6547-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
6546+
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
6547+
m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
6548+
type: 2}
65486549
m_fontSharedMaterials: []
65496550
m_fontMaterial: {fileID: 0}
65506551
m_fontMaterials: []
@@ -6587,7 +6588,7 @@ MonoBehaviour:
65876588
m_enableWordWrapping: 1
65886589
m_wordWrappingRatios: 0.4
65896590
m_overflowMode: 0
6590-
m_firstOverflowCharacterIndex: -1
6591+
m_firstOverflowCharacterIndex: 0
65916592
m_linkedTextComponent: {fileID: 0}
65926593
m_isLinkedTextComponent: 0
65936594
m_isTextTruncated: 0
@@ -6852,7 +6853,7 @@ MeshRenderer:
68526853
m_RenderingLayerMask: 4294967295
68536854
m_RendererPriority: 0
68546855
m_Materials:
6855-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
6856+
- {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
68566857
m_StaticBatchInfo:
68576858
firstSubMesh: 0
68586859
subMeshCount: 0
@@ -11970,8 +11971,9 @@ MonoBehaviour:
1197011971
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1197111972
m_text: Navigation
1197211973
m_isRightToLeft: 0
11973-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
11974-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
11974+
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
11975+
m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
11976+
type: 2}
1197511977
m_fontSharedMaterials: []
1197611978
m_fontMaterial: {fileID: 0}
1197711979
m_fontMaterials: []
@@ -12014,7 +12016,7 @@ MonoBehaviour:
1201412016
m_enableWordWrapping: 1
1201512017
m_wordWrappingRatios: 0.4
1201612018
m_overflowMode: 0
12017-
m_firstOverflowCharacterIndex: -1
12019+
m_firstOverflowCharacterIndex: 0
1201812020
m_linkedTextComponent: {fileID: 0}
1201912021
m_isLinkedTextComponent: 0
1202012022
m_isTextTruncated: 0
@@ -13160,8 +13162,9 @@ MonoBehaviour:
1316013162
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1316113163
m_text: Positioning
1316213164
m_isRightToLeft: 0
13163-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
13164-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
13165+
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
13166+
m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
13167+
type: 2}
1316513168
m_fontSharedMaterials: []
1316613169
m_fontMaterial: {fileID: 0}
1316713170
m_fontMaterials: []
@@ -13204,7 +13207,7 @@ MonoBehaviour:
1320413207
m_enableWordWrapping: 1
1320513208
m_wordWrappingRatios: 0.4
1320613209
m_overflowMode: 0
13207-
m_firstOverflowCharacterIndex: -1
13210+
m_firstOverflowCharacterIndex: 0
1320813211
m_linkedTextComponent: {fileID: 0}
1320913212
m_isLinkedTextComponent: 0
1321013213
m_isTextTruncated: 0
@@ -13740,7 +13743,7 @@ MeshRenderer:
1374013743
m_RenderingLayerMask: 4294967295
1374113744
m_RendererPriority: 0
1374213745
m_Materials:
13743-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
13746+
- {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
1374413747
m_StaticBatchInfo:
1374513748
firstSubMesh: 0
1374613749
subMeshCount: 0
@@ -26465,7 +26468,7 @@ MeshRenderer:
2646526468
m_RenderingLayerMask: 4294967295
2646626469
m_RendererPriority: 0
2646726470
m_Materials:
26468-
- {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
26471+
- {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
2646926472
m_StaticBatchInfo:
2647026473
firstSubMesh: 0
2647126474
subMeshCount: 0
@@ -26947,8 +26950,9 @@ MonoBehaviour:
2694726950
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
2694826951
m_text: Selection
2694926952
m_isRightToLeft: 0
26950-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
26951-
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
26953+
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
26954+
m_sharedMaterial: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
26955+
type: 2}
2695226956
m_fontSharedMaterials: []
2695326957
m_fontMaterial: {fileID: 0}
2695426958
m_fontMaterials: []
@@ -26991,7 +26995,7 @@ MonoBehaviour:
2699126995
m_enableWordWrapping: 1
2699226996
m_wordWrappingRatios: 0.4
2699326997
m_overflowMode: 0
26994-
m_firstOverflowCharacterIndex: -1
26998+
m_firstOverflowCharacterIndex: 0
2699526999
m_linkedTextComponent: {fileID: 0}
2699627000
m_isLinkedTextComponent: 0
2699727001
m_isTextTruncated: 0
@@ -27084,7 +27088,7 @@ RectTransform:
2708427088
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2708527089
m_AnchorMin: {x: 0.5, y: 0.5}
2708627090
m_AnchorMax: {x: 0.5, y: 0.5}
27087-
m_AnchoredPosition: {x: 0, y: 0.085}
27091+
m_AnchoredPosition: {x: 0.002, y: 0.085}
2708827092
m_SizeDelta: {x: 0.15, y: 0.03249936}
2708927093
m_Pivot: {x: 0.5, y: 0.5}
2709027094
--- !u!222 &8636164103609303520

‎Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/mrtk_eyes_02_TargetSelection.unity‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1723,6 +1723,18 @@ PrefabInstance:
17231723
propertyPath: m_firstOverflowCharacterIndex
17241724
value: -1
17251725
objectReference: {fileID: 0}
1726+
- target: {fileID: 7706515727995184478, guid: b81ff345fab8e1e449e4b387889fc53c,
1727+
type: 3}
1728+
propertyPath: m_fontAsset
1729+
value:
1730+
objectReference: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217,
1731+
type: 2}
1732+
- target: {fileID: 7706515727995184478, guid: b81ff345fab8e1e449e4b387889fc53c,
1733+
type: 3}
1734+
propertyPath: m_sharedMaterial
1735+
value:
1736+
objectReference: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
1737+
type: 2}
17261738
- target: {fileID: 2708126568456851919, guid: b81ff345fab8e1e449e4b387889fc53c,
17271739
type: 3}
17281740
propertyPath: m_LocalScale.x
@@ -1743,6 +1755,12 @@ PrefabInstance:
17431755
propertyPath: timeToTriggerDwellInSec
17441756
value: 2
17451757
objectReference: {fileID: 0}
1758+
- target: {fileID: 2590592260629347757, guid: b81ff345fab8e1e449e4b387889fc53c,
1759+
type: 3}
1760+
propertyPath: m_Materials.Array.data[0]
1761+
value:
1762+
objectReference: {fileID: 21340371490990018, guid: afc8299d5d5bbd440a0616c8ecbc7217,
1763+
type: 2}
17461764
m_RemovedComponents: []
17471765
m_SourcePrefab: {fileID: 100100000, guid: b81ff345fab8e1e449e4b387889fc53c, type: 3}
17481766
--- !u!1001 &1596560075075636758

0 commit comments

Comments
 (0)