Skip to content

Commit 65b7a91

Browse files
author
David Kline
authored
Merge pull request #3515 from keveleigh/fix-example-scene
Fix example scenes setup around FocusProvider
2 parents 1144641 + 7779984 commit 65b7a91

File tree

3 files changed

+497
-538
lines changed

3 files changed

+497
-538
lines changed

Assets/MixedRealityToolkit.Examples/Demos/UX/BoundingBox/BoundingBoxExample.unity

Lines changed: 4 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ GameObject:
285285
- component: {fileID: 624307634}
286286
- component: {fileID: 624307633}
287287
- component: {fileID: 624307632}
288-
- component: {fileID: 624307637}
289288
- component: {fileID: 624307636}
290289
- component: {fileID: 624307639}
291290
- component: {fileID: 624307638}
@@ -391,25 +390,6 @@ MonoBehaviour:
391390
gazeTransform: {fileID: 0}
392391
minHeadVelocityThreshold: 0.5
393392
maxHeadVelocityThreshold: 2
394-
--- !u!114 &624307637
395-
MonoBehaviour:
396-
m_ObjectHideFlags: 0
397-
m_CorrespondingSourceObject: {fileID: 0}
398-
m_PrefabInstance: {fileID: 0}
399-
m_PrefabAsset: {fileID: 0}
400-
m_GameObject: {fileID: 624307631}
401-
m_Enabled: 1
402-
m_EditorHideFlags: 0
403-
m_Script: {fileID: 11500000, guid: 6d8ddcf767354d5f90704bb40ddec60a, type: 3}
404-
m_Name:
405-
m_EditorClassIdentifier:
406-
pointingExtent: 10
407-
uiRaycastCamera: {fileID: 2087691058}
408-
pointingRaycastLayerMasks:
409-
- serializedVersion: 2
410-
m_Bits: 4294967291
411-
debugDrawPointingRays: 0
412-
debugDrawPointingRayColors: []
413393
--- !u!114 &624307638
414394
MonoBehaviour:
415395
m_ObjectHideFlags: 0
@@ -631,6 +611,7 @@ MonoBehaviour:
631611
m_Script: {fileID: 11500000, guid: 23f9be7a3cb53794ead8b55e784b65aa, type: 3}
632612
m_Name:
633613
m_EditorClassIdentifier:
614+
focusEnabled: 1
634615
boxColliderToUse: {fileID: 694962454}
635616
activateOnStart: 1
636617
scaleMaximum: 2
@@ -1308,6 +1289,7 @@ MonoBehaviour:
13081289
m_Script: {fileID: 11500000, guid: 23f9be7a3cb53794ead8b55e784b65aa, type: 3}
13091290
m_Name:
13101291
m_EditorClassIdentifier:
1292+
focusEnabled: 1
13111293
boxColliderToUse: {fileID: 1561062655}
13121294
activateOnStart: 1
13131295
scaleMaximum: 2
@@ -1620,6 +1602,7 @@ MonoBehaviour:
16201602
m_Script: {fileID: 11500000, guid: 23f9be7a3cb53794ead8b55e784b65aa, type: 3}
16211603
m_Name:
16221604
m_EditorClassIdentifier:
1605+
focusEnabled: 1
16231606
boxColliderToUse: {fileID: 1669979020}
16241607
activateOnStart: 1
16251608
scaleMaximum: 2
@@ -1794,6 +1777,7 @@ MonoBehaviour:
17941777
m_Script: {fileID: 11500000, guid: 23f9be7a3cb53794ead8b55e784b65aa, type: 3}
17951778
m_Name:
17961779
m_EditorClassIdentifier:
1780+
focusEnabled: 1
17971781
boxColliderToUse: {fileID: 2036781104}
17981782
activateOnStart: 1
17991783
scaleMaximum: 2
@@ -1827,8 +1811,6 @@ GameObject:
18271811
m_Component:
18281812
- component: {fileID: 2087691055}
18291813
- component: {fileID: 2087691058}
1830-
- component: {fileID: 2087691057}
1831-
- component: {fileID: 2087691056}
18321814
m_Layer: 0
18331815
m_Name: UIRaycastCamera
18341816
m_TagString: Untagged
@@ -1850,40 +1832,6 @@ Transform:
18501832
m_Father: {fileID: 624307635}
18511833
m_RootOrder: 0
18521834
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1853-
--- !u!114 &2087691056
1854-
MonoBehaviour:
1855-
m_ObjectHideFlags: 0
1856-
m_CorrespondingSourceObject: {fileID: 0}
1857-
m_PrefabInstance: {fileID: 0}
1858-
m_PrefabAsset: {fileID: 0}
1859-
m_GameObject: {fileID: 2087691054}
1860-
m_Enabled: 1
1861-
m_EditorHideFlags: 0
1862-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1863-
m_Name:
1864-
m_EditorClassIdentifier:
1865-
m_HorizontalAxis: Horizontal
1866-
m_VerticalAxis: Vertical
1867-
m_SubmitButton: Submit
1868-
m_CancelButton: Cancel
1869-
m_InputActionsPerSecond: 10
1870-
m_RepeatDelay: 0.5
1871-
m_ForceModuleActive: 0
1872-
--- !u!114 &2087691057
1873-
MonoBehaviour:
1874-
m_ObjectHideFlags: 0
1875-
m_CorrespondingSourceObject: {fileID: 0}
1876-
m_PrefabInstance: {fileID: 0}
1877-
m_PrefabAsset: {fileID: 0}
1878-
m_GameObject: {fileID: 2087691054}
1879-
m_Enabled: 1
1880-
m_EditorHideFlags: 0
1881-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1882-
m_Name:
1883-
m_EditorClassIdentifier:
1884-
m_FirstSelected: {fileID: 0}
1885-
m_sendNavigationEvents: 1
1886-
m_DragThreshold: 10
18871835
--- !u!20 &2087691058
18881836
Camera:
18891837
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)