Skip to content

Commit 81ee3b2

Browse files
keveleighkeveleigh
authored
Merge pull request #7306 from cre8ivepark/mrtk_development_UGUI_02112020
Unity UI (UGUI) Examples Polish
2 parents ea8dc5d + ea01d2a commit 81ee3b2

14 files changed

+15702
-5254
lines changed

‎Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity

+5,603-5,207
Large diffs are not rendered by default.

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximity.mat

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Material:
1717
m_DoubleSidedGI: 0
1818
m_CustomRenderQueue: 3000
1919
stringTagMap:
20-
RenderType: Transparent
20+
RenderType: Fade
2121
disabledShaderPasses: []
2222
m_SavedProperties:
2323
serializedVersion: 3
@@ -117,8 +117,8 @@ Material:
117117
- _EnvironmentColorIntensity: 0.5
118118
- _EnvironmentColorThreshold: 1.5
119119
- _EnvironmentColoring: 0
120-
- _FadeBeginDistance: 0.01
121-
- _FadeCompleteDistance: 0.4
120+
- _FadeBeginDistance: 0.0101
121+
- _FadeCompleteDistance: 0.2
122122
- _FadeMinValue: 0
123123
- _FluentLightIntensity: 1
124124
- _GlossMapScale: 1
@@ -127,6 +127,7 @@ Material:
127127
- _HoverLight: 1
128128
- _HoverLightOpaque: 0
129129
- _IgnoreZScale: 0
130+
- _IndependentCorners: 0
130131
- _InnerGlow: 0
131132
- _InnerGlowPower: 12
132133
- _InstancedColor: 0
@@ -190,3 +191,4 @@ Material:
190191
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
191192
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
192193
- _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
194+
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircularUnityUI.mat

+133
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
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: HolographicButtonContentCageProximityCircularUnityUI
11+
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
12+
m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_OPAQUE _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _IGNORE_Z_SCALE _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _PROXIMITY_LIGHT
14+
_PROXIMITY_LIGHT_TWO_SIDED _ROUND_CORNERS
15+
m_LightmapFlags: 4
16+
m_EnableInstancingVariants: 1
17+
m_DoubleSidedGI: 0
18+
m_CustomRenderQueue: 3000
19+
stringTagMap:
20+
RenderType: Fade
21+
disabledShaderPasses: []
22+
m_SavedProperties:
23+
serializedVersion: 3
24+
m_TexEnvs:
25+
- _ChannelMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _IridescentSpectrumMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _MainTex:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _NormalMap:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
m_Floats:
42+
- _AlbedoAlphaMode: 0
43+
- _AlbedoAssignedAtRuntime: 0
44+
- _BlendOp: 0
45+
- _BlendedClippingWidth: 0.0001
46+
- _BorderLight: 1
47+
- _BorderLightOpaque: 1
48+
- _BorderLightOpaqueAlpha: 1
49+
- _BorderLightReplacesAlbedo: 0
50+
- _BorderLightUsesHoverColor: 0
51+
- _BorderMinValue: 1
52+
- _BorderWidth: 0.02
53+
- _ClippingBorder: 0
54+
- _ClippingBorderWidth: 0.025
55+
- _ColorWriteMask: 15
56+
- _CullMode: 0
57+
- _CustomMode: 2
58+
- _Cutoff: 0.5
59+
- _DirectionalLight: 0
60+
- _DstBlend: 1
61+
- _EdgeSmoothingValue: 0.0005
62+
- _EnableChannelMap: 0
63+
- _EnableEmission: 0
64+
- _EnableHoverColorOverride: 0
65+
- _EnableLocalSpaceTriplanarMapping: 0
66+
- _EnableNormalMap: 0
67+
- _EnableProximityLightColorOverride: 0
68+
- _EnableTriplanarMapping: 0
69+
- _EnvironmentColorIntensity: 0.5
70+
- _EnvironmentColorThreshold: 1.5
71+
- _EnvironmentColoring: 0
72+
- _FadeBeginDistance: 0.01
73+
- _FadeCompleteDistance: 0.1
74+
- _FadeMinValue: 0
75+
- _FluentLightIntensity: 1
76+
- _HoverLight: 1
77+
- _IgnoreZScale: 1
78+
- _IndependentCorners: 0
79+
- _InnerGlow: 0
80+
- _InnerGlowPower: 4
81+
- _InstancedColor: 0
82+
- _Iridescence: 0
83+
- _IridescenceAngle: -0.78
84+
- _IridescenceIntensity: 0.5
85+
- _IridescenceThreshold: 0.05
86+
- _Metallic: 0
87+
- _Mode: 4
88+
- _NearLightFade: 1
89+
- _NearPlaneFade: 1
90+
- _NormalMapScale: 1
91+
- _ProximityLight: 1
92+
- _ProximityLightSubtractive: 0
93+
- _ProximityLightTwoSided: 1
94+
- _Reflections: 0
95+
- _Refraction: 0
96+
- _RefractiveIndex: 0
97+
- _RenderQueueOverride: -1
98+
- _RimLight: 0
99+
- _RimPower: 0.25
100+
- _RoundCornerMargin: 0.015
101+
- _RoundCornerRadius: 0.5
102+
- _RoundCorners: 1
103+
- _Smoothness: 0.5
104+
- _SpecularHighlights: 0
105+
- _SphericalHarmonics: 0
106+
- _SrcBlend: 1
107+
- _Stencil: 0
108+
- _StencilComparison: 0
109+
- _StencilOperation: 0
110+
- _StencilReference: 0
111+
- _TriplanarMappingBlendSharpness: 4
112+
- _VertexColors: 0
113+
- _VertexExtrusion: 0
114+
- _VertexExtrusionSmoothNormals: 0
115+
- _VertexExtrusionValue: 0
116+
- _ZOffsetFactor: 0
117+
- _ZOffsetUnits: 0
118+
- _ZTest: 4
119+
- _ZWrite: 0
120+
m_Colors:
121+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
122+
- _Color: {r: 0, g: 0, b: 0, a: 1}
123+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
124+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
125+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
126+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
127+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
128+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.75}
129+
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
130+
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
131+
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
132+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
133+
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityCircularUnityUI.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityUnityUI.mat

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
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: HolographicButtonContentCageProximityUnityUI
11+
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
12+
m_ShaderKeywords: _ALPHABLEND_ON _BORDER_LIGHT _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP
13+
_HOVER_LIGHT _METALLIC_TEXTURE_ALBEDO_CHANNEL_A _NEAR_LIGHT_FADE _NEAR_PLANE_FADE
14+
_PROXIMITY_LIGHT _PROXIMITY_LIGHT_TWO_SIDED
15+
m_LightmapFlags: 4
16+
m_EnableInstancingVariants: 1
17+
m_DoubleSidedGI: 0
18+
m_CustomRenderQueue: 3000
19+
stringTagMap:
20+
RenderType: Fade
21+
disabledShaderPasses: []
22+
m_SavedProperties:
23+
serializedVersion: 3
24+
m_TexEnvs:
25+
- _BumpMap:
26+
m_Texture: {fileID: 0}
27+
m_Scale: {x: 1, y: 1}
28+
m_Offset: {x: 0, y: 0}
29+
- _ChannelMap:
30+
m_Texture: {fileID: 0}
31+
m_Scale: {x: 1, y: 1}
32+
m_Offset: {x: 0, y: 0}
33+
- _DetailAlbedoMap:
34+
m_Texture: {fileID: 0}
35+
m_Scale: {x: 1, y: 1}
36+
m_Offset: {x: 0, y: 0}
37+
- _DetailMask:
38+
m_Texture: {fileID: 0}
39+
m_Scale: {x: 1, y: 1}
40+
m_Offset: {x: 0, y: 0}
41+
- _DetailNormalMap:
42+
m_Texture: {fileID: 0}
43+
m_Scale: {x: 1, y: 1}
44+
m_Offset: {x: 0, y: 0}
45+
- _EmissionMap:
46+
m_Texture: {fileID: 0}
47+
m_Scale: {x: 1, y: 1}
48+
m_Offset: {x: 0, y: 0}
49+
- _IridescentSpectrumMap:
50+
m_Texture: {fileID: 0}
51+
m_Scale: {x: 1, y: 1}
52+
m_Offset: {x: 0, y: 0}
53+
- _LightMapTex:
54+
m_Texture: {fileID: 0}
55+
m_Scale: {x: 1, y: 1}
56+
m_Offset: {x: 0, y: 0}
57+
- _MainTex:
58+
m_Texture: {fileID: 2800000, guid: 1443b22b919aede4ca14ca5e3bf81096, type: 3}
59+
m_Scale: {x: 1, y: 1}
60+
m_Offset: {x: 0, y: 0}
61+
- _MetallicGlossMap:
62+
m_Texture: {fileID: 0}
63+
m_Scale: {x: 1, y: 1}
64+
m_Offset: {x: 0, y: 0}
65+
- _NormalMap:
66+
m_Texture: {fileID: 0}
67+
m_Scale: {x: 1, y: 1}
68+
m_Offset: {x: 0, y: 0}
69+
- _OcclusionMap:
70+
m_Texture: {fileID: 0}
71+
m_Scale: {x: 1, y: 1}
72+
m_Offset: {x: 0, y: 0}
73+
- _ParallaxMap:
74+
m_Texture: {fileID: 0}
75+
m_Scale: {x: 1, y: 1}
76+
m_Offset: {x: 0, y: 0}
77+
m_Floats:
78+
- _AlbedoAlphaMode: 1
79+
- _AlbedoAlphaSmoothness: 0
80+
- _AlbedoAssignedAtRuntime: 0
81+
- _BlendOp: 0
82+
- _BlendedClippingWidth: 0.0001
83+
- _BorderLight: 1
84+
- _BorderLightOpaque: 0
85+
- _BorderLightOpaqueAlpha: 1
86+
- _BorderLightReplacesAlbedo: 0
87+
- _BorderLightUsesHoverColor: 1
88+
- _BorderMinValue: 1
89+
- _BorderWidth: 0.06
90+
- _BorderWidthHorizontal: 0.1
91+
- _BorderWidthVertical: 0.1
92+
- _BumpScale: 1
93+
- _ClippingBorder: 0
94+
- _ClippingBorderWidth: 0.025
95+
- _ClippingBox: 0
96+
- _ClippingPlane: 0
97+
- _ClippingPlaneBorder: 0
98+
- _ClippingPlaneBorderWidth: 0.025
99+
- _ClippingSphere: 0
100+
- _ColorWriteMask: 15
101+
- _CullMode: 2
102+
- _CustomMode: 2
103+
- _Cutoff: 0.5
104+
- _DetailNormalMapScale: 1
105+
- _DirectionalLight: 0
106+
- _DstBlend: 1
107+
- _EdgeSmoothingValue: 0.002
108+
- _EnableChannelMap: 0
109+
- _EnableEmission: 0
110+
- _EnableHoverColorOpaqueOverride: 0
111+
- _EnableHoverColorOverride: 0
112+
- _EnableLightMap: 0
113+
- _EnableLocalSpaceTriplanarMapping: 0
114+
- _EnableNormalMap: 0
115+
- _EnableProximityLightColorOverride: 0
116+
- _EnableTriplanarMapping: 0
117+
- _EnvironmentColorIntensity: 0.5
118+
- _EnvironmentColorThreshold: 1.5
119+
- _EnvironmentColoring: 0
120+
- _FadeBeginDistance: 0.001
121+
- _FadeCompleteDistance: 0.1
122+
- _FadeMinValue: 0
123+
- _FluentLightIntensity: 1
124+
- _GlossMapScale: 1
125+
- _Glossiness: 0.5
126+
- _GlossyReflections: 1
127+
- _HoverLight: 1
128+
- _HoverLightOpaque: 0
129+
- _IgnoreZScale: 0
130+
- _IndependentCorners: 0
131+
- _InnerGlow: 0
132+
- _InnerGlowPower: 12
133+
- _InstancedColor: 0
134+
- _Iridescence: 0
135+
- _IridescenceAngle: -0.78
136+
- _IridescenceIntensity: 0.5
137+
- _IridescenceThreshold: 0.05
138+
- _Metallic: 0
139+
- _Mode: 4
140+
- _NearLightFade: 1
141+
- _NearPlaneFade: 1
142+
- _NormalMapScale: 1
143+
- _OcclusionStrength: 1
144+
- _Parallax: 0.02
145+
- _ProximityLight: 1
146+
- _ProximityLightSubtractive: 0
147+
- _ProximityLightTwoSided: 1
148+
- _Reflections: 0
149+
- _Refraction: 0
150+
- _RefractiveIndex: 1.1
151+
- _RenderQueueOverride: -1
152+
- _RimLight: 0
153+
- _RimPower: 5.83
154+
- _RoundCornerMargin: 0
155+
- _RoundCornerRadius: 0.25
156+
- _RoundCorners: 0
157+
- _Smoothness: 0.5
158+
- _SmoothnessTextureChannel: 0
159+
- _SpecularHighlights: 0
160+
- _SphericalHarmonics: 0
161+
- _SrcBlend: 1
162+
- _Stencil: 0
163+
- _StencilComparison: 0
164+
- _StencilOperation: 0
165+
- _StencilReference: 0
166+
- _TriplanarMappingBlendSharpness: 4
167+
- _UVSec: 0
168+
- _VertexColors: 0
169+
- _VertexExtrusion: 0
170+
- _VertexExtrusionSmoothNormals: 0
171+
- _VertexExtrusionValue: 0
172+
- _ZOffsetFactor: 0
173+
- _ZOffsetUnits: 0
174+
- _ZTest: 4
175+
- _ZWrite: 0
176+
m_Colors:
177+
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
178+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
179+
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
180+
- _Color: {r: 0, g: 0, b: 0, a: 1}
181+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
182+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
183+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
184+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
185+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
186+
- _HoverColor: {r: 1, g: 0, b: 0, a: 1}
187+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
188+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
189+
- _InnerGlowColor: {r: 1, g: 1, b: 1, a: 0.98039216}
190+
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
191+
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
192+
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
193+
- _RimColor: {r: 1, g: 1, b: 1, a: 0.497}
194+
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicButtonContentCageProximityUnityUI.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)