Skip to content

Commit 2c42f77

Browse files
keveleighkeveleigh
authored
Merge main into feature/XRI3 (#1114)
Merge main into feature/XRI3
2 parents a93f418 + 3489b96 commit 2c42f77

30 files changed

Lines changed: 401 additions & 379 deletions

File tree

‎.github/workflows/validation_mrtk3.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@ jobs:
3131
run: |
3232
${{ github.workspace }}/Pipelines/Scripts/validatecode.ps1 -Directory '${{ github.workspace }}'
3333
shell: pwsh
34+
35+
- name: Check changelogs
36+
if: github.event_name == 'pull_request'
37+
run: |
38+
${{ github.workspace }}/Pipelines/Scripts/check-changelogs.ps1 -ChangesFile '${{ runner.temp }}/build/changed_files.txt'
39+
shell: pwsh

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ obj/
3535
# Visual Studio Code Generated #
3636
# ============================ #
3737
.vscode/
38+
*.lscache
3839

3940
# ===================== #
4041
# Project Specific List #

‎Pipelines/Scripts/check-changelogs.ps1‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Copyright (c) Mixed Reality Toolkit Contributors
2+
# Licensed under the BSD 3-Clause
3+
4+
<#
5+
.SYNOPSIS
6+
Validates that changelogs have been properly updated for changed files.
7+
.DESCRIPTION
8+
Validates that changelogs have been properly updated for changed files.
9+
.EXAMPLE
10+
.\check-changelogs.ps1 -ChangesFile c:\path\to\changes\file.txt
11+
#>
12+
param(
13+
# The filename containing the list of files to scope the code validation
14+
# to. This is useful in pull request validation when there isn't a need
15+
# to check every single file in the repo for changes (i.e. only the list
16+
# of changed files)
17+
[Parameter(Mandatory = $true)]
18+
[string]$ChangesFile
19+
)
20+
21+
$changelogUpdated = @{ }
22+
23+
# If the file containing the list of changes was provided and actually exists,
24+
# this validation should scope to only those changed files.
25+
if ($ChangesFile -and (Test-Path $ChangesFile -PathType leaf)) {
26+
Get-Content $ChangesFile | ForEach-Object {
27+
Write-Host "Checking file: $_"
28+
$packageName = $_ | Select-String -Pattern "org\.mixedrealitytoolkit\.\w+(\.\w+)*" | Select-Object -First 1
29+
30+
if (-not $packageName) {
31+
return # this is not an MRTK package, so skip
32+
}
33+
34+
$packageName = $packageName.Matches[0].Value
35+
36+
$isChangelog = $_ -match "CHANGELOG.md"
37+
if ($changelogUpdated.ContainsKey($packageName)) {
38+
if ($isChangelog) {
39+
$changelogUpdated[$packageName] = $true
40+
}
41+
}
42+
else {
43+
$changelogUpdated[$packageName] = $isChangelog
44+
}
45+
}
46+
}
47+
48+
$containsIssue = $false
49+
$changelogUpdated.GetEnumerator() | ForEach-Object {
50+
if (-not $_.Value) {
51+
Write-Warning "Package '$($_.Key)' has changes, but its CHANGELOG.md was not updated. This is not always an issue but usually is"
52+
$containsIssue = $true
53+
}
54+
}
55+
56+
if ($containsIssue) {
57+
Write-Output "Potential issues found, please see above for details"
58+
exit 1;
59+
}
60+
else {
61+
Write-Output "No issues found"
62+
exit 0;
63+
}

‎UnityProjects/MRTKDevTemplate/Assets/Scenes/EyeGazeExample.unity‎

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 705507994}
41-
m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
@@ -362,6 +361,9 @@ MonoBehaviour:
362361
<FarDwellTime>k__BackingField: 1
363362
allowSelectByVoice: 1
364363
speechRecognitionKeyword: select
364+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
365+
m_PersistentCalls:
366+
m_Calls: []
365367
<VoiceRequiresFocus>k__BackingField: 1
366368
<SelectRequiresHover>k__BackingField: 0
367369
<IsToggled>k__BackingField:
@@ -805,6 +807,9 @@ MonoBehaviour:
805807
<FarDwellTime>k__BackingField: 1
806808
allowSelectByVoice: 1
807809
speechRecognitionKeyword: select
810+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
811+
m_PersistentCalls:
812+
m_Calls: []
808813
<VoiceRequiresFocus>k__BackingField: 1
809814
<SelectRequiresHover>k__BackingField: 0
810815
<IsToggled>k__BackingField:
@@ -1126,6 +1131,9 @@ MonoBehaviour:
11261131
<FarDwellTime>k__BackingField: 1
11271132
allowSelectByVoice: 1
11281133
speechRecognitionKeyword: select
1134+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
1135+
m_PersistentCalls:
1136+
m_Calls: []
11291137
<VoiceRequiresFocus>k__BackingField: 1
11301138
<SelectRequiresHover>k__BackingField: 0
11311139
<IsToggled>k__BackingField:
@@ -1447,6 +1455,9 @@ MonoBehaviour:
14471455
<FarDwellTime>k__BackingField: 1
14481456
allowSelectByVoice: 1
14491457
speechRecognitionKeyword: select
1458+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
1459+
m_PersistentCalls:
1460+
m_Calls: []
14501461
<VoiceRequiresFocus>k__BackingField: 1
14511462
<SelectRequiresHover>k__BackingField: 0
14521463
<IsToggled>k__BackingField:
@@ -1768,6 +1779,9 @@ MonoBehaviour:
17681779
<FarDwellTime>k__BackingField: 1
17691780
allowSelectByVoice: 1
17701781
speechRecognitionKeyword: select
1782+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
1783+
m_PersistentCalls:
1784+
m_Calls: []
17711785
<VoiceRequiresFocus>k__BackingField: 1
17721786
<SelectRequiresHover>k__BackingField: 0
17731787
<IsToggled>k__BackingField:
@@ -2178,6 +2192,9 @@ MonoBehaviour:
21782192
<FarDwellTime>k__BackingField: 1
21792193
allowSelectByVoice: 1
21802194
speechRecognitionKeyword: select
2195+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
2196+
m_PersistentCalls:
2197+
m_Calls: []
21812198
<VoiceRequiresFocus>k__BackingField: 1
21822199
<SelectRequiresHover>k__BackingField: 0
21832200
<IsToggled>k__BackingField:
@@ -2550,6 +2567,9 @@ MonoBehaviour:
25502567
<FarDwellTime>k__BackingField: 1
25512568
allowSelectByVoice: 1
25522569
speechRecognitionKeyword: select
2570+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
2571+
m_PersistentCalls:
2572+
m_Calls: []
25532573
<VoiceRequiresFocus>k__BackingField: 1
25542574
<SelectRequiresHover>k__BackingField: 0
25552575
<IsToggled>k__BackingField:
@@ -3033,6 +3053,9 @@ MonoBehaviour:
30333053
<FarDwellTime>k__BackingField: 1
30343054
allowSelectByVoice: 1
30353055
speechRecognitionKeyword: select
3056+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
3057+
m_PersistentCalls:
3058+
m_Calls: []
30363059
<VoiceRequiresFocus>k__BackingField: 1
30373060
<SelectRequiresHover>k__BackingField: 0
30383061
<IsToggled>k__BackingField:
@@ -3418,6 +3441,9 @@ MonoBehaviour:
34183441
<FarDwellTime>k__BackingField: 1
34193442
allowSelectByVoice: 1
34203443
speechRecognitionKeyword: select
3444+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
3445+
m_PersistentCalls:
3446+
m_Calls: []
34213447
<VoiceRequiresFocus>k__BackingField: 1
34223448
<SelectRequiresHover>k__BackingField: 0
34233449
<IsToggled>k__BackingField:
@@ -3529,7 +3555,7 @@ MonoBehaviour:
35293555
m_Script: {fileID: 11500000, guid: 8b0ab44b6f20884458aa9e1d5ea5cf22, type: 3}
35303556
m_Name:
35313557
m_EditorClassIdentifier:
3532-
EditorTestIsCalibrated: 4
3558+
<EditorTestIsCalibrated>k__BackingField: 4
35333559
calibrated:
35343560
m_PersistentCalls:
35353561
m_Calls: []
@@ -3627,7 +3653,7 @@ MonoBehaviour:
36273653
m_OnCullStateChanged:
36283654
m_PersistentCalls:
36293655
m_Calls: []
3630-
m_text: 'There was an error retrieving eye calibration status. '
3656+
m_text: There was an error retrieving eye calibration status.
36313657
m_isRightToLeft: 0
36323658
m_fontAsset: {fileID: 11400000, guid: fea6b26abeefbc547b6aca1dbda0a34d, type: 2}
36333659
m_sharedMaterial: {fileID: -2049848100760321927, guid: fea6b26abeefbc547b6aca1dbda0a34d, type: 2}
@@ -3943,6 +3969,9 @@ MonoBehaviour:
39433969
<FarDwellTime>k__BackingField: 1
39443970
allowSelectByVoice: 1
39453971
speechRecognitionKeyword: select
3972+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
3973+
m_PersistentCalls:
3974+
m_Calls: []
39463975
<VoiceRequiresFocus>k__BackingField: 1
39473976
<SelectRequiresHover>k__BackingField: 0
39483977
<IsToggled>k__BackingField:
@@ -4264,6 +4293,9 @@ MonoBehaviour:
42644293
<FarDwellTime>k__BackingField: 1
42654294
allowSelectByVoice: 1
42664295
speechRecognitionKeyword: select
4296+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
4297+
m_PersistentCalls:
4298+
m_Calls: []
42674299
<VoiceRequiresFocus>k__BackingField: 1
42684300
<SelectRequiresHover>k__BackingField: 0
42694301
<IsToggled>k__BackingField:
@@ -4585,6 +4617,9 @@ MonoBehaviour:
45854617
<FarDwellTime>k__BackingField: 1
45864618
allowSelectByVoice: 1
45874619
speechRecognitionKeyword: select
4620+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
4621+
m_PersistentCalls:
4622+
m_Calls: []
45884623
<VoiceRequiresFocus>k__BackingField: 1
45894624
<SelectRequiresHover>k__BackingField: 0
45904625
<IsToggled>k__BackingField:
@@ -4906,6 +4941,9 @@ MonoBehaviour:
49064941
<FarDwellTime>k__BackingField: 1
49074942
allowSelectByVoice: 1
49084943
speechRecognitionKeyword: select
4944+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
4945+
m_PersistentCalls:
4946+
m_Calls: []
49094947
<VoiceRequiresFocus>k__BackingField: 1
49104948
<SelectRequiresHover>k__BackingField: 0
49114949
<IsToggled>k__BackingField:
@@ -5227,6 +5265,9 @@ MonoBehaviour:
52275265
<FarDwellTime>k__BackingField: 1
52285266
allowSelectByVoice: 1
52295267
speechRecognitionKeyword: select
5268+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
5269+
m_PersistentCalls:
5270+
m_Calls: []
52305271
<VoiceRequiresFocus>k__BackingField: 1
52315272
<SelectRequiresHover>k__BackingField: 0
52325273
<IsToggled>k__BackingField:
@@ -5581,6 +5622,9 @@ MonoBehaviour:
55815622
<FarDwellTime>k__BackingField: 1
55825623
allowSelectByVoice: 1
55835624
speechRecognitionKeyword: select
5625+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
5626+
m_PersistentCalls:
5627+
m_Calls: []
55845628
<VoiceRequiresFocus>k__BackingField: 1
55855629
<SelectRequiresHover>k__BackingField: 0
55865630
<IsToggled>k__BackingField:
@@ -6054,6 +6098,9 @@ MonoBehaviour:
60546098
<FarDwellTime>k__BackingField: 1
60556099
allowSelectByVoice: 1
60566100
speechRecognitionKeyword: select
6101+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
6102+
m_PersistentCalls:
6103+
m_Calls: []
60576104
<VoiceRequiresFocus>k__BackingField: 1
60586105
<SelectRequiresHover>k__BackingField: 0
60596106
<IsToggled>k__BackingField:
@@ -6375,6 +6422,9 @@ MonoBehaviour:
63756422
<FarDwellTime>k__BackingField: 1
63766423
allowSelectByVoice: 1
63776424
speechRecognitionKeyword: select
6425+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
6426+
m_PersistentCalls:
6427+
m_Calls: []
63786428
<VoiceRequiresFocus>k__BackingField: 1
63796429
<SelectRequiresHover>k__BackingField: 0
63806430
<IsToggled>k__BackingField:
@@ -6665,6 +6715,9 @@ MonoBehaviour:
66656715
<FarDwellTime>k__BackingField: 1
66666716
allowSelectByVoice: 1
66676717
speechRecognitionKeyword: select
6718+
<OnSpeechRecognitionKeywordChanged>k__BackingField:
6719+
m_PersistentCalls:
6720+
m_Calls: []
66686721
<VoiceRequiresFocus>k__BackingField: 1
66696722
<SelectRequiresHover>k__BackingField: 0
66706723
<IsToggled>k__BackingField:

‎UnityProjects/MRTKDevTemplate/Assets/Scripts/EyeCalibrationWarning.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
// Copyright (c) Mixed Reality Toolkit Contributors
22
// Licensed under the BSD 3-Clause
33

4-
// Disable "missing XML comment" warning for samples. While nice to have, this XML documentation is not required for samples.
5-
#pragma warning disable CS1591
6-
7-
using UnityEngine;
8-
using UnityEngine.Events;
94
using MixedReality.Toolkit.Input;
105
using TMPro;
6+
using UnityEngine;
117

128
namespace MixedReality.Toolkit.Examples
139
{
@@ -76,7 +72,7 @@ private void UpdateMessage(EyeCalibrationStatus status)
7672
switch (status)
7773
{
7874
case EyeCalibrationStatus.Unsupported:
79-
text.text = "";
75+
text.text = string.Empty;
8076
return;
8177
case EyeCalibrationStatus.Calibrated:
8278
text.text = "Eye Calibration Status: Calibrated.";
@@ -96,4 +92,3 @@ private void UpdateMessage(EyeCalibrationStatus status)
9692
}
9793
}
9894
}
99-
#pragma warning restore CS1591

‎docs/Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ GEM
4949
jekyll (>= 3.8, < 5.0)
5050
jekyll-watch (2.2.1)
5151
listen (~> 3.0)
52-
json (2.16.0)
52+
json (2.17.1.2)
5353
just-the-docs (0.10.1)
5454
jekyll (>= 3.8.5)
5555
jekyll-include-cache

‎org.mixedrealitytoolkit.accessibility/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
44

5+
## Unreleased
6+
7+
### Changed
8+
9+
* Updated `AccessibilitySubsystemDescriptor` to use built-in MRTK base classes. [PR #1109](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1109)
10+
511
## [1.0.3-development.pre.20] - 2024-04-17
612

713
### Fixed

0 commit comments

Comments
 (0)