Skip to content

Commit 864fc8c

Browse files
committed
Merge branch 'mrtk_development' of https://github.com/microsoft/MixedRealityToolkit-Unity into mrtk_development
2 parents 10d8aee + c29fcb1 commit 864fc8c

File tree

186 files changed

+5594
-1377
lines changed

Some content is hidden

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

186 files changed

+5594
-1377
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ A clear and concise description of what you expected to happen.
2828

2929
If applicable, add screenshots to help explain your problem.
3030

31-
## Your Setup (please complete the following information)
31+
## Your setup (please complete the following information)
3232

3333
- Unity Version [e.g. 2018.3.11f1]
3434
- MRTK Version [e.g. v2.0]
3535

36-
## Target Platform (please complete the following information)
36+
## Target platform (please complete the following information)
3737

3838
- HoloLens
3939
- HoloLens 2

.github/ISSUE_TEMPLATE/documentation-issue.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ assignees: ''
77

88
---
99

10-
## Describe the Issue
10+
## Describe the issue
1111
A clear and concise what the issue
1212

13-
## Feature Area
13+
## Feature area
1414
What's incorrect? What's missing?
1515

16-
## Existing Doc Link
17-
If this is about something in an existing document, please provide link
16+
## Existing doc link
17+
If this is about something in an existing document, please provide link
1818

1919
## Additional context
2020
Add any other context about the problem here.

.github/issue_template.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
## Overview
22

3-
## Expected Behavior
3+
## Expected behavior
44

5-
## Actual Behavior
5+
## Actual behavior
66

77
## Steps to reproduce
88
_(Links to sample github project preferred)_
99

10-
## Unity Editor Version
10+
## Unity editor version
1111

12-
## Mixed Reality Toolkit Release Version
12+
## Mixed Reality Toolkit release version

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@ obj/
5959
# Project Specific List #
6060
# ===================== #
6161
artifacts/
62-
Assets/ThirdParty/
63-
Assets/ThirdParty.meta
64-
Assets/TextMesh Pro.meta
65-
Assets/TextMesh Pro/
62+
Assets/ThirdParty*
63+
Assets/TextMesh Pro*
6664
--Version/
6765
Assets/StreamingAssets/GltfModels/
6866
Assets/StreamingAssets/GltfModels.meta
6967
Assets/StreamingAssets.meta
70-
Assets/MixedRealityToolkit.Generated/*
68+
Assets/MixedRealityToolkit.Generated*
7169

7270
/mrtk_log_mostRecentET.csv
7371

Assets/MixedRealityToolkit.Examples/Demos/Gltf/Models/Avocado/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
![screenshot](../../../../../../Documentation/Images/gltf/avocado_screenshot.jpg)
66

7-
## License Information
7+
## License information
88

99
[![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)
1010
To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.

Assets/MixedRealityToolkit.Examples/Demos/README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,28 @@
33
This folder contains demonstrations of the currently implemented features supplied with the Mixed Reality Toolkit. These include:
44

55
## Audio
6+
67
The MRTK provides 3D spatial audio capabilities and utilities to aid you in the production of 3D audio in a Mixed Reality environment.
78
This folder contains two demonstration implementations for:
89

910
* Audio LoFi Effects
1011
* Audio Occlusion
1112

1213
## Boundary
14+
1315
The MRTK provides several capabilities to both represent and manage the boundary provided by the various implemented systems.
1416

1517
This folder provides a simple demonstration to visualize the boundary reported by the active system, if provided.
1618

1719
## Solvers
20+
1821
Solvers provide many advanced ways to link or place objects within a scene and to attach them to other objects or even the player.
1922
Solvers also allow objects to be aware of their surroundings and moved with / against them in various ways.
2023

2124
This folder contains a simple demonstration scene showing several of the solver options and how they can be applied in a scene.
2225

23-
## Standard Shader
26+
## Standard shader
27+
2428
The MRTK standard shader is specifically customized for use in Mixed Reality environments and enabling several advanced effects "out of the box".
2529

2630
This folder includes three demonstrations to show off the capabilities of the MRTK Standard Shader and how to configure it for each effect, namely:
@@ -35,6 +39,7 @@ A side by side comparison of the Unity Standard Shader and the MRTK Standard Sha
3539
A gallery of the standards material assets provided with the MRTK and how they look using the MRTK Standard Shader.
3640

3741
## UX
42+
3843
The Mixed Reality Toolkit provides several aids to build the UX in your Mixed Reality Solution, these currently include:
3944

4045
* Object Collections
@@ -43,4 +48,4 @@ Several mechanisms to orientate and place object in a scene relative to each oth
4348
* Lines
4449
Several default line drawing options for use in your project. Also utilized by the MRTK itself for controller pointer and teleportation use.
4550

46-
> Keep checking back often as more UX controls are added.
51+
> Keep checking back often as more UX controls are added.
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
# What is the "MixedRealityToolkit/Standard" shader?
1+
# MixedRealityToolkit/Standard shader
2+
23
The MixedRealityToolkit/Standard shader is a collection of shading techniques for mimicking [**Microsoft's Fluent Design System**](https://fluent.microsoft.com/) within Unity 3D.
34

45
The goal of this shader is to have a single, flexible shader that can achieve visuals similar to Unity's Standard Shader, implement Fluent Design System principles, and remain performant on mixed reality devices.
56

6-
## Example Scenes
7+
## Example scenes
78

89
To explore a Unity scene demonstrating materials which use many of the MixedRealityToolkit/Standard's features open **Scenes\MaterialGallery.unity** within Unity's editor, or deploy to a mixed reality device.
910
To compare the Unity Standard shader to the MRTK Standard shader open **Scenes\StandardMaterialComparison.unity** within Unity's editor, or deploy to a mixed reality device.
1011
For a gallery of common MRTK materials open **Scenes\StandardMaterials.unity** within Unity's editor, or deploy to a mixed reality device.
1112

1213
## Limitations
14+
1315
- Only one light source is supported, the directional light (additional light can be achieved using lightmapping).

Assets/MixedRealityToolkit.Extensions/HandPhysicsService.meta

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

Assets/MixedRealityToolkit.Extensions/HandPhysicsService/Examples.meta

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

0 commit comments

Comments
 (0)