Skip to content

Commit b77876a

Browse files
keveleighkeveleigh
authored
Fix serialization for controller/hand visualization (#10596)
1 parent 44805e6 commit b77876a

File tree

3 files changed

+25
-149
lines changed

3 files changed

+25
-149
lines changed

‎Assets/MRTK/SDK/Profiles/DefaultMixedRealityControllerVisualizationProfile.asset

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -95,28 +95,6 @@ MonoBehaviour:
9595
type: 3}
9696
controllerVisualizationType:
9797
reference: Microsoft.MixedReality.Toolkit.Input.BaseHandVisualizer, Microsoft.MixedReality.Toolkit
98-
- description: Microsoft Articulated Hand
99-
controllerType:
100-
reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.MicrosoftArticulatedHand,
101-
Microsoft.MixedReality.Toolkit.Providers.OpenXR
102-
handedness: 1
103-
usePlatformModels: 0
104-
platformModelMaterial: {fileID: 0}
105-
overrideModel: {fileID: 1227372834072826, guid: 378f91dbbff9e2343b27a467467750bf,
106-
type: 3}
107-
controllerVisualizationType:
108-
reference: Microsoft.MixedReality.Toolkit.Input.BaseHandVisualizer, Microsoft.MixedReality.Toolkit
109-
- description: Microsoft Articulated Hand
110-
controllerType:
111-
reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.MicrosoftArticulatedHand,
112-
Microsoft.MixedReality.Toolkit.Providers.OpenXR
113-
handedness: 2
114-
usePlatformModels: 0
115-
platformModelMaterial: {fileID: 0}
116-
overrideModel: {fileID: 3512491064599439886, guid: 7a857af0cb85b4a47b6ec8a1babcb73c,
117-
type: 3}
118-
controllerVisualizationType:
119-
reference: Microsoft.MixedReality.Toolkit.Input.RiggedHandVisualizer, Microsoft.MixedReality.Toolkit.SDK
12098
- description: Microsoft Motion Controller
12199
controllerType:
122100
reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.MicrosoftMotionController,
@@ -139,26 +117,6 @@ MonoBehaviour:
139117
controllerVisualizationType:
140118
reference: Microsoft.MixedReality.Toolkit.Input.WindowsMixedRealityControllerVisualizer,
141119
Microsoft.MixedReality.Toolkit.SDK
142-
- description: Simulated Articulated Hand
143-
controllerType:
144-
reference: Microsoft.MixedReality.Toolkit.Input.SimulatedArticulatedHand, Microsoft.MixedReality.Toolkit.Services.InputSimulation
145-
handedness: 1
146-
usePlatformModels: 0
147-
platformModelMaterial: {fileID: 0}
148-
overrideModel: {fileID: 61451597023024772, guid: 6080fb9e3b49fda449e3d70daf6d2254,
149-
type: 3}
150-
controllerVisualizationType:
151-
reference: Microsoft.MixedReality.Toolkit.Input.RiggedHandVisualizer, Microsoft.MixedReality.Toolkit.SDK
152-
- description: Simulated Articulated Hand
153-
controllerType:
154-
reference: Microsoft.MixedReality.Toolkit.Input.SimulatedArticulatedHand, Microsoft.MixedReality.Toolkit.Services.InputSimulation
155-
handedness: 2
156-
usePlatformModels: 0
157-
platformModelMaterial: {fileID: 0}
158-
overrideModel: {fileID: 3512491064599439886, guid: 7a857af0cb85b4a47b6ec8a1babcb73c,
159-
type: 3}
160-
controllerVisualizationType:
161-
reference: Microsoft.MixedReality.Toolkit.Input.RiggedHandVisualizer, Microsoft.MixedReality.Toolkit.SDK
162120
- description: Oculus Controller
163121
controllerType:
164122
reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OculusController, Microsoft.MixedReality.Toolkit.Providers.OpenXR

‎Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerLeft.prefab

Lines changed: 14 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Transform:
2828
m_LocalPosition: {x: 0, y: 0, z: 0}
2929
m_LocalScale: {x: 1, y: 1, z: 1}
3030
m_Children:
31-
- {fileID: 8677239461615929730}
31+
- {fileID: 8327434452487327885}
3232
m_Father: {fileID: 0}
3333
m_RootOrder: 0
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -53,79 +53,38 @@ MonoBehaviour:
5353
axisConstraint: 0
5454
handedness: 1
5555
rotationOffset: {x: 0.21643962, y: 0, z: 0, w: 0.976296}
56-
--- !u!1001 &4321943930670626980
56+
--- !u!1001 &8327434452487457293
5757
PrefabInstance:
5858
m_ObjectHideFlags: 0
5959
serializedVersion: 2
6060
m_Modification:
6161
m_TransformParent: {fileID: 4607474556101662}
6262
m_Modifications:
63-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
64-
type: 3}
65-
propertyPath: m_RootOrder
66-
value: 0
67-
objectReference: {fileID: 0}
68-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
69-
type: 3}
70-
propertyPath: m_LocalPosition.x
71-
value: 0
72-
objectReference: {fileID: 0}
73-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
74-
type: 3}
75-
propertyPath: m_LocalPosition.y
76-
value: 0
77-
objectReference: {fileID: 0}
78-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
79-
type: 3}
80-
propertyPath: m_LocalPosition.z
81-
value: 0
82-
objectReference: {fileID: 0}
83-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
84-
type: 3}
85-
propertyPath: m_LocalRotation.w
86-
value: 1
87-
objectReference: {fileID: 0}
88-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
89-
type: 3}
90-
propertyPath: m_LocalRotation.x
91-
value: 0
92-
objectReference: {fileID: 0}
93-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
94-
type: 3}
95-
propertyPath: m_LocalRotation.y
96-
value: 0
63+
- target: {fileID: 100000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
64+
propertyPath: m_Name
65+
value: left
9766
objectReference: {fileID: 0}
98-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
99-
type: 3}
100-
propertyPath: m_LocalRotation.z
67+
- target: {fileID: 400000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
68+
propertyPath: m_RootOrder
10169
value: 0
10270
objectReference: {fileID: 0}
103-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
104-
type: 3}
71+
- target: {fileID: 400000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
10572
propertyPath: m_LocalEulerAnglesHint.x
10673
value: 0
10774
objectReference: {fileID: 0}
108-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
109-
type: 3}
75+
- target: {fileID: 400000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
11076
propertyPath: m_LocalEulerAnglesHint.y
11177
value: 0
11278
objectReference: {fileID: 0}
113-
- target: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
114-
type: 3}
79+
- target: {fileID: 400000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
11580
propertyPath: m_LocalEulerAnglesHint.z
11681
value: 0
11782
objectReference: {fileID: 0}
118-
- target: {fileID: -3008979517380814025, guid: 74edea6182fcf8f429df8bf342095dbb,
119-
type: 3}
120-
propertyPath: m_Name
121-
value: left
122-
objectReference: {fileID: 0}
12383
m_RemovedComponents: []
124-
m_SourcePrefab: {fileID: 9199261849990390558, guid: 74edea6182fcf8f429df8bf342095dbb,
125-
type: 3}
126-
--- !u!4 &8677239461615929730 stripped
84+
m_SourcePrefab: {fileID: 100100000, guid: 74edea6182fcf8f429df8bf342095dbb, type: 3}
85+
--- !u!4 &8327434452487327885 stripped
12786
Transform:
128-
m_CorrespondingSourceObject: {fileID: -4354666053824302810, guid: 74edea6182fcf8f429df8bf342095dbb,
87+
m_CorrespondingSourceObject: {fileID: 400000, guid: 74edea6182fcf8f429df8bf342095dbb,
12988
type: 3}
130-
m_PrefabInstance: {fileID: 4321943930670626980}
89+
m_PrefabInstance: {fileID: 8327434452487457293}
13190
m_PrefabAsset: {fileID: 0}

‎Assets/MRTK/SDK/StandardAssets/Controllers/DebugControllers/OculusControllerRight.prefab

Lines changed: 11 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Transform:
2828
m_LocalPosition: {x: 0, y: 0, z: 0}
2929
m_LocalScale: {x: 1, y: 1, z: 1}
3030
m_Children:
31-
- {fileID: 8952120192683175814}
31+
- {fileID: 3359575145963795400}
3232
m_Father: {fileID: 0}
3333
m_RootOrder: 0
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -53,79 +53,38 @@ MonoBehaviour:
5353
axisConstraint: 0
5454
handedness: 2
5555
rotationOffset: {x: 0.21643962, y: 0, z: 0, w: 0.976296}
56-
--- !u!1001 &5293317499496723624
56+
--- !u!1001 &3359575145963399496
5757
PrefabInstance:
5858
m_ObjectHideFlags: 0
5959
serializedVersion: 2
6060
m_Modification:
6161
m_TransformParent: {fileID: 4607474556101662}
6262
m_Modifications:
63-
- target: {fileID: -8069255803578068749, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
64-
type: 3}
63+
- target: {fileID: 100000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
6564
propertyPath: m_Name
6665
value: right
6766
objectReference: {fileID: 0}
68-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
69-
type: 3}
67+
- target: {fileID: 400000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
7068
propertyPath: m_RootOrder
7169
value: 0
7270
objectReference: {fileID: 0}
73-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
74-
type: 3}
75-
propertyPath: m_LocalPosition.x
76-
value: 0
77-
objectReference: {fileID: 0}
78-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
79-
type: 3}
80-
propertyPath: m_LocalPosition.y
81-
value: 0
82-
objectReference: {fileID: 0}
83-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
84-
type: 3}
85-
propertyPath: m_LocalPosition.z
86-
value: 0
87-
objectReference: {fileID: 0}
88-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
89-
type: 3}
90-
propertyPath: m_LocalRotation.w
91-
value: 1
92-
objectReference: {fileID: 0}
93-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
94-
type: 3}
95-
propertyPath: m_LocalRotation.x
96-
value: 0
97-
objectReference: {fileID: 0}
98-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
99-
type: 3}
100-
propertyPath: m_LocalRotation.y
101-
value: 0
102-
objectReference: {fileID: 0}
103-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
104-
type: 3}
105-
propertyPath: m_LocalRotation.z
106-
value: 0
107-
objectReference: {fileID: 0}
108-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
109-
type: 3}
71+
- target: {fileID: 400000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
11072
propertyPath: m_LocalEulerAnglesHint.x
11173
value: 0
11274
objectReference: {fileID: 0}
113-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
114-
type: 3}
75+
- target: {fileID: 400000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
11576
propertyPath: m_LocalEulerAnglesHint.y
11677
value: 0
11778
objectReference: {fileID: 0}
118-
- target: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
119-
type: 3}
79+
- target: {fileID: 400000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
12080
propertyPath: m_LocalEulerAnglesHint.z
12181
value: 0
12282
objectReference: {fileID: 0}
12383
m_RemovedComponents: []
124-
m_SourcePrefab: {fileID: 9199261849990390558, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
125-
type: 3}
126-
--- !u!4 &8952120192683175814 stripped
84+
m_SourcePrefab: {fileID: 100100000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4, type: 3}
85+
--- !u!4 &3359575145963795400 stripped
12786
Transform:
128-
m_CorrespondingSourceObject: {fileID: 3839870478250875694, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
87+
m_CorrespondingSourceObject: {fileID: 400000, guid: cc5d8ddb263e1fb4fa64b4865e68d9e4,
12988
type: 3}
130-
m_PrefabInstance: {fileID: 5293317499496723624}
89+
m_PrefabInstance: {fileID: 3359575145963399496}
13190
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)