Skip to content

Commit 134dd2c

Browse files
author
Andrei Borodin
committed
Merge remote-tracking branch 'origin/prerelease/2.1.0_stabilization' into prerelease/2.1.0_bugs/removeSourceFor21Release
2 parents 7939ed3 + 6407618 commit 134dd2c

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

Assets/MixedReality.Toolkit.Foundation.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<files>
2020
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
2121
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" target="MRTK\" />
22-
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta" target="MRTK\" />
22+
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta;MixedRealityToolkit.SDK\StandardAssets\Fonts.meta;MixedRealityToolkit.SDK\StandardAssets\Materials.meta;MixedRealityToolkit.SDK\StandardAssets\Shaders.meta;MixedRealityToolkit.SDK\StandardAssets\Textures.meta" target="MRTK\" />
2323
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2424

2525
<file src="MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Foundation.targets" />

Assets/MixedRealityToolkit/Providers/Hands/BaseHandVisualizer.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,16 @@ public void OnHandMeshUpdated(InputEventData<HandMeshInfo> eventData)
182182
{
183183
Mesh mesh = handMeshFilter.mesh;
184184

185+
bool meshChanged = false;
185186
// On some platforms, mesh length counts may change as the hand mesh is updated.
186187
// In order to update the vertices when the array sizes change, the mesh
187188
// must be cleared per instructions here:
188189
// https://docs.unity3d.com/ScriptReference/Mesh.html
189-
if (lastHandMeshVertices.Length != 0 &&
190+
if (lastHandMeshVertices != null &&
191+
lastHandMeshVertices.Length != 0 &&
190192
lastHandMeshVertices.Length != eventData.InputData.vertices?.Length)
191193
{
194+
meshChanged = true;
192195
mesh.Clear();
193196
}
194197

@@ -202,7 +205,10 @@ public void OnHandMeshUpdated(InputEventData<HandMeshInfo> eventData)
202205
mesh.uv = eventData.InputData.uvs;
203206
}
204207

205-
mesh.RecalculateBounds();
208+
if (meshChanged)
209+
{
210+
mesh.RecalculateBounds();
211+
}
206212

207213
handMeshFilter.transform.position = eventData.InputData.position;
208214
handMeshFilter.transform.rotation = eventData.InputData.rotation;

Documentation/README_ExampleHub.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ MRTK Examples Hub is a Unity scene that makes it easy to experience multiple sce
66

77
**MRTKExamplesHub.unity** is the container scene that has shared components including ``MixedRealityToolkit`` and ``MixedRealityPlayspace``. **MRTKExamplesHubMainMenu.unity** scene has the cube buttons.
88

9+
## Prerequisite ##
10+
MRTK Examples Hub uses [Scene Transition Service](https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Extensions/SceneTransitionService/SceneTransitionServiceOverview.html) and related scripts. If you are using MRTK through Unity packages, please import **Microsoft.MixedReality.Toolkit.Unity.Extensions.x.x.x.unitypackage** which is part of the [release packages](https://github.com/microsoft/MixedRealityToolkit-Unity/releases). If you are using MRTK through the repository clone, you should already have **MixedRealityToolkit.Extensions** folder in your project.
11+
912
## MRTKExamplesHub Scene and the Scene System ##
1013
Open **MRTKExamplesHub.unity** which is located at ``MixedRealityToolkit.Examples/Demos/ExamplesHub/Scenes/`` It is an empty scene with MixedRealityToolkit, MixedRealityPlayspace and LoadHubOnStartup. This scene is configured to use MRTK's Scene System. Click ``MixedRealitySceneSystem`` under MixedRealityToolkit. It will display the Scene System's information in the Inspector panel.
1114
<br/><br/><img src="../Documentation/Images/ExamplesHub/MRTK_ExamplesHub_Hierarchy.png" width="300">

pipelines/ci-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: $(Date:yyyyMMdd)v$(Rev:r)
66
variables:
77
UnityVersion: Unity2018.3.7f1
88
MRTKVersion: 2.1.0 # Major.Minor.Patch
9-
MRTKReleaseTag: 'alpha' # final version component, e.g. 'RC2.1' or empty string
9+
MRTKReleaseTag: '' # final version component, e.g. 'RC2.1' or empty string
1010

1111
jobs:
1212
- job: CIReleaseValidation

0 commit comments

Comments
 (0)