Skip to content

Commit 8ad15b6

Browse files
thalbernthalbern
authored
Merge pull request #3 from Microsoft/mrtk_development
Mrtk development
2 parents df96224 + 69371d9 commit 8ad15b6

File tree

203 files changed

+3332
-2207
lines changed

Some content is hidden

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

203 files changed

+3332
-2207
lines changed

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/MixedRealityToolkit-Examples.Demos.UX.Interactables.asmdef renamed to Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/MixedRealityToolkit.Examples.Demos.UX.Interactables.asmdef

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "MixedRealityToolkit-Examples.Demos.UX.Interactables",
2+
"name": "MixedRealityToolkit.Examples.Demos.UX.Interactables",
33
"references": [
44
"Microsoft.MixedReality.Toolkit.SDK",
55
"Microsoft.MixedReality.Toolkit",
@@ -8,5 +8,9 @@
88
"optionalUnityReferences": [],
99
"includePlatforms": [],
1010
"excludePlatforms": [],
11-
"allowUnsafeCode": false
11+
"allowUnsafeCode": false,
12+
"overrideReferences": false,
13+
"precompiledReferences": [],
14+
"autoReferenced": true,
15+
"defineConstraints": []
1216
}

Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/MixedRealityToolkit-Examples.Demos.UX.Interactables.asmdef.meta renamed to Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/MixedRealityToolkit.Examples.Demos.UX.Interactables.asmdef.meta

File renamed without changes.

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/Scenes/InteractablesGallery.unity‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,12 @@ Prefab:
317317
propertyPath: Events.Array.data[0].ClassName
318318
value: InteractableAudioReceiver
319319
objectReference: {fileID: 0}
320+
- target: {fileID: 114718788154663760, guid: 51cc6641d88b49d46bd38572540efe6c,
321+
type: 2}
322+
propertyPath: Events.Array.data[0].AssemblyQualifiedName
323+
value: Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events.InteractableAudioReceiver,
324+
Microsoft.MixedReality.Toolkit.SDK
325+
objectReference: {fileID: 0}
320326
- target: {fileID: 114718788154663760, guid: 51cc6641d88b49d46bd38572540efe6c,
321327
type: 2}
322328
propertyPath: Events.Array.data[0].HideUnityEvents
@@ -504,6 +510,8 @@ MonoBehaviour:
504510
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
505511
Culture=neutral, PublicKeyToken=null
506512
ClassName: CustomInteractablesReceiver
513+
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events.CustomInteractablesReceiver,
514+
MixedRealityToolkit-Examples.Demos.UX.Interactables
507515
Settings: []
508516
HideUnityEvents: 1
509517
--- !u!4 &519184499 stripped
@@ -1154,6 +1162,12 @@ Prefab:
11541162
propertyPath: Events.Array.data[0].ClassName
11551163
value: InteractableOnFocusReceiver
11561164
objectReference: {fileID: 0}
1165+
- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73,
1166+
type: 2}
1167+
propertyPath: Events.Array.data[0].AssemblyQualifiedName
1168+
value: Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events.InteractableOnFocusReceiver,
1169+
Microsoft.MixedReality.Toolkit.SDK
1170+
objectReference: {fileID: 0}
11571171
- target: {fileID: 114818926546564510, guid: 02c524b22137b5449904f5395141cc73,
11581172
type: 2}
11591173
propertyPath: Events.Array.data[0].HideUnityEvents
@@ -1855,6 +1869,8 @@ MonoBehaviour:
18551869
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
18561870
Culture=neutral, PublicKeyToken=null
18571871
ClassName: CustomInteractablesReceiver
1872+
AssemblyQualifiedName: Microsoft.MixedReality.Toolkit.SDK.UX.Interactable.Events.CustomInteractablesReceiver,
1873+
MixedRealityToolkit-Examples.Demos.UX.Interactables
18581874
Settings: []
18591875
HideUnityEvents: 1
18601876
--- !u!4 &1441615695 stripped

Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/MixedRealityToolkit-Examples.Demos.Utilities.InspectorFields.Inspectors.asmdef renamed to Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/MixedRealityToolkit.Examples.Demos.Utilities.InspectorFields.Inspectors.asmdef

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "MixedRealityToolkit-Examples.Demos.Utilities.InspectorFields.Inspectors",
2+
"name": "MixedRealityToolkit.Examples.Demos.Utilities.InspectorFields.Inspectors",
33
"references": [
44
"Microsoft.MixedReality.Toolkit.Core.Inspectors",
55
"Microsoft.MixedReality.Toolkit",
@@ -10,5 +10,9 @@
1010
"Editor"
1111
],
1212
"excludePlatforms": [],
13-
"allowUnsafeCode": false
13+
"allowUnsafeCode": false,
14+
"overrideReferences": false,
15+
"precompiledReferences": [],
16+
"autoReferenced": true,
17+
"defineConstraints": []
1418
}

Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/MixedRealityToolkit-Examples.Demos.Utilities.InspectorFields.Inspectors.asmdef.meta renamed to Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/MixedRealityToolkit.Examples.Demos.Utilities.InspectorFields.Inspectors.asmdef.meta

File renamed without changes.

Assets/MixedRealityToolkit/Utilities/BuildAndDeploy/README.md.meta renamed to Assets/MixedRealityToolkit.Examples/toc.yml.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.Providers/OpenVR/MixedRealityToolkit.Providers.OpenVR.asmdef‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"optionalUnityReferences": [],
77
"includePlatforms": [
88
"Editor",
9-
"LinuxStandalone32",
109
"LinuxStandalone64",
1110
"macOSStandalone",
1211
"WindowsStandalone32",

‎Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,8 @@ public override void Enable()
269269

270270
interactionmanagerStates = InteractionManager.GetCurrentReading();
271271

272+
// Avoids a Unity Editor bug detecting a controller from the previous run during the first frame
273+
#if !UNITY_EDITOR
272274
// NOTE: We update the source state data, in case an app wants to query it on source detected.
273275
for (var i = 0; i < interactionmanagerStates?.Length; i++)
274276
{
@@ -280,6 +282,7 @@ public override void Enable()
280282
MixedRealityToolkit.InputSystem?.RaiseSourceDetected(controller.InputSource, controller);
281283
}
282284
}
285+
#endif
283286

284287
if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
285288
MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.GesturesProfile != null &&
@@ -466,6 +469,15 @@ private void RemoveController(InteractionSource interactionSource)
466469
/// <param name="args">SDK source detected event arguments</param>
467470
private void InteractionManager_InteractionSourceDetected(InteractionSourceDetectedEventArgs args)
468471
{
472+
473+
// Avoids a Unity Editor bug detecting a controller from the previous run during the first frame
474+
#if UNITY_EDITOR
475+
if (Time.frameCount <= 1)
476+
{
477+
return;
478+
}
479+
#endif
480+
469481
bool raiseSourceDetected = !activeControllers.ContainsKey(args.state.source.id);
470482

471483
var controller = GetController(args.state.source);

‎Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealitySpatialMeshObserver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public override void Destroy()
124124
private GameObject observedObjectParent = null;
125125

126126
/// <summary>
127-
/// The <see cref="UnityEngine.GameObject"/> to which observed objects are parented.
127+
/// The <see href="https://docs.unity3d.com/ScriptReference/GameObject.html">GameObject</see> to which observed objects are parented.
128128
/// </summary>
129129
private GameObject ObservedObjectParent => observedObjectParent != null ? observedObjectParent : (observedObjectParent = SpatialAwarenessSystem?.CreateSpatialAwarenessObjectParent("WindowsMixedRealitySpatialMeshObserver"));
130130

‎Assets/MixedRealityToolkit.SDK/Features/Audio/Influencers/AudioInfluencerController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Microsoft.MixedReality.Toolkit.SDK.Audio.Influencers
1313
/// Class which supports components implementing <see cref="Microsoft.MixedReality.Toolkit.Core.Interfaces.Audio.IAudioInfluencer"/> being used with audio sources.
1414
/// </summary>
1515
/// <remarks>
16-
/// AudioInfluencerController requires an <see cref="UnityEngine.AudioSource"/> component. If one is not attached, it will be added automatically.
16+
/// AudioInfluencerController requires an <see href="https://docs.unity3d.com/ScriptReference/AudioSource.html">AudioSource</see> component. If one is not attached, it will be added automatically.
1717
/// Each sound playing game object needs to have an AudioInfluencerController attached in order to have it's audio influenced.
1818
/// </remarks>
1919
[RequireComponent(typeof(AudioSource))]

0 commit comments

Comments
 (0)