Skip to content

Commit 7f26a4a

Browse files
thalbernthalbern
authored
Merge pull request #3765 from thalbern/feature/handmeshvis
Added possibility to disable hand mesh and joint visualization
2 parents 94a893b + eabe781 commit 7f26a4a

22 files changed

+14342
-13522
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Prefabs/Slate.prefab‎

Lines changed: 106 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ MonoBehaviour:
103103
m_StringArgument:
104104
m_BoolArgument: 0
105105
m_CallState: 2
106-
m_TypeName: Microsoft.MixedReality.Toolkit.SDK.Input.Events.ManipulationEvent,
107-
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
106+
m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
107+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
108108
OnManipulationEnded:
109109
m_PersistentCalls:
110110
m_Calls:
@@ -120,18 +120,18 @@ MonoBehaviour:
120120
m_StringArgument:
121121
m_BoolArgument: 0
122122
m_CallState: 2
123-
m_TypeName: Microsoft.MixedReality.Toolkit.SDK.Input.Events.ManipulationEvent,
124-
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
123+
m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
124+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
125125
OnHoverEntered:
126126
m_PersistentCalls:
127127
m_Calls: []
128-
m_TypeName: Microsoft.MixedReality.Toolkit.SDK.Input.Events.ManipulationEvent,
129-
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
128+
m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
129+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
130130
OnHoverExited:
131131
m_PersistentCalls:
132132
m_Calls: []
133-
m_TypeName: Microsoft.MixedReality.Toolkit.SDK.Input.Events.ManipulationEvent,
134-
Microsoft.MixedReality.Toolkit.SDK, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
133+
m_TypeName: Microsoft.MixedReality.Toolkit.UI.ManipulationEvent, Microsoft.MixedReality.Toolkit.SDK,
134+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
135135
--- !u!114 &7779420037177669567
136136
MonoBehaviour:
137137
m_ObjectHideFlags: 0
@@ -466,7 +466,7 @@ MonoBehaviour:
466466
eventsToReceive: 0
467467
touchableSurface: 0
468468
bounds: {x: 1, y: 0.99999946}
469-
collider: {fileID: 7779420038095343090}
469+
touchableCollider: {fileID: 7779420038095343090}
470470
--- !u!1 &7779420038487776842
471471
GameObject:
472472
m_ObjectHideFlags: 0
@@ -850,7 +850,7 @@ MonoBehaviour:
850850
focusEnabled: 1
851851
targetObject: {fileID: 7779420039263858270}
852852
boundsOverride: {fileID: 7779420039263858272}
853-
activation: 0
853+
activation: 3
854854
scaleMaximum: 5
855855
scaleMinimum: 0.3
856856
flattenAxis: 4
@@ -880,7 +880,7 @@ MonoBehaviour:
880880
RotateStarted:
881881
m_PersistentCalls:
882882
m_Calls:
883-
- m_Target: {fileID: 0}
883+
- m_Target: {fileID: 7779420037177669561}
884884
m_MethodName: PlayOneShot
885885
m_Mode: 2
886886
m_Arguments:
@@ -897,7 +897,7 @@ MonoBehaviour:
897897
RotateStopped:
898898
m_PersistentCalls:
899899
m_Calls:
900-
- m_Target: {fileID: 0}
900+
- m_Target: {fileID: 7779420037177669561}
901901
m_MethodName: PlayOneShot
902902
m_Mode: 2
903903
m_Arguments:
@@ -914,7 +914,7 @@ MonoBehaviour:
914914
ScaleStarted:
915915
m_PersistentCalls:
916916
m_Calls:
917-
- m_Target: {fileID: 0}
917+
- m_Target: {fileID: 7779420037177669561}
918918
m_MethodName: PlayOneShot
919919
m_Mode: 2
920920
m_Arguments:
@@ -931,7 +931,7 @@ MonoBehaviour:
931931
ScaleStopped:
932932
m_PersistentCalls:
933933
m_Calls:
934-
- m_Target: {fileID: 0}
934+
- m_Target: {fileID: 7779420037177669561}
935935
m_MethodName: PlayOneShot
936936
m_Mode: 2
937937
m_Arguments:
@@ -956,17 +956,25 @@ PrefabInstance:
956956
propertyPath: m_Name
957957
value: Pressable Button (2)
958958
objectReference: {fileID: 0}
959-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
960-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
961-
value:
959+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
960+
propertyPath: m_havePropertiesChanged
961+
value: 0
962962
objectReference: {fileID: 0}
963-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
964-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
965-
value:
963+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
964+
propertyPath: m_isInputParsingRequired
965+
value: 0
966966
objectReference: {fileID: 0}
967-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
968-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
969-
value: 1
967+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
968+
propertyPath: m_text
969+
value: Close
970+
objectReference: {fileID: 0}
971+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
972+
propertyPath: m_textInfo.characterCount
973+
value: 5
974+
objectReference: {fileID: 0}
975+
- target: {fileID: 937783104, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
976+
propertyPath: m_Mesh
977+
value:
970978
objectReference: {fileID: 0}
971979
- target: {fileID: 1944713263, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
972980
propertyPath: m_LocalPosition.x
@@ -1017,36 +1025,6 @@ PrefabInstance:
10171025
propertyPath: m_Mesh
10181026
value:
10191027
objectReference: {fileID: 0}
1020-
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1021-
type: 3}
1022-
propertyPath: m_havePropertiesChanged
1023-
value: 0
1024-
objectReference: {fileID: 0}
1025-
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1026-
type: 3}
1027-
propertyPath: m_isInputParsingRequired
1028-
value: 0
1029-
objectReference: {fileID: 0}
1030-
- target: {fileID: 937783104, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1031-
propertyPath: m_Mesh
1032-
value:
1033-
objectReference: {fileID: 0}
1034-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1035-
propertyPath: m_havePropertiesChanged
1036-
value: 0
1037-
objectReference: {fileID: 0}
1038-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1039-
propertyPath: m_isInputParsingRequired
1040-
value: 0
1041-
objectReference: {fileID: 0}
1042-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1043-
propertyPath: m_text
1044-
value: Close
1045-
objectReference: {fileID: 0}
1046-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1047-
propertyPath: m_textInfo.characterCount
1048-
value: 5
1049-
objectReference: {fileID: 0}
10501028
- target: {fileID: 7440800412470431853, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
10511029
type: 3}
10521030
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -1062,6 +1040,28 @@ PrefabInstance:
10621040
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
10631041
value: 6
10641042
objectReference: {fileID: 0}
1043+
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1044+
type: 3}
1045+
propertyPath: m_havePropertiesChanged
1046+
value: 0
1047+
objectReference: {fileID: 0}
1048+
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1049+
type: 3}
1050+
propertyPath: m_isInputParsingRequired
1051+
value: 0
1052+
objectReference: {fileID: 0}
1053+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1054+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
1055+
value:
1056+
objectReference: {fileID: 0}
1057+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1058+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1059+
value:
1060+
objectReference: {fileID: 0}
1061+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1062+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
1063+
value: 1
1064+
objectReference: {fileID: 0}
10651065
- target: {fileID: 2034987663884019302, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
10661066
type: 3}
10671067
propertyPath: localCenter.z
@@ -1096,18 +1096,46 @@ PrefabInstance:
10961096
propertyPath: m_Name
10971097
value: Pressable Button (1)
10981098
objectReference: {fileID: 0}
1099-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1100-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
1101-
value:
1102-
objectReference: {fileID: 7779420039263858268}
1103-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1104-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1105-
value: ToggleInteractiveCarry
1099+
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1100+
propertyPath: minPressDepth
1101+
value: 0
11061102
objectReference: {fileID: 0}
1107-
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1108-
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
1103+
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1104+
propertyPath: withdrawActivationAmount
1105+
value: 0.0001
1106+
objectReference: {fileID: 0}
1107+
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1108+
propertyPath: buttonSizeRelativeToCollider
1109+
value: 0.5
1110+
objectReference: {fileID: 0}
1111+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1112+
propertyPath: m_havePropertiesChanged
1113+
value: 0
1114+
objectReference: {fileID: 0}
1115+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1116+
propertyPath: m_isInputParsingRequired
1117+
value: 0
1118+
objectReference: {fileID: 0}
1119+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1120+
propertyPath: m_text
1121+
value: Follow Me
1122+
objectReference: {fileID: 0}
1123+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1124+
propertyPath: m_textInfo.characterCount
1125+
value: 9
1126+
objectReference: {fileID: 0}
1127+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1128+
propertyPath: m_textInfo.spaceCount
11091129
value: 1
11101130
objectReference: {fileID: 0}
1131+
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1132+
propertyPath: m_textInfo.wordCount
1133+
value: 2
1134+
objectReference: {fileID: 0}
1135+
- target: {fileID: 937783104, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1136+
propertyPath: m_Mesh
1137+
value:
1138+
objectReference: {fileID: 0}
11111139
- target: {fileID: 1944713263, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
11121140
propertyPath: m_LocalPosition.x
11131141
value: 0
@@ -1157,65 +1185,37 @@ PrefabInstance:
11571185
propertyPath: m_Mesh
11581186
value:
11591187
objectReference: {fileID: 0}
1160-
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1188+
- target: {fileID: 7440800412470431853, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
11611189
type: 3}
1162-
propertyPath: m_havePropertiesChanged
1163-
value: 0
1190+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
1191+
value:
1192+
objectReference: {fileID: 7779420039263858268}
1193+
- target: {fileID: 7440800412470431853, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1194+
type: 3}
1195+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1196+
value: ToggleFollowMeBehavior
11641197
objectReference: {fileID: 0}
11651198
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
11661199
type: 3}
1167-
propertyPath: m_isInputParsingRequired
1168-
value: 0
1169-
objectReference: {fileID: 0}
1170-
- target: {fileID: 937783104, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1171-
propertyPath: m_Mesh
1172-
value:
1173-
objectReference: {fileID: 0}
1174-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
11751200
propertyPath: m_havePropertiesChanged
11761201
value: 0
11771202
objectReference: {fileID: 0}
1178-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1203+
- target: {fileID: 9181818329810857364, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1204+
type: 3}
11791205
propertyPath: m_isInputParsingRequired
11801206
value: 0
11811207
objectReference: {fileID: 0}
1182-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1183-
propertyPath: m_text
1184-
value: Follow Me
1185-
objectReference: {fileID: 0}
1186-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1187-
propertyPath: m_textInfo.characterCount
1188-
value: 9
1189-
objectReference: {fileID: 0}
1190-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1191-
propertyPath: m_textInfo.spaceCount
1192-
value: 1
1193-
objectReference: {fileID: 0}
1194-
- target: {fileID: 937783102, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1195-
propertyPath: m_textInfo.wordCount
1196-
value: 2
1197-
objectReference: {fileID: 0}
1198-
- target: {fileID: 7440800412470431853, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1199-
type: 3}
1208+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
12001209
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
12011210
value:
12021211
objectReference: {fileID: 7779420039263858268}
1203-
- target: {fileID: 7440800412470431853, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
1204-
type: 3}
1212+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
12051213
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1206-
value: ToggleFollowMeBehavior
1207-
objectReference: {fileID: 0}
1208-
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1209-
propertyPath: minPressDepth
1210-
value: 0
1211-
objectReference: {fileID: 0}
1212-
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1213-
propertyPath: withdrawActivationAmount
1214-
value: 0.0001
1214+
value: ToggleInteractiveCarry
12151215
objectReference: {fileID: 0}
1216-
- target: {fileID: 316800721, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1217-
propertyPath: buttonSizeRelativeToCollider
1218-
value: 0.5
1216+
- target: {fileID: 247466359, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9, type: 3}
1217+
propertyPath: OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
1218+
value: 1
12191219
objectReference: {fileID: 0}
12201220
- target: {fileID: 2034987663884019302, guid: 45fd0ad89d6d17b4fbe68eb48dbe9de9,
12211221
type: 3}

0 commit comments

Comments
 (0)