Skip to content

Commit fca5e80

Browse files
MaxWang-MSMaxWang-MS
authored
Merge pull request #9357 from cre8ivepark/issue_9334b
[Stabilization 2.6.0] Fix Bounding Box material for Slate prefab
2 parents 3e88272 + 99e88bd commit fca5e80

File tree

5 files changed

+302
-3
lines changed

5 files changed

+302
-3
lines changed

‎Assets/MRTK/SDK/Features/UX/Materials/BoundingBoxSlate.mat‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
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: BoundingBoxSlate
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 _IGNORE_Z_SCALE _NEAR_LIGHT_FADE _NEAR_PLANE_FADE _NEAR_PLANE_FADE_REVERSE
14+
_PROXIMITY_LIGHT
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: 1
46+
- _BorderLight: 1
47+
- _BorderLightOpaque: 0
48+
- _BorderLightOpaqueAlpha: 1
49+
- _BorderLightReplacesAlbedo: 0
50+
- _BorderLightUsesHoverColor: 1
51+
- _BorderMinValue: 1
52+
- _BorderWidth: 0.016
53+
- _ClippingBorder: 0
54+
- _ClippingBorderWidth: 0.025
55+
- _ClippingBox: 0
56+
- _ClippingPlane: 0
57+
- _ClippingSphere: 0
58+
- _ColorWriteMask: 15
59+
- _CullMode: 0
60+
- _CustomMode: 2
61+
- _Cutoff: 0.5
62+
- _DirectionalLight: 0
63+
- _DstBlend: 1
64+
- _EdgeSmoothingValue: 0.002
65+
- _EnableChannelMap: 0
66+
- _EnableEmission: 0
67+
- _EnableHoverColorOpaqueOverride: 0
68+
- _EnableHoverColorOverride: 0
69+
- _EnableLocalSpaceTriplanarMapping: 0
70+
- _EnableNormalMap: 0
71+
- _EnableProximityLightColorOverride: 0
72+
- _EnableSSAA: 0
73+
- _EnableTriplanarMapping: 0
74+
- _EnvironmentColorIntensity: 0.5
75+
- _EnvironmentColorThreshold: 1.5
76+
- _EnvironmentColoring: 0
77+
- _FadeBeginDistance: 0.01
78+
- _FadeCompleteDistance: 0.18
79+
- _FadeMinValue: 0
80+
- _FluentLightIntensity: 1
81+
- _HoverLight: 1
82+
- _HoverLightOpaque: 0
83+
- _IgnoreZScale: 1
84+
- _IndependentCorners: 0
85+
- _InnerGlow: 0
86+
- _InnerGlowPower: 14.8
87+
- _InstancedColor: 0
88+
- _Iridescence: 0
89+
- _IridescenceAngle: -0.78
90+
- _IridescenceIntensity: 0.5
91+
- _IridescenceThreshold: 0.05
92+
- _Metallic: 0
93+
- _MipmapBias: -2
94+
- _Mode: 4
95+
- _NearLightFade: 1
96+
- _NearPlaneFade: 1
97+
- _NearPlaneFadeReverse: 1
98+
- _NormalMapScale: 1
99+
- _ProximityLight: 1
100+
- _ProximityLightSubtractive: 0
101+
- _ProximityLightTwoSided: 0
102+
- _Reflections: 0
103+
- _Refraction: 0
104+
- _RefractiveIndex: 0
105+
- _RenderQueueOverride: -1
106+
- _RimLight: 0
107+
- _RimPower: 0.25
108+
- _RoundCornerMargin: 0.01
109+
- _RoundCornerRadius: 0.25
110+
- _RoundCorners: 0
111+
- _Smoothness: 0.5
112+
- _SpecularHighlights: 0
113+
- _SphericalHarmonics: 0
114+
- _SrcBlend: 1
115+
- _Stencil: 0
116+
- _StencilComparison: 0
117+
- _StencilOperation: 0
118+
- _StencilReference: 0
119+
- _TriplanarMappingBlendSharpness: 4
120+
- _VertexColors: 0
121+
- _VertexExtrusion: 0
122+
- _VertexExtrusionSmoothNormals: 0
123+
- _VertexExtrusionValue: 0
124+
- _ZOffsetFactor: 0
125+
- _ZOffsetUnits: 0
126+
- _ZTest: 4
127+
- _ZWrite: 0
128+
m_Colors:
129+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
130+
- _Color: {r: 0.1254902, g: 0.1254902, b: 0.1254902, a: 0}
131+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
132+
- _EnvironmentColorX: {r: 1, g: 0, b: 0, a: 1}
133+
- _EnvironmentColorY: {r: 0, g: 1, b: 0, a: 1}
134+
- _EnvironmentColorZ: {r: 0, g: 0, b: 1, a: 1}
135+
- _HoverColorOpaqueOverride: {r: 1, g: 1, b: 1, a: 1}
136+
- _HoverColorOverride: {r: 1, g: 1, b: 1, a: 1}
137+
- _InnerGlowColor: {r: 0.3962264, g: 0.3962264, b: 0.3962264, a: 1}
138+
- _ProximityLightCenterColorOverride: {r: 1, g: 0, b: 0, a: 0}
139+
- _ProximityLightMiddleColorOverride: {r: 0, g: 1, b: 0, a: 0.5}
140+
- _ProximityLightOuterColorOverride: {r: 0, g: 0, b: 1, a: 1}
141+
- _RimColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
142+
- _RoundCornersRadius: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

‎Assets/MRTK/SDK/Features/UX/Materials/BoundingBoxSlate.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/SDK/Features/UX/Materials/BoundingBoxSlateGrabbed.mat‎

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

‎Assets/MRTK/SDK/Features/UX/Materials/BoundingBoxSlateGrabbed.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/SDK/Features/UX/Prefabs/Slate/Slate.prefab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ MonoBehaviour:
11781178
scaleLerpTime: 0.001
11791179
translateLerpTime: 0.001
11801180
enableConstraints: 1
1181-
constraintsManager: {fileID: 0}
1181+
constraintsManager: {fileID: 1720691180653164336}
11821182
rotateStarted:
11831183
m_PersistentCalls:
11841184
m_Calls:
@@ -1712,8 +1712,8 @@ MonoBehaviour:
17121712
m_Script: {fileID: 11500000, guid: 240d9483db94993408ff1d02335ea212, type: 3}
17131713
m_Name: BoxDisplayConfiguration
17141714
m_EditorClassIdentifier:
1715-
boxMaterial: {fileID: 2100000, guid: 4a9aae3094118f44593e7f8000e24c31, type: 2}
1716-
boxGrabbedMaterial: {fileID: 2100000, guid: 7e4095c5609075846b657c8917aae797, type: 2}
1715+
boxMaterial: {fileID: 2100000, guid: 6f044b5d95469d64ea8feb1225b1d5fa, type: 2}
1716+
boxGrabbedMaterial: {fileID: 2100000, guid: f671b04930fdad54c8b50a4c6d7d9b02, type: 2}
17171717
flattenAxisDisplayScale: 0
17181718
--- !u!114 &114688429180390370
17191719
MonoBehaviour:

0 commit comments

Comments
 (0)