Skip to content

Commit 9e435c8

Browse files
added set back to DestroyOnSourceLost.
Updated prefabs with controller sync components
1 parent da06315 commit 9e435c8

File tree

5 files changed

+48
-11
lines changed

5 files changed

+48
-11
lines changed

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/DefaultControllerPointer.prefab

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,15 @@ MonoBehaviour:
9696
m_Name:
9797
m_EditorClassIdentifier:
9898
handedness: 1
99-
disableChildren: 1
100-
cursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
101-
type: 2}
102-
raycastOrigin: {fileID: 0}
99+
destroyOnSourceLost: 1
103100
useSourcePoseData: 0
104-
inputSourceAction:
101+
poseAction:
105102
id: 4
106103
description: Pointer Pose
107104
axisConstraint: 7
105+
cursorPrefab: {fileID: 1000012072213228, guid: 5b3e2856904e43c680f84f326861032a,
106+
type: 2}
107+
raycastOrigin: {fileID: 0}
108108
activeHoldAction:
109109
id: 0
110110
description: None

Assets/MixedRealityToolkit-SDK/Features/UX/Prefabs/Pointers/ParabolicPointer.prefab

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,16 +259,15 @@ MonoBehaviour:
259259
m_Name:
260260
m_EditorClassIdentifier:
261261
handedness: 1
262-
disableChildren: 1
263262
destroyOnSourceLost: 1
264-
cursorPrefab: {fileID: 1554777696564956, guid: ae2b3fffb00f464287cda86f49109b47,
265-
type: 2}
266-
raycastOrigin: {fileID: 0}
267263
useSourcePoseData: 0
268-
inputSourceAction:
264+
poseAction:
269265
id: 4
270266
description: Pointer Pose
271267
axisConstraint: 7
268+
cursorPrefab: {fileID: 1554777696564956, guid: ae2b3fffb00f464287cda86f49109b47,
269+
type: 2}
270+
raycastOrigin: {fileID: 0}
272271
activeHoldAction:
273272
id: 0
274273
description: None

Assets/MixedRealityToolkit-SDK/StandardAssets/Controllers/DebugControllers/GizmoLeft.prefab

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ GameObject:
231231
serializedVersion: 5
232232
m_Component:
233233
- component: {fileID: 4607474556101662}
234+
- component: {fileID: 114960050464514552}
234235
m_Layer: 0
235236
m_Name: GizmoLeft
236237
m_TagString: Untagged
@@ -1100,3 +1101,21 @@ MeshFilter:
11001101
m_PrefabInternal: {fileID: 100100000}
11011102
m_GameObject: {fileID: 1069666104943182}
11021103
m_Mesh: {fileID: 4300000, guid: 164467aaab0440cbb011a7c287072878, type: 3}
1104+
--- !u!114 &114960050464514552
1105+
MonoBehaviour:
1106+
m_ObjectHideFlags: 1
1107+
m_PrefabParentObject: {fileID: 0}
1108+
m_PrefabInternal: {fileID: 100100000}
1109+
m_GameObject: {fileID: 1370450866519632}
1110+
m_Enabled: 1
1111+
m_EditorHideFlags: 0
1112+
m_Script: {fileID: 11500000, guid: ef91a627a11b4a22b41dd9109dfd8703, type: 3}
1113+
m_Name:
1114+
m_EditorClassIdentifier:
1115+
handedness: 1
1116+
destroyOnSourceLost: 1
1117+
useSourcePoseData: 0
1118+
poseAction:
1119+
id: 4
1120+
description: Pointer Pose
1121+
axisConstraint: 7

Assets/MixedRealityToolkit-SDK/StandardAssets/Controllers/DebugControllers/GizmoRight.prefab

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ GameObject:
229229
serializedVersion: 5
230230
m_Component:
231231
- component: {fileID: 4733819526180356}
232+
- component: {fileID: 114649675710639032}
232233
m_Layer: 0
233234
m_Name: GizmoRight
234235
m_TagString: Untagged
@@ -636,3 +637,21 @@ MeshFilter:
636637
m_PrefabInternal: {fileID: 100100000}
637638
m_GameObject: {fileID: 1939929388933976}
638639
m_Mesh: {fileID: 4300000, guid: 16afe3fd2a3c4d2c85aeeb732ae7f9fb, type: 3}
640+
--- !u!114 &114649675710639032
641+
MonoBehaviour:
642+
m_ObjectHideFlags: 1
643+
m_PrefabParentObject: {fileID: 0}
644+
m_PrefabInternal: {fileID: 100100000}
645+
m_GameObject: {fileID: 1760394390528354}
646+
m_Enabled: 1
647+
m_EditorHideFlags: 0
648+
m_Script: {fileID: 11500000, guid: ef91a627a11b4a22b41dd9109dfd8703, type: 3}
649+
m_Name:
650+
m_EditorClassIdentifier:
651+
handedness: 2
652+
destroyOnSourceLost: 1
653+
useSourcePoseData: 0
654+
poseAction:
655+
id: 4
656+
description: Pointer Pose
657+
axisConstraint: 7

Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityControllerPoseSynchronizer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface IMixedRealityControllerPoseSynchronizer : IMixedRealitySpatialI
2020
/// <summary>
2121
/// Should this <see cref="UnityEngine.GameObject"/> clean itself up when it's controller is lost?
2222
/// </summary>
23-
bool DestroyOnLost { get; }
23+
bool DestroyOnSourceLost { get; set; }
2424

2525
/// <summary>
2626
/// The current controller reference.

0 commit comments

Comments
 (0)