Skip to content

Commit ab5c4b6

Browse files
author
David Kline
authored
Merge pull request #3486 from keveleigh/controller-pointer-material
Update controller pointer line to support color again
2 parents 48cd5c8 + 1fea880 commit ab5c4b6

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

Assets/MixedRealityToolkit.SDK/StandardAssets/Materials/MRTK_DefaultPointerLine.mat

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ Material:
55
serializedVersion: 6
66
m_ObjectHideFlags: 0
77
m_CorrespondingSourceObject: {fileID: 0}
8-
m_PrefabInternal: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
910
m_Name: MRTK_DefaultPointerLine
1011
m_Shader: {fileID: 4800000, guid: 5bdea20278144b11916d77503ba1467a, type: 3}
1112
m_ShaderKeywords: _BORDER_LIGHT_USES_HOVER_COLOR _DISABLE_ALBEDO_MAP _SPECULAR_HIGHLIGHTS
13+
_VERTEX_COLORS
1214
m_LightmapFlags: 4
1315
m_EnableInstancingVariants: 0
1416
m_DoubleSidedGI: 0
@@ -73,9 +75,14 @@ Material:
7375
- _BorderMinValue: 0.1
7476
- _BorderWidth: 0.1
7577
- _BumpScale: 1
78+
- _ClippingBorder: 0
79+
- _ClippingBorderWidth: 0.025
80+
- _ClippingBox: 0
7681
- _ClippingPlane: 0
7782
- _ClippingPlaneBorder: 0
7883
- _ClippingPlaneBorderWidth: 0.025
84+
- _ClippingSphere: 0
85+
- _ColorMask: 15
7986
- _ColorWriteMask: 15
8087
- _CullMode: 2
8188
- _CustomMode: 0
@@ -122,17 +129,25 @@ Material:
122129
- _Smoothness: 0.5
123130
- _SmoothnessTextureChannel: 0
124131
- _SpecularHighlights: 1
132+
- _SphericalHarmonics: 0
125133
- _SrcBlend: 1
126134
- _Stencil: 0
135+
- _StencilComp: 8
127136
- _StencilComparison: 0
137+
- _StencilOp: 0
128138
- _StencilOperation: 0
139+
- _StencilReadMask: 255
129140
- _StencilReference: 0
141+
- _StencilWriteMask: 255
130142
- _TriplanarMappingBlendSharpness: 4
131143
- _UVSec: 0
144+
- _UseUIAlphaClip: 0
145+
- _VertexColors: 1
132146
- _ZTest: 4
133147
- _ZWrite: 1
134148
m_Colors:
135149
- _ClipPlane: {r: 0, g: 1, b: 0, a: 0}
150+
- _ClippingBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
136151
- _ClippingPlaneBorderColor: {r: 1, g: 0.2, b: 0, a: 1}
137152
- _Color: {r: 1, g: 1, b: 1, a: 1}
138153
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

0 commit comments

Comments
 (0)