Skip to content

Commit 7eee93e

Browse files
author
David Kline (ANALOG)
committed
update to beta changes
2 parents d78bfa3 + 73542e1 commit 7eee93e

File tree

127 files changed

+899
-915
lines changed

Some content is hidden

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

127 files changed

+899
-915
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/README.md‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Mixed Reality Toolkit Examples - Demos
2+
3+
This folder contains demonstrations of the currently implemented features supplied with the Mixed Reality Toolkit. These include:
4+
5+
## Audio
6+
The MRTK provides 3D spatial audio capabilities and utilities to aid you in the production of 3D audio in a Mixed Reality environment.
7+
This folder contains two demonstration implementations for:
8+
9+
* Audio LoFi Effects
10+
* Audio Occlusion
11+
12+
## Boundary
13+
The MRTK provides several capabilities to both represent and manage the boundary provided by the various implemented systems.
14+
15+
This folder provides a simple demonstration to visualize the boundary reported by the active system, if provided.
16+
17+
## Solvers
18+
Solvers provide many advanced ways to link or place objects within a scene and to attach them to other objects or even the player.
19+
Solvers also allow objects to be aware of their surroundings and moved with / against them in various ways.
20+
21+
This folder contains a simple demonstration scene showing several of the solver options and how they can be applied in a scene.
22+
23+
## Standard Shader
24+
The MRTK standard shader is specifically customized for use in Mixed Reality environments and enabling several advanced effects "out of the box".
25+
26+
This folder includes three demonstrations to show off the capabilities of the MRTK Standard Shader and how to configure it for each effect, namely:
27+
28+
* Material Gallery
29+
A full gallery of all the effects supported by the MRTK Standard Shader.
30+
31+
* Standard Material Comparison
32+
A side by side comparison of the Unity Standard Shader and the MRTK Standard Shader.
33+
34+
* Standard materials
35+
A gallery of the standards material assets provided with the MRTK and how they look using the MRTK Standard Shader.
36+
37+
## UX
38+
The Mixed Reality Toolkit provides several aids to build the UX in your Mixed Reality Solution, these currently include:
39+
40+
* Object Collections
41+
Several mechanisms to orientate and place object in a scene relative to each other. E.G. Side by side arrays, spherical arrays and much more.
42+
43+
* Lines
44+
Several default line drawing options for use in your project. Also utilized by the MRTK itself for controller pointer and teleportation use.
45+
46+
> Keep checking back often as more UX controls are added.

Assets/MixedRealityToolkit/Sharing/RackNet/README.md.meta renamed to Assets/MixedRealityToolkit-Examples/Demos/README.md.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSource.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ MonoBehaviour:
9696
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
9797
m_Name:
9898
m_EditorClassIdentifier:
99-
handedness: 1
99+
handedness: 0
100100
trackedObjectToReference: 2
101101
additionalOffset: {x: 0, y: 0, z: 0}
102102
additionalRotation: {x: 0, y: 0, z: 0}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSourceWithOffset.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ MonoBehaviour:
197197
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
198198
m_Name:
199199
m_EditorClassIdentifier:
200-
handedness: 1
200+
handedness: 0
201201
trackedObjectToReference: 2
202202
additionalOffset: {x: 0, y: 0, z: 0}
203203
additionalRotation: {x: 0, y: 0, z: 0}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/ChaseSourceWithOffsetThenFaceHead.prefab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ MonoBehaviour:
272272
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
273273
m_Name:
274274
m_EditorClassIdentifier:
275-
handedness: 1
275+
handedness: 0
276276
trackedObjectToReference: 2
277277
additionalOffset: {x: 0, y: 0, z: 0}
278278
additionalRotation: {x: 0, y: 0, z: 0}
@@ -289,7 +289,7 @@ MonoBehaviour:
289289
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
290290
m_Name:
291291
m_EditorClassIdentifier:
292-
handedness: 1
292+
handedness: 0
293293
trackedObjectToReference: 0
294294
additionalOffset: {x: 0, y: 0, z: 0}
295295
additionalRotation: {x: 0, y: 0, z: 0}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/InBetweenSources.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ MonoBehaviour:
9696
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
9797
m_Name:
9898
m_EditorClassIdentifier:
99-
handedness: 1
99+
handedness: 0
100100
trackedObjectToReference: 2
101101
additionalOffset: {x: 0, y: 0, z: 0}
102102
additionalRotation: {x: 0, y: 0, z: 0}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/Orbital.prefab‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1644659546057122}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1644659546057122
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4901806931539292}
2222
- component: {fileID: 33633702823728314}
@@ -33,7 +33,7 @@ GameObject:
3333
--- !u!4 &4901806931539292
3434
Transform:
3535
m_ObjectHideFlags: 1
36-
m_PrefabParentObject: {fileID: 0}
36+
m_CorrespondingSourceObject: {fileID: 0}
3737
m_PrefabInternal: {fileID: 100100000}
3838
m_GameObject: {fileID: 1644659546057122}
3939
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -46,7 +46,7 @@ Transform:
4646
--- !u!23 &23345689241976446
4747
MeshRenderer:
4848
m_ObjectHideFlags: 1
49-
m_PrefabParentObject: {fileID: 0}
49+
m_CorrespondingSourceObject: {fileID: 0}
5050
m_PrefabInternal: {fileID: 100100000}
5151
m_GameObject: {fileID: 1644659546057122}
5252
m_Enabled: 1
@@ -58,7 +58,7 @@ MeshRenderer:
5858
m_ReflectionProbeUsage: 1
5959
m_RenderingLayerMask: 4294967295
6060
m_Materials:
61-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
61+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
6262
m_StaticBatchInfo:
6363
firstSubMesh: 0
6464
subMeshCount: 0
@@ -81,22 +81,22 @@ MeshRenderer:
8181
--- !u!33 &33633702823728314
8282
MeshFilter:
8383
m_ObjectHideFlags: 1
84-
m_PrefabParentObject: {fileID: 0}
84+
m_CorrespondingSourceObject: {fileID: 0}
8585
m_PrefabInternal: {fileID: 100100000}
8686
m_GameObject: {fileID: 1644659546057122}
8787
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
8888
--- !u!114 &114474594170136286
8989
MonoBehaviour:
9090
m_ObjectHideFlags: 1
91-
m_PrefabParentObject: {fileID: 0}
91+
m_CorrespondingSourceObject: {fileID: 0}
9292
m_PrefabInternal: {fileID: 100100000}
9393
m_GameObject: {fileID: 1644659546057122}
9494
m_Enabled: 1
9595
m_EditorHideFlags: 0
9696
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
9797
m_Name:
9898
m_EditorClassIdentifier:
99-
handedness: 1
99+
handedness: 0
100100
trackedObjectToReference: 0
101101
additionalOffset: {x: 0, y: 0, z: 0}
102102
additionalRotation: {x: 0, y: 0, z: 0}
@@ -105,7 +105,7 @@ MonoBehaviour:
105105
--- !u!114 &114785721768203206
106106
MonoBehaviour:
107107
m_ObjectHideFlags: 1
108-
m_PrefabParentObject: {fileID: 0}
108+
m_CorrespondingSourceObject: {fileID: 0}
109109
m_PrefabInternal: {fileID: 100100000}
110110
m_GameObject: {fileID: 1644659546057122}
111111
m_Enabled: 1

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Prefabs/OrbitalWithStepping.prefab‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Prefab:
88
m_TransformParent: {fileID: 0}
99
m_Modifications: []
1010
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
11+
m_SourcePrefab: {fileID: 0}
1212
m_RootGameObject: {fileID: 1644659546057122}
13-
m_IsPrefabParent: 1
13+
m_IsPrefabAsset: 1
1414
--- !u!1 &1644659546057122
1515
GameObject:
1616
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
17+
m_CorrespondingSourceObject: {fileID: 0}
1818
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
19+
serializedVersion: 6
2020
m_Component:
2121
- component: {fileID: 4901806931539292}
2222
- component: {fileID: 33633702823728314}
@@ -33,7 +33,7 @@ GameObject:
3333
--- !u!4 &4901806931539292
3434
Transform:
3535
m_ObjectHideFlags: 1
36-
m_PrefabParentObject: {fileID: 0}
36+
m_CorrespondingSourceObject: {fileID: 0}
3737
m_PrefabInternal: {fileID: 100100000}
3838
m_GameObject: {fileID: 1644659546057122}
3939
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -46,7 +46,7 @@ Transform:
4646
--- !u!23 &23345689241976446
4747
MeshRenderer:
4848
m_ObjectHideFlags: 1
49-
m_PrefabParentObject: {fileID: 0}
49+
m_CorrespondingSourceObject: {fileID: 0}
5050
m_PrefabInternal: {fileID: 100100000}
5151
m_GameObject: {fileID: 1644659546057122}
5252
m_Enabled: 1
@@ -58,7 +58,7 @@ MeshRenderer:
5858
m_ReflectionProbeUsage: 1
5959
m_RenderingLayerMask: 4294967295
6060
m_Materials:
61-
- {fileID: 2100000, guid: 71d573ea4cb045cdadc98e56044f6d2c, type: 2}
61+
- {fileID: 2100000, guid: 53ea63593b32415faf734536616f5fb3, type: 2}
6262
m_StaticBatchInfo:
6363
firstSubMesh: 0
6464
subMeshCount: 0
@@ -81,22 +81,22 @@ MeshRenderer:
8181
--- !u!33 &33633702823728314
8282
MeshFilter:
8383
m_ObjectHideFlags: 1
84-
m_PrefabParentObject: {fileID: 0}
84+
m_CorrespondingSourceObject: {fileID: 0}
8585
m_PrefabInternal: {fileID: 100100000}
8686
m_GameObject: {fileID: 1644659546057122}
8787
m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
8888
--- !u!114 &114474594170136286
8989
MonoBehaviour:
9090
m_ObjectHideFlags: 1
91-
m_PrefabParentObject: {fileID: 0}
91+
m_CorrespondingSourceObject: {fileID: 0}
9292
m_PrefabInternal: {fileID: 100100000}
9393
m_GameObject: {fileID: 1644659546057122}
9494
m_Enabled: 1
9595
m_EditorHideFlags: 0
9696
m_Script: {fileID: 11500000, guid: b55691ad5b034fe6966763a6e23818d2, type: 3}
9797
m_Name:
9898
m_EditorClassIdentifier:
99-
handedness: 1
99+
handedness: 0
100100
trackedObjectToReference: 0
101101
additionalOffset: {x: 0, y: 0, z: 0}
102102
additionalRotation: {x: 0, y: 0, z: 0}
@@ -105,7 +105,7 @@ MonoBehaviour:
105105
--- !u!114 &114785721768203206
106106
MonoBehaviour:
107107
m_ObjectHideFlags: 1
108-
m_PrefabParentObject: {fileID: 0}
108+
m_CorrespondingSourceObject: {fileID: 0}
109109
m_PrefabInternal: {fileID: 100100000}
110110
m_GameObject: {fileID: 1644659546057122}
111111
m_Enabled: 1

0 commit comments

Comments
 (0)