Skip to content

Commit a7895bc

Browse files
committed
Assigned Animation Trigger for the Hover events. Renamed/Updated audio file name/location for the consistency. Assigned dedicated material for the Slider.
1 parent 5302118 commit a7895bc

File tree

12 files changed

+205
-25
lines changed

12 files changed

+205
-25
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ PrefabInstance:
10051005
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
10061006
type: 3}
10071007
propertyPath: OnHoverEntered.m_PersistentCalls.m_Calls.Array.size
1008-
value: 0
1008+
value: 1
10091009
objectReference: {fileID: 0}
10101010
- target: {fileID: 7307063430618434848, guid: 1093263a89abe47499cccf7dcb08effb,
10111011
type: 3}

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

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ MeshRenderer:
598598
m_RenderingLayerMask: 1
599599
m_RendererPriority: 0
600600
m_Materials:
601-
- {fileID: 2100000, guid: d5334c45caee46be937b095a1e977dc6, type: 2}
601+
- {fileID: 2100000, guid: 43ed2047eeac4e54386d3eeb3f7cba2d, type: 2}
602602
m_StaticBatchInfo:
603603
firstSubMesh: 0
604604
subMeshCount: 0
@@ -1044,11 +1044,6 @@ MonoBehaviour:
10441044
sliderAxis: 0
10451045
sliderStartPosition: {x: -0.125, y: -0, z: -0}
10461046
sliderEndPosition: {x: 0.125, y: 0, z: 0}
1047-
OnStartRunning:
1048-
m_PersistentCalls:
1049-
m_Calls: []
1050-
m_TypeName: Microsoft.MixedReality.Toolkit.UI.SliderEvent, Microsoft.MixedReality.Toolkit.SDK,
1051-
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10521047
OnValueUpdated:
10531048
m_PersistentCalls:
10541049
m_Calls: []
@@ -1088,12 +1083,34 @@ MonoBehaviour:
10881083
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10891084
OnHoverEntered:
10901085
m_PersistentCalls:
1091-
m_Calls: []
1086+
m_Calls:
1087+
- m_Target: {fileID: 7307063430522344681}
1088+
m_MethodName: SetTrigger
1089+
m_Mode: 5
1090+
m_Arguments:
1091+
m_ObjectArgument: {fileID: 0}
1092+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1093+
m_IntArgument: 0
1094+
m_FloatArgument: 0
1095+
m_StringArgument: Hover
1096+
m_BoolArgument: 0
1097+
m_CallState: 2
10921098
m_TypeName: Microsoft.MixedReality.Toolkit.UI.SliderEvent, Microsoft.MixedReality.Toolkit.SDK,
10931099
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10941100
OnHoverExited:
10951101
m_PersistentCalls:
1096-
m_Calls: []
1102+
m_Calls:
1103+
- m_Target: {fileID: 7307063430522344681}
1104+
m_MethodName: SetTrigger
1105+
m_Mode: 5
1106+
m_Arguments:
1107+
m_ObjectArgument: {fileID: 0}
1108+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1109+
m_IntArgument: 0
1110+
m_FloatArgument: 0
1111+
m_StringArgument: Default
1112+
m_BoolArgument: 0
1113+
m_CallState: 2
10971114
m_TypeName: Microsoft.MixedReality.Toolkit.UI.SliderEvent, Microsoft.MixedReality.Toolkit.SDK,
10981115
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10991116
--- !u!114 &7307063430618434849

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Grab.wav renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Grab.wav

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Grab.wav.meta renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Grab.wav.meta

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Pass_Notch.wav renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Pass_Notch.wav

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Pass_Notch.wav.meta renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Pass_Notch.wav.meta

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Release.wav renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Release.wav

File renamed without changes.

Assets/MixedRealityToolkit.SDK/Features/UX/Sounds/Sliders/Slider_Release.wav.meta renamed to Assets/MixedRealityToolkit.SDK/StandardAssets/Audio/MRTK_Slider_Release.wav.meta

File renamed without changes.

0 commit comments

Comments
 (0)