Skip to content

Commit a5f39d8

Browse files
StephenHodgsonStephenHodgson
committed
finished name changes
1 parent 2a4c61c commit a5f39d8

File tree

71 files changed

+858
-858
lines changed

Some content is hidden

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

71 files changed

+858
-858
lines changed

‎Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioLoFiEffectDemo.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ GameObject:
153153
- component: {fileID: 431339712}
154154
- component: {fileID: 431339711}
155155
m_Layer: 0
156-
m_Name: MixedRealityManager
156+
m_Name: MixedRealityToolkit
157157
m_TagString: Untagged
158158
m_Icon: {fileID: 0}
159159
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/Audio/Scenes/AudioOcclusionDemo.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ GameObject:
542542
- component: {fileID: 979633973}
543543
- component: {fileID: 979633972}
544544
m_Layer: 0
545-
m_Name: MixedRealityManager
545+
m_Name: MixedRealityToolkit
546546
m_TagString: Untagged
547547
m_Icon: {fileID: 0}
548548
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ GameObject:
740740
- component: {fileID: 1485507613}
741741
- component: {fileID: 1485507612}
742742
m_Layer: 0
743-
m_Name: MixedRealityManager
743+
m_Name: MixedRealityToolkit
744744
m_TagString: Untagged
745745
m_Icon: {fileID: 0}
746746
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ private void Awake()
4242
{
4343
markerParent = new GameObject();
4444
markerParent.name = "Boundary Demo Markers";
45-
markerParent.transform.parent = MixedRealityOrchestrator.Instance.MixedRealityPlayspace;
45+
markerParent.transform.parent = MixedRealityToolkit.Instance.MixedRealityPlayspace;
4646
}
4747

4848
private void Start()
4949
{
5050

51-
if (MixedRealityOrchestrator.BoundarySystem != null)
51+
if (MixedRealityToolkit.BoundarySystem != null)
5252
{
5353
if (markers.Count == 0)
5454
{
@@ -59,25 +59,25 @@ private void Start()
5959

6060
private void Update()
6161
{
62-
if (MixedRealityOrchestrator.BoundarySystem != null)
62+
if (MixedRealityToolkit.BoundarySystem != null)
6363
{
64-
MixedRealityOrchestrator.BoundarySystem.ShowFloor = showFloor;
65-
MixedRealityOrchestrator.BoundarySystem.ShowPlayArea = showPlayArea;
66-
MixedRealityOrchestrator.BoundarySystem.ShowTrackedArea = showTrackedArea;
67-
MixedRealityOrchestrator.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
68-
MixedRealityOrchestrator.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
64+
MixedRealityToolkit.BoundarySystem.ShowFloor = showFloor;
65+
MixedRealityToolkit.BoundarySystem.ShowPlayArea = showPlayArea;
66+
MixedRealityToolkit.BoundarySystem.ShowTrackedArea = showTrackedArea;
67+
MixedRealityToolkit.BoundarySystem.ShowBoundaryWalls = showBoundaryWalls;
68+
MixedRealityToolkit.BoundarySystem.ShowBoundaryCeiling = showBoundaryCeiling;
6969
}
7070
}
7171

7272
private async void OnEnable()
7373
{
74-
await new WaitUntil(() => MixedRealityOrchestrator.BoundarySystem != null);
75-
MixedRealityOrchestrator.BoundarySystem.Register(gameObject);
74+
await new WaitUntil(() => MixedRealityToolkit.BoundarySystem != null);
75+
MixedRealityToolkit.BoundarySystem.Register(gameObject);
7676
}
7777

7878
private void OnDisable()
7979
{
80-
MixedRealityOrchestrator.BoundarySystem?.Unregister(gameObject);
80+
MixedRealityToolkit.BoundarySystem?.Unregister(gameObject);
8181
}
8282

8383
#endregion MonoBehaviour Implementation
@@ -104,13 +104,13 @@ private void AddMarkers()
104104
float widthRect;
105105
float heightRect;
106106

107-
if (!MixedRealityOrchestrator.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
107+
if (!MixedRealityToolkit.BoundarySystem.TryGetRectangularBoundsParams(out centerRect, out angleRect, out widthRect, out heightRect))
108108
{
109109
// If we have no boundary manager or rectangular bounds we will show no indicators
110110
return;
111111
}
112112

113-
MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityOrchestrator.Instance.ActiveProfile.BoundaryVisualizationProfile;
113+
MixedRealityBoundaryVisualizationProfile visualizationProfile = MixedRealityToolkit.Instance.ActiveProfile.BoundaryVisualizationProfile;
114114
if (visualizationProfile == null)
115115
{
116116
// We do not have a visualization profile configured, therefore do not render the indicators.
@@ -135,12 +135,12 @@ private void AddMarkers()
135135

136136
Material material = null;
137137
// Check inscribed rectangle first
138-
if (MixedRealityOrchestrator.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
138+
if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.PlayArea))
139139
{
140140
material = visualizationProfile.PlayAreaMaterial;
141141
}
142142
// Then check geometry
143-
else if (MixedRealityOrchestrator.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
143+
else if (MixedRealityToolkit.BoundarySystem.Contains(position, Boundary.Type.TrackedArea))
144144
{
145145
material = visualizationProfile.TrackedAreaMaterial;
146146
}

‎Assets/MixedRealityToolkit-Examples/Demos/Solvers/Scenes/Solvers.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,7 @@ GameObject:
23002300
- component: {fileID: 1540929158}
23012301
- component: {fileID: 1540929157}
23022302
m_Layer: 0
2303-
m_Name: MixedRealityManager
2303+
m_Name: MixedRealityToolkit
23042304
m_TagString: Untagged
23052305
m_Icon: {fileID: 0}
23062306
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/MaterialGallery.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4441,7 +4441,7 @@ GameObject:
44414441
- component: {fileID: 1485507613}
44424442
- component: {fileID: 1485507612}
44434443
m_Layer: 0
4444-
m_Name: MixedRealityManager
4444+
m_Name: MixedRealityToolkit
44454445
m_TagString: Untagged
44464446
m_Icon: {fileID: 0}
44474447
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/StandardMaterialComparison.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13552,7 +13552,7 @@ GameObject:
1355213552
- component: {fileID: 1485507613}
1355313553
- component: {fileID: 1485507612}
1355413554
m_Layer: 0
13555-
m_Name: MixedRealityManager
13555+
m_Name: MixedRealityToolkit
1355613556
m_TagString: Untagged
1355713557
m_Icon: {fileID: 0}
1355813558
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/StandardShader/Scenes/StandardMaterials.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5230,7 +5230,7 @@ GameObject:
52305230
- component: {fileID: 1485507613}
52315231
- component: {fileID: 1485507612}
52325232
m_Layer: 0
5233-
m_Name: MixedRealityManager
5233+
m_Name: MixedRealityToolkit
52345234
m_TagString: Untagged
52355235
m_Icon: {fileID: 0}
52365236
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/UX/Collections/Scenes/ObjectCollectionGallery.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ GameObject:
30393039
- component: {fileID: 785226068}
30403040
- component: {fileID: 785226067}
30413041
m_Layer: 0
3042-
m_Name: MixedRealityManager
3042+
m_Name: MixedRealityToolkit
30433043
m_TagString: Untagged
30443044
m_Icon: {fileID: 0}
30453045
m_NavMeshLayer: 0

‎Assets/MixedRealityToolkit-Examples/Demos/UX/Lines/Scenes/LineGallery.unity‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ GameObject:
887887
- component: {fileID: 785226068}
888888
- component: {fileID: 785226067}
889889
m_Layer: 0
890-
m_Name: MixedRealityManager
890+
m_Name: MixedRealityToolkit
891891
m_TagString: Untagged
892892
m_Icon: {fileID: 0}
893893
m_NavMeshLayer: 0
@@ -1383,7 +1383,7 @@ RectTransform:
13831383
m_AnchorMin: {x: 0, y: 0}
13841384
m_AnchorMax: {x: 0, y: 0}
13851385
m_AnchoredPosition: {x: 0, y: 0}
1386-
m_SizeDelta: {x: 0, y: 64}
1386+
m_SizeDelta: {x: 0, y: 50}
13871387
m_Pivot: {x: 0.5, y: 1}
13881388
--- !u!114 &1264058820
13891389
MonoBehaviour:
@@ -1433,8 +1433,8 @@ MonoBehaviour:
14331433
m_outlineColor:
14341434
serializedVersion: 2
14351435
rgba: 4278190080
1436-
m_fontSize: 24
1437-
m_fontSizeBase: 24
1436+
m_fontSize: 36
1437+
m_fontSizeBase: 36
14381438
m_fontWeight: 400
14391439
m_enableAutoSizing: 0
14401440
m_fontSizeMin: 18
@@ -1451,7 +1451,7 @@ MonoBehaviour:
14511451
m_enableWordWrapping: 1
14521452
m_wordWrappingRatios: 0.4
14531453
m_overflowMode: 0
1454-
m_firstOverflowCharacterIndex: -1
1454+
m_firstOverflowCharacterIndex: 9
14551455
m_linkedTextComponent: {fileID: 0}
14561456
m_isLinkedTextComponent: 0
14571457
m_isTextTruncated: 0
@@ -1760,7 +1760,7 @@ MonoBehaviour:
17601760
\u2013 creates insances of a mesh, then places them along the length of the line</indent>\n\u2022<indent=3%>StripMeshLineRenderer
17611761
\u2013 draws a strip of polygons along the length of the line</indent>"
17621762
m_isRightToLeft: 0
1763-
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
1763+
m_fontAsset: {fileID: 0}
17641764
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
17651765
m_fontSharedMaterials: []
17661766
m_fontMaterial: {fileID: 0}

0 commit comments

Comments
 (0)