Skip to content

Commit d051c10

Browse files
author
Julia Schwarz
committed
Code review comments and hand two hands, enable disable
- Fix up prefab names - Don't use DefaultMaterial in slider tickmarks - Clean up slider start/end - Rename some fields to make them more clear - Check if activePointer != null before updating state to handle two pointers, and drop the slider if the object is diables.
1 parent 856fb47 commit d051c10

File tree

5 files changed

+126
-63
lines changed

5 files changed

+126
-63
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Slider/Scenes/SliderExample.unity‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ GameObject:
590590
m_Component:
591591
- component: {fileID: 1183343996}
592592
m_Layer: 0
593-
m_Name: Pinch_Slider_1
593+
m_Name: PinchSliderExample
594594
m_TagString: Untagged
595595
m_Icon: {fileID: 0}
596596
m_NavMeshLayer: 0
@@ -904,6 +904,12 @@ MonoBehaviour:
904904
m_FirstSelected: {fileID: 0}
905905
m_sendNavigationEvents: 1
906906
m_DragThreshold: 10
907+
--- !u!95 &7307063430522344681 stripped
908+
Animator:
909+
m_CorrespondingSourceObject: {fileID: 7307063430522344681, guid: 1093263a89abe47499cccf7dcb08effb,
910+
type: 3}
911+
m_PrefabInstance: {fileID: 7307063430579689017}
912+
m_PrefabAsset: {fileID: 0}
907913
--- !u!1001 &7307063430579689017
908914
PrefabInstance:
909915
m_ObjectHideFlags: 0
@@ -914,7 +920,7 @@ PrefabInstance:
914920
- target: {fileID: 7307063430618434862, guid: 1093263a89abe47499cccf7dcb08effb,
915921
type: 3}
916922
propertyPath: m_Name
917-
value: Pinch_Slider
923+
value: PinchSlider
918924
objectReference: {fileID: 0}
919925
- target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb,
920926
type: 3}
@@ -996,6 +1002,11 @@ PrefabInstance:
9961002
propertyPath: OnValueUpdated.m_PersistentCalls.m_Calls.Array.size
9971003
value: 1
9981004
objectReference: {fileID: 0}
1005+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1006+
type: 3}
1007+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.size
1008+
value: 0
1009+
objectReference: {fileID: 0}
9991010
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
10001011
type: 3}
10011012
propertyPath: OnStartRunning.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
@@ -1046,5 +1057,51 @@ PrefabInstance:
10461057
propertyPath: OnValueUpdated.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
10471058
value: UnityEngine.Object, UnityEngine
10481059
objectReference: {fileID: 0}
1060+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1061+
type: 3}
1062+
propertyPath: thumbRoot
1063+
value:
1064+
objectReference: {fileID: 7307063430758334042}
1065+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1066+
type: 3}
1067+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
1068+
value: 5
1069+
objectReference: {fileID: 0}
1070+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1071+
type: 3}
1072+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
1073+
value: 2
1074+
objectReference: {fileID: 0}
1075+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1076+
type: 3}
1077+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Target
1078+
value:
1079+
objectReference: {fileID: 7307063430522344681}
1080+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1081+
type: 3}
1082+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
1083+
value: SetTrigger
1084+
objectReference: {fileID: 0}
1085+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1086+
type: 3}
1087+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
1088+
value: UnityEngine.Object, UnityEngine
1089+
objectReference: {fileID: 0}
1090+
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
1091+
type: 3}
1092+
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
1093+
value: Hover
1094+
objectReference: {fileID: 0}
1095+
- target: {fileID: 7307063430758334042, guid: 1093263a89abe47499cccf7dcb08effb,
1096+
type: 3}
1097+
propertyPath: m_Name
1098+
value: SliderThumb
1099+
objectReference: {fileID: 0}
10491100
m_RemovedComponents: []
10501101
m_SourcePrefab: {fileID: 100100000, guid: 1093263a89abe47499cccf7dcb08effb, type: 3}
1102+
--- !u!1 &7307063430758334042 stripped
1103+
GameObject:
1104+
m_CorrespondingSourceObject: {fileID: 7307063430758334042, guid: 1093263a89abe47499cccf7dcb08effb,
1105+
type: 3}
1106+
m_PrefabInstance: {fileID: 7307063430579689017}
1107+
m_PrefabAsset: {fileID: 0}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Prefabs/Sliders/PinchSlider.prefab‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ MeshRenderer:
5757
m_RenderingLayerMask: 1
5858
m_RendererPriority: 0
5959
m_Materials:
60-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
60+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
6161
m_StaticBatchInfo:
6262
firstSubMesh: 0
6363
subMeshCount: 0
@@ -134,7 +134,7 @@ MeshRenderer:
134134
m_RenderingLayerMask: 1
135135
m_RendererPriority: 0
136136
m_Materials:
137-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
137+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
138138
m_StaticBatchInfo:
139139
firstSubMesh: 0
140140
subMeshCount: 0
@@ -211,7 +211,7 @@ MeshRenderer:
211211
m_RenderingLayerMask: 1
212212
m_RendererPriority: 0
213213
m_Materials:
214-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
214+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
215215
m_StaticBatchInfo:
216216
firstSubMesh: 0
217217
subMeshCount: 0
@@ -288,7 +288,7 @@ MeshRenderer:
288288
m_RenderingLayerMask: 1
289289
m_RendererPriority: 0
290290
m_Materials:
291-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
291+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
292292
m_StaticBatchInfo:
293293
firstSubMesh: 0
294294
subMeshCount: 0
@@ -365,7 +365,7 @@ MeshRenderer:
365365
m_RenderingLayerMask: 1
366366
m_RendererPriority: 0
367367
m_Materials:
368-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
368+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
369369
m_StaticBatchInfo:
370370
firstSubMesh: 0
371371
subMeshCount: 0
@@ -397,7 +397,7 @@ GameObject:
397397
- component: {fileID: 7307063430008138793}
398398
- component: {fileID: 7307063430008138806}
399399
m_Layer: 0
400-
m_Name: Slider_Track_Simple (1)
400+
m_Name: SliderTrackSimple
401401
m_TagString: Untagged
402402
m_Icon: {fileID: 0}
403403
m_NavMeshLayer: 0
@@ -519,7 +519,7 @@ MeshRenderer:
519519
m_RenderingLayerMask: 1
520520
m_RendererPriority: 0
521521
m_Materials:
522-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
522+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
523523
m_StaticBatchInfo:
524524
firstSubMesh: 0
525525
subMeshCount: 0
@@ -701,7 +701,7 @@ MeshRenderer:
701701
m_RenderingLayerMask: 1
702702
m_RendererPriority: 0
703703
m_Materials:
704-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
704+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
705705
m_StaticBatchInfo:
706706
firstSubMesh: 0
707707
subMeshCount: 0
@@ -778,7 +778,7 @@ MeshRenderer:
778778
m_RenderingLayerMask: 1
779779
m_RendererPriority: 0
780780
m_Materials:
781-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
781+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
782782
m_StaticBatchInfo:
783783
firstSubMesh: 0
784784
subMeshCount: 0
@@ -855,7 +855,7 @@ MeshRenderer:
855855
m_RenderingLayerMask: 1
856856
m_RendererPriority: 0
857857
m_Materials:
858-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
858+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
859859
m_StaticBatchInfo:
860860
firstSubMesh: 0
861861
subMeshCount: 0
@@ -937,7 +937,7 @@ GameObject:
937937
- component: {fileID: 7307063430561165486}
938938
- component: {fileID: 7307063430561165473}
939939
m_Layer: 0
940-
m_Name: Tick_Marks
940+
m_Name: TickMarks
941941
m_TagString: Untagged
942942
m_Icon: {fileID: 0}
943943
m_NavMeshLayer: 0
@@ -1004,7 +1004,7 @@ GameObject:
10041004
- component: {fileID: 7307063430618434848}
10051005
- component: {fileID: 7307063430618434849}
10061006
m_Layer: 0
1007-
m_Name: Pinch_Slider
1007+
m_Name: PinchSlider
10081008
m_TagString: Untagged
10091009
m_Icon: {fileID: 0}
10101010
m_NavMeshLayer: 0
@@ -1039,11 +1039,11 @@ MonoBehaviour:
10391039
m_Script: {fileID: 11500000, guid: 5d11c9594c7919e41991b47c0a9275f2, type: 3}
10401040
m_Name:
10411041
m_EditorClassIdentifier:
1042-
sliderRoot: {fileID: 7307063430758334042}
1042+
thumbRoot: {fileID: 0}
10431043
sliderValue: 0.5
10441044
sliderAxis: 0
1045-
sliderStartPosition: {x: -0.12703353, y: -0, z: -0}
1046-
sliderEndPosition: {x: 0.1256156, y: 0, z: 0}
1045+
sliderStartPosition: {x: -0.125, y: -0, z: -0}
1046+
sliderEndPosition: {x: 0.125, y: 0, z: 0}
10471047
OnStartRunning:
10481048
m_PersistentCalls:
10491049
m_Calls: []
@@ -1174,7 +1174,7 @@ MeshRenderer:
11741174
m_RenderingLayerMask: 1
11751175
m_RendererPriority: 0
11761176
m_Materials:
1177-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
1177+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
11781178
m_StaticBatchInfo:
11791179
firstSubMesh: 0
11801180
subMeshCount: 0
@@ -1204,7 +1204,7 @@ GameObject:
12041204
m_Component:
12051205
- component: {fileID: 7307063430758334045}
12061206
m_Layer: 0
1207-
m_Name: SliderRoot
1207+
m_Name: ThumbRoot
12081208
m_TagString: Untagged
12091209
m_Icon: {fileID: 0}
12101210
m_NavMeshLayer: 0
@@ -1282,7 +1282,7 @@ MeshRenderer:
12821282
m_RenderingLayerMask: 1
12831283
m_RendererPriority: 0
12841284
m_Materials:
1285-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
1285+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
12861286
m_StaticBatchInfo:
12871287
firstSubMesh: 0
12881288
subMeshCount: 0
@@ -1359,7 +1359,7 @@ MeshRenderer:
13591359
m_RenderingLayerMask: 1
13601360
m_RendererPriority: 0
13611361
m_Materials:
1362-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
1362+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
13631363
m_StaticBatchInfo:
13641364
firstSubMesh: 0
13651365
subMeshCount: 0
@@ -1436,7 +1436,7 @@ MeshRenderer:
14361436
m_RenderingLayerMask: 1
14371437
m_RendererPriority: 0
14381438
m_Materials:
1439-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
1439+
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
14401440
m_StaticBatchInfo:
14411441
firstSubMesh: 0
14421442
subMeshCount: 0
@@ -1466,7 +1466,7 @@ GameObject:
14661466
m_Component:
14671467
- component: {fileID: 7307063431327029221}
14681468
m_Layer: 0
1469-
m_Name: Track_Visuals
1469+
m_Name: TrackVisuals
14701470
m_TagString: Untagged
14711471
m_Icon: {fileID: 0}
14721472
m_NavMeshLayer: 0

0 commit comments

Comments
 (0)