Skip to content

Commit 207ea22

Browse files
MRW-Ericcre8iveparkjulenkakeveleigh
authored
Feature/touchslider (#8119)
* Added Touch Slider scene & script (initial commit) * added null check * Refined math for touching collider bounds * updated description text * fixed resize / reposition bug * adjusted background panel height * added tooltips / summaries / comments * Touch slider polish * Update Assets/MRTK/SDK/Experimental/TouchSlider/TouchSlider.cs Co-authored-by: Julia Schwarz <[email protected]> * Update Assets/MRTK/SDK/Experimental/TouchSlider/TouchSlider.cs Co-authored-by: Julia Schwarz <[email protected]> * Update script to match coding guidelines * Formatting * Add range for snapValue Co-authored-by: Yoon Park <[email protected]> Co-authored-by: Julia Schwarz <[email protected]> Co-authored-by: Kurtis Eveleigh <[email protected]>
1 parent 284e501 commit 207ea22

16 files changed

+6072
-0
lines changed

Assets/MRTK/Examples/Experimental/TouchSlider.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MRTK/Examples/Experimental/TouchSlider/Materials.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: MRTK_TouchSlider_Thumb
11+
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
12+
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DIRECTIONAL_LIGHT _DISABLE_ALBEDO_MAP
13+
_LIGHTMAPPING_REALTIME _PROXIMITY_LIGHT _SPECULAR_HIGHLIGHTS
14+
m_LightmapFlags: 1
15+
m_EnableInstancingVariants: 0
16+
m_DoubleSidedGI: 0
17+
m_CustomRenderQueue: 2000
18+
stringTagMap:
19+
RenderType: Opaque
20+
disabledShaderPasses: []
21+
m_SavedProperties:
22+
serializedVersion: 3
23+
m_TexEnvs:
24+
- _BumpMap:
25+
m_Texture: {fileID: 0}
26+
m_Scale: {x: 1, y: 1}
27+
m_Offset: {x: 0, y: 0}
28+
- _ChannelMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _DetailAlbedoMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailMask:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _DetailNormalMap:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _EmissionMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _IridescentSpectrumMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _MainTex:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _MetallicGlossMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _NormalMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _OcclusionMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _ParallaxMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
m_Floats:
73+
- _AlbedoAlphaMode: 0
74+
- _AlbedoAssignedAtRuntime: 0
75+
- _BlendOp: 0
76+
- _BlendedClippingWidth: 1
77+
- _BorderLight: 0
78+
- _BorderLightOpaque: 0
79+
- _BorderLightOpaqueAlpha: 1
80+
- _BorderLightReplacesAlbedo: 0
81+
- _BorderLightUsesHoverColor: 1
82+
- _BorderMinValue: 0.1
83+
- _BorderWidth: 0.1
84+
- _BumpScale: 1
85+
- _ClippingBorder: 0
86+
- _ClippingBorderWidth: 0.025
87+
- _ClippingPlane: 0
88+
- _ClippingPlaneBorder: 0
89+
- _ClippingPlaneBorderWidth: 0.025
90+
- _ColorWriteMask: 15
91+
- _CullMode: 2
92+
- _CustomMode: 0
93+
- _Cutoff: 0.5
94+
- _DetailNormalMapScale: 1
95+
- _DirectionalLight: 1
96+
- _DstBlend: 0
97+
- _EdgeSmoothingValue: 0.002
98+
- _EmissionScaleUI: 0
99+
- _EnableChannelMap: 0
100+
- _EnableEmission: 0
101+
- _EnableHoverColorOpaqueOverride: 0
102+
- _EnableHoverColorOverride: 0
103+
- _EnableLocalSpaceTriplanarMapping: 0
104+
- _EnableNormalMap: 0
105+
- _EnableProximityLightColorOverride: 0
106+
- _EnableTriplanarMapping: 0
107+
- _EnvironmentColorIntensity: 0.5
108+
- _EnvironmentColorThreshold: 1.5
109+
- _EnvironmentColoring: 0
110+
- _FadeBeginDistance: 0.85
111+
- _FadeCompleteDistance: 0.5
112+
- _FadeMinValue: 0
113+
- _FluentLightIntensity: 1
114+
- _GlossMapScale: 1
115+
- _Glossiness: 0
116+
- _GlossyReflections: 1
117+
- _HoverLight: 0
118+
- _HoverLightOpaque: 0
119+
- _IgnoreZScale: 0
120+
- _IndependentCorners: 0
121+
- _InnerGlow: 0
122+
- _InnerGlowPower: 4
123+
- _InstancedColor: 0
124+
- _Iridescence: 0
125+
- _IridescenceAngle: -0.78
126+
- _IridescenceIntensity: 0.5
127+
- _IridescenceThreshold: 0.05
128+
- _Lightmapping: 1
129+
- _Metallic: 0
130+
- _Mode: 0
131+
- _NearLightFade: 0
132+
- _NearPlaneFade: 0
133+
- _NormalMapScale: 1
134+
- _OcclusionStrength: 1
135+
- _Parallax: 0.02
136+
- _ProximityLight: 1
137+
- _ProximityLightSubtractive: 0
138+
- _ProximityLightTwoSided: 0
139+
- _Reflections: 0
140+
- _Refraction: 0
141+
- _RefractiveIndex: 1.1
142+
- _RenderQueueOverride: -1
143+
- _RimLight: 0
144+
- _RimPower: 0.25
145+
- _RoundCornerMargin: 0
146+
- _RoundCornerRadius: 0.25
147+
- _RoundCorners: 0
148+
- _Smoothness: 0.5
149+
- _SmoothnessTextureChannel: 0
150+
- _SpecularHighlights: 1
151+
- _SphericalHarmonics: 0
152+
- _SrcBlend: 1
153+
- _Stencil: 0
154+
- _StencilComparison: 0
155+
- _StencilOperation: 0
156+
- _StencilReference: 0
157+
- _TriplanarMappingBlendSharpness: 4
158+
- _UVSec: 0
159+
- _VertexColors: 0
160+
- _VertexExtrusion: 0
161+
- _VertexExtrusionSmoothNormals: 0
162+
- _VertexExtrusionValue: 0
163+
- _ZOffsetFactor: 0
164+
- _ZOffsetUnits: 0
165+
- _ZTest: 4
166+
- _ZWrite: 1
167+
m_Colors:
168+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
169+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
170+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
171+
- _Color: {r: 1, g: 1, b: 1, a: 1}
172+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
173+
- _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1}
174+
- _EmissiveColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 1}
175+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
176+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
177+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
178+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
179+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
180+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
181+
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
182+
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
183+
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
184+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
185+
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

Assets/MRTK/Examples/Experimental/TouchSlider/Materials/MRTK_TouchSlider_Thumb.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/MRTK/Examples/Experimental/TouchSlider/Prefabs.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)