Skip to content

Commit cb90b8f

Browse files
hj-cpdm-sonhj-cpdm-son
authored
Merge pull request #1 from hj-cpdm-son/update_shader
Update controller shader
2 parents 8605480 + f0b7dc1 commit cb90b8f

10 files changed

+268
-3022
lines changed

‎Samples~/XRController/Controller/Material/Controller.mat

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,20 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Controller
24-
m_Shader: {fileID: -6465566751694194690, guid: 45ce2856aa4e1ff468c700272cc29a64, type: 3}
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
27-
m_ValidKeywords: []
27+
m_ValidKeywords:
28+
- _METALLICSPECGLOSSMAP
29+
- _NORMALMAP
30+
- _OCCLUSIONMAP
2831
m_InvalidKeywords: []
2932
m_LightmapFlags: 4
3033
m_EnableInstancingVariants: 0
3134
m_DoubleSidedGI: 0
3235
m_CustomRenderQueue: -1
33-
stringTagMap: {}
36+
stringTagMap:
37+
RenderType: Opaque
3438
disabledShaderPasses:
3539
- MOTIONVECTORS
3640
m_LockedProperties:
@@ -74,7 +78,7 @@ Material:
7478
m_Scale: {x: 1, y: 1}
7579
m_Offset: {x: 0, y: 0}
7680
- _Metallic:
77-
m_Texture: {fileID: 2800000, guid: ae2912a83fccc5f4f94484e407ee8c24, type: 3}
81+
m_Texture: {fileID: 2800000, guid: 0d4e4e18e326ea34a9555ce353ba4203, type: 3}
7882
m_Scale: {x: 1, y: 1}
7983
m_Offset: {x: 0, y: 0}
8084
- _MetallicGlossMap:
@@ -94,7 +98,7 @@ Material:
9498
m_Scale: {x: 1, y: 1}
9599
m_Offset: {x: 0, y: 0}
96100
- _Roughness:
97-
m_Texture: {fileID: 2800000, guid: 0d4e4e18e326ea34a9555ce353ba4203, type: 3}
101+
m_Texture: {fileID: 2800000, guid: ae2912a83fccc5f4f94484e407ee8c24, type: 3}
98102
m_Scale: {x: 1, y: 1}
99103
m_Offset: {x: 0, y: 0}
100104
- _SpecGlossMap:
@@ -115,6 +119,7 @@ Material:
115119
m_Offset: {x: 0, y: 0}
116120
m_Ints: []
117121
m_Floats:
122+
- _AddPrecomputedVelocity: 0
118123
- _AlphaClip: 0
119124
- _AlphaToMask: 0
120125
- _Blend: 0

‎Samples~/XRController/Controller/Material/ControllerButton.mat

Lines changed: 162 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-5121006237457058402
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 9
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 8
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: ControllerButton
24+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
25+
m_Parent: {fileID: 0}
26+
m_ModifiedSerializedProperties: 0
27+
m_ValidKeywords:
28+
- _METALLICSPECGLOSSMAP
29+
- _NORMALMAP
30+
- _OCCLUSIONMAP
31+
m_InvalidKeywords: []
32+
m_LightmapFlags: 4
33+
m_EnableInstancingVariants: 0
34+
m_DoubleSidedGI: 0
35+
m_CustomRenderQueue: -1
36+
stringTagMap:
37+
RenderType: Opaque
38+
disabledShaderPasses:
39+
- MOTIONVECTORS
40+
m_LockedProperties:
41+
m_SavedProperties:
42+
serializedVersion: 3
43+
m_TexEnvs:
44+
- _AO:
45+
m_Texture: {fileID: 2800000, guid: 86bcd70ff1fc9d542b1bbf038888893a, type: 3}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _BaseColor:
49+
m_Texture: {fileID: 2800000, guid: 0bce9db852d150a46abc1386096610a7, type: 3}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _BaseMap:
53+
m_Texture: {fileID: 2800000, guid: 0bce9db852d150a46abc1386096610a7, type: 3}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _BumpMap:
57+
m_Texture: {fileID: 2800000, guid: d1c4ec6d57a3cc7428cc3f89e4cb9ac2, type: 3}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _DetailAlbedoMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _DetailMask:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _DetailNormalMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _EmissionMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _MainTex:
77+
m_Texture: {fileID: 2800000, guid: 0bce9db852d150a46abc1386096610a7, type: 3}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- _Metallic:
81+
m_Texture: {fileID: 2800000, guid: 0d4e4e18e326ea34a9555ce353ba4203, type: 3}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- _MetallicGlossMap:
85+
m_Texture: {fileID: 2800000, guid: 0d4e4e18e326ea34a9555ce353ba4203, type: 3}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- _Normal:
89+
m_Texture: {fileID: 2800000, guid: d1c4ec6d57a3cc7428cc3f89e4cb9ac2, type: 3}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- _OcclusionMap:
93+
m_Texture: {fileID: 2800000, guid: 86bcd70ff1fc9d542b1bbf038888893a, type: 3}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
96+
- _ParallaxMap:
97+
m_Texture: {fileID: 0}
98+
m_Scale: {x: 1, y: 1}
99+
m_Offset: {x: 0, y: 0}
100+
- _Roughness:
101+
m_Texture: {fileID: 2800000, guid: ae2912a83fccc5f4f94484e407ee8c24, type: 3}
102+
m_Scale: {x: 1, y: 1}
103+
m_Offset: {x: 0, y: 0}
104+
- _SpecGlossMap:
105+
m_Texture: {fileID: 0}
106+
m_Scale: {x: 1, y: 1}
107+
m_Offset: {x: 0, y: 0}
108+
- unity_Lightmaps:
109+
m_Texture: {fileID: 0}
110+
m_Scale: {x: 1, y: 1}
111+
m_Offset: {x: 0, y: 0}
112+
- unity_LightmapsInd:
113+
m_Texture: {fileID: 0}
114+
m_Scale: {x: 1, y: 1}
115+
m_Offset: {x: 0, y: 0}
116+
- unity_ShadowMasks:
117+
m_Texture: {fileID: 0}
118+
m_Scale: {x: 1, y: 1}
119+
m_Offset: {x: 0, y: 0}
120+
m_Ints: []
121+
m_Floats:
122+
- _AddPrecomputedVelocity: 0
123+
- _AlphaClip: 0
124+
- _AlphaToMask: 0
125+
- _Blend: 0
126+
- _BlendModePreserveSpecular: 1
127+
- _BumpScale: 1
128+
- _ClearCoatMask: 0
129+
- _ClearCoatSmoothness: 0
130+
- _Cull: 2
131+
- _Cutoff: 0.5
132+
- _DetailAlbedoMapScale: 1
133+
- _DetailNormalMapScale: 1
134+
- _DstBlend: 0
135+
- _DstBlendAlpha: 0
136+
- _EnvironmentReflections: 1
137+
- _GlossMapScale: 0
138+
- _Glossiness: 0
139+
- _GlossyReflections: 0
140+
- _Metallic: 0
141+
- _Mode: 0
142+
- _OcclusionStrength: 1
143+
- _Parallax: 0.005
144+
- _QueueControl: 0
145+
- _QueueOffset: 0
146+
- _ReceiveShadows: 1
147+
- _Smoothness: 1
148+
- _SmoothnessTextureChannel: 0
149+
- _SpecularHighlights: 1
150+
- _SrcBlend: 1
151+
- _SrcBlendAlpha: 1
152+
- _Surface: 0
153+
- _UVSec: 0
154+
- _WorkflowMode: 1
155+
- _ZWrite: 1
156+
m_Colors:
157+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
158+
- _Color: {r: 1, g: 1, b: 1, a: 1}
159+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
160+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
161+
m_BuildTextureStacks: []
162+
m_AllowLocking: 1

‎Samples~/XRController/Controller/Shader.meta renamed to ‎Samples~/XRController/Controller/Material/ControllerButton.mat.meta

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

‎Samples~/XRController/Controller/Material/ControllerLED.mat

Lines changed: 81 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: ControllerLED
11-
m_Shader: {fileID: -6465566751694194690, guid: 8bf009d5d195b0d44a050c1cfe39ef5d, type: 3}
11+
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords: []
@@ -17,13 +17,58 @@ Material:
1717
m_EnableInstancingVariants: 0
1818
m_DoubleSidedGI: 0
1919
m_CustomRenderQueue: -1
20-
stringTagMap: {}
20+
stringTagMap:
21+
RenderType: Opaque
2122
disabledShaderPasses:
2223
- MOTIONVECTORS
2324
m_LockedProperties:
2425
m_SavedProperties:
2526
serializedVersion: 3
2627
m_TexEnvs:
28+
- _BaseMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _BumpMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _DetailAlbedoMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _DetailMask:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _DetailNormalMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _EmissionMap:
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+
- _OcclusionMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _ParallaxMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _SpecGlossMap:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
2772
- unity_Lightmaps:
2873
m_Texture: {fileID: 0}
2974
m_Scale: {x: 1, y: 1}
@@ -38,10 +83,43 @@ Material:
3883
m_Offset: {x: 0, y: 0}
3984
m_Ints: []
4085
m_Floats:
86+
- _AddPrecomputedVelocity: 0
87+
- _AlphaClip: 0
88+
- _AlphaToMask: 0
89+
- _Blend: 0
90+
- _BlendModePreserveSpecular: 1
91+
- _BumpScale: 1
92+
- _ClearCoatMask: 0
93+
- _ClearCoatSmoothness: 0
94+
- _Cull: 2
95+
- _Cutoff: 0.5
96+
- _DetailAlbedoMapScale: 1
97+
- _DetailNormalMapScale: 1
98+
- _DstBlend: 0
99+
- _DstBlendAlpha: 0
100+
- _EnvironmentReflections: 1
101+
- _GlossMapScale: 0
102+
- _Glossiness: 0
103+
- _GlossyReflections: 0
104+
- _Metallic: 0
105+
- _OcclusionStrength: 1
106+
- _Parallax: 0.005
41107
- _QueueControl: 0
42108
- _QueueOffset: 0
109+
- _ReceiveShadows: 1
110+
- _Smoothness: 0.5
111+
- _SmoothnessTextureChannel: 0
112+
- _SpecularHighlights: 1
113+
- _SrcBlend: 1
114+
- _SrcBlendAlpha: 1
115+
- _Surface: 0
116+
- _WorkflowMode: 1
117+
- _ZWrite: 1
43118
m_Colors:
44-
- _Color: {r: 0.14901961, g: 0.15686275, b: 0.17254902, a: 1}
119+
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
120+
- _Color: {r: 0, g: 0, b: 0, a: 1}
121+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
122+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
45123
m_BuildTextureStacks: []
46124
m_AllowLocking: 1
47125
--- !u!114 &6530154691802465495

‎Samples~/XRController/Controller/Prefab/LeftController.prefab

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ PrefabInstance:
6363
- target: {fileID: -1380771316523579159, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
6464
propertyPath: 'm_Materials.Array.data[0]'
6565
value:
66-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
66+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
6767
- target: {fileID: 919132149155446097, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
6868
propertyPath: m_Name
6969
value: LeftController
@@ -75,23 +75,23 @@ PrefabInstance:
7575
- target: {fileID: 3022904049054381717, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
7676
propertyPath: 'm_Materials.Array.data[0]'
7777
value:
78-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
78+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
7979
- target: {fileID: 5325284574502630797, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
8080
propertyPath: 'm_Materials.Array.data[0]'
8181
value:
82-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
82+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
8383
- target: {fileID: 5785143619850038663, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
8484
propertyPath: 'm_Materials.Array.data[0]'
8585
value:
86-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
86+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
8787
- target: {fileID: 7912577938104809701, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
8888
propertyPath: 'm_Materials.Array.data[0]'
8989
value:
90-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
90+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
9191
- target: {fileID: 8129873126111405855, guid: 1b49b762dca79f24f931179a91f05289, type: 3}
9292
propertyPath: 'm_Materials.Array.data[0]'
9393
value:
94-
objectReference: {fileID: 2100000, guid: b9a1629f76681a042b010d162c2fdc2b, type: 2}
94+
objectReference: {fileID: 2100000, guid: 35f2f0f62b2b97c07ae2ba643569349c, type: 2}
9595
m_RemovedComponents: []
9696
m_RemovedGameObjects: []
9797
m_AddedGameObjects: []

0 commit comments

Comments
 (0)