Skip to content

Commit b8e0e44

Browse files
authored
Merge pull request #2 from hj-cpdm-son/update_builtin
Update shader and camera clear flags.
2 parents cb90b8f + ee42885 commit b8e0e44

File tree

4 files changed

+27
-145
lines changed

4 files changed

+27
-145
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: Controller
24-
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
24+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _METALLICSPECGLOSSMAP
28+
- _METALLICGLOSSMAP
2929
- _NORMALMAP
30+
m_InvalidKeywords:
31+
- _METALLICSPECGLOSSMAP
3032
- _OCCLUSIONMAP
31-
m_InvalidKeywords: []
3233
m_LightmapFlags: 4
3334
m_EnableInstancingVariants: 0
3435
m_DoubleSidedGI: 0
3536
m_CustomRenderQueue: -1
36-
stringTagMap:
37-
RenderType: Opaque
37+
stringTagMap: {}
3838
disabledShaderPasses:
3939
- MOTIONVECTORS
4040
m_LockedProperties:
@@ -134,9 +134,9 @@ Material:
134134
- _DstBlend: 0
135135
- _DstBlendAlpha: 0
136136
- _EnvironmentReflections: 1
137-
- _GlossMapScale: 0
137+
- _GlossMapScale: 0.5
138138
- _Glossiness: 0
139-
- _GlossyReflections: 0
139+
- _GlossyReflections: 1
140140
- _Metallic: 0
141141
- _Mode: 0
142142
- _OcclusionStrength: 1

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ Material:
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
2323
m_Name: ControllerButton
24-
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
24+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _METALLICSPECGLOSSMAP
28+
- _METALLICGLOSSMAP
2929
- _NORMALMAP
30+
m_InvalidKeywords:
31+
- _METALLICSPECGLOSSMAP
3032
- _OCCLUSIONMAP
31-
m_InvalidKeywords: []
3233
m_LightmapFlags: 4
3334
m_EnableInstancingVariants: 0
3435
m_DoubleSidedGI: 0
3536
m_CustomRenderQueue: -1
36-
stringTagMap:
37-
RenderType: Opaque
37+
stringTagMap: {}
3838
disabledShaderPasses:
3939
- MOTIONVECTORS
4040
m_LockedProperties:
@@ -134,9 +134,9 @@ Material:
134134
- _DstBlend: 0
135135
- _DstBlendAlpha: 0
136136
- _EnvironmentReflections: 1
137-
- _GlossMapScale: 0
137+
- _GlossMapScale: 1
138138
- _Glossiness: 0
139-
- _GlossyReflections: 0
139+
- _GlossyReflections: 1
140140
- _Metallic: 0
141141
- _Mode: 0
142142
- _OcclusionStrength: 1

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

Lines changed: 6 additions & 5 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: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
11+
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords: []
@@ -17,8 +17,7 @@ Material:
1717
m_EnableInstancingVariants: 0
1818
m_DoubleSidedGI: 0
1919
m_CustomRenderQueue: -1
20-
stringTagMap:
21-
RenderType: Opaque
20+
stringTagMap: {}
2221
disabledShaderPasses:
2322
- MOTIONVECTORS
2423
m_LockedProperties:
@@ -99,9 +98,10 @@ Material:
9998
- _DstBlendAlpha: 0
10099
- _EnvironmentReflections: 1
101100
- _GlossMapScale: 0
102-
- _Glossiness: 0
103-
- _GlossyReflections: 0
101+
- _Glossiness: 0.5
102+
- _GlossyReflections: 1
104103
- _Metallic: 0
104+
- _Mode: 0
105105
- _OcclusionStrength: 1
106106
- _Parallax: 0.005
107107
- _QueueControl: 0
@@ -113,6 +113,7 @@ Material:
113113
- _SrcBlend: 1
114114
- _SrcBlendAlpha: 1
115115
- _Surface: 0
116+
- _UVSec: 0
116117
- _WorkflowMode: 1
117118
- _ZWrite: 1
118119
m_Colors:

Samples~/XRController/XRControllerSample.unity

Lines changed: 7 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ GameObject:
130130
- component: {fileID: 330585546}
131131
- component: {fileID: 330585545}
132132
- component: {fileID: 330585544}
133-
- component: {fileID: 330585547}
134133
- component: {fileID: 330585548}
135134
m_Layer: 0
136135
m_Name: Main Camera
@@ -156,8 +155,8 @@ Camera:
156155
m_GameObject: {fileID: 330585543}
157156
m_Enabled: 1
158157
serializedVersion: 2
159-
m_ClearFlags: 1
160-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
158+
m_ClearFlags: 2
159+
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
161160
m_projectionMatrixMode: 1
162161
m_GateFitMode: 2
163162
m_FOVAxisMode: 0
@@ -183,7 +182,7 @@ Camera:
183182
field of view: 60
184183
orthographic: 0
185184
orthographic size: 5
186-
m_Depth: -1
185+
m_Depth: 0
187186
m_CullingMask:
188187
serializedVersion: 2
189188
m_Bits: 4294967295
@@ -213,50 +212,6 @@ Transform:
213212
m_Children: []
214213
m_Father: {fileID: 1962637911}
215214
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
216-
--- !u!114 &330585547
217-
MonoBehaviour:
218-
m_ObjectHideFlags: 0
219-
m_CorrespondingSourceObject: {fileID: 0}
220-
m_PrefabInstance: {fileID: 0}
221-
m_PrefabAsset: {fileID: 0}
222-
m_GameObject: {fileID: 330585543}
223-
m_Enabled: 1
224-
m_EditorHideFlags: 0
225-
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
226-
m_Name:
227-
m_EditorClassIdentifier:
228-
m_RenderShadows: 1
229-
m_RequiresDepthTextureOption: 2
230-
m_RequiresOpaqueTextureOption: 2
231-
m_CameraType: 0
232-
m_Cameras: []
233-
m_RendererIndex: -1
234-
m_VolumeLayerMask:
235-
serializedVersion: 2
236-
m_Bits: 1
237-
m_VolumeTrigger: {fileID: 0}
238-
m_VolumeFrameworkUpdateModeOption: 2
239-
m_RenderPostProcessing: 1
240-
m_Antialiasing: 0
241-
m_AntialiasingQuality: 2
242-
m_StopNaN: 0
243-
m_Dithering: 0
244-
m_ClearDepth: 1
245-
m_AllowXRRendering: 1
246-
m_AllowHDROutput: 1
247-
m_UseScreenCoordOverride: 0
248-
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
249-
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
250-
m_RequiresDepthTexture: 0
251-
m_RequiresColorTexture: 0
252-
m_Version: 2
253-
m_TaaSettings:
254-
m_Quality: 3
255-
m_FrameInfluence: 0.1
256-
m_JitterScale: 1
257-
m_MipBias: 0
258-
m_VarianceClampScale: 0.9
259-
m_ContrastAdaptiveSharpening: 0
260215
--- !u!114 &330585548
261216
MonoBehaviour:
262217
m_ObjectHideFlags: 0
@@ -368,7 +323,6 @@ GameObject:
368323
m_Component:
369324
- component: {fileID: 410087041}
370325
- component: {fileID: 410087040}
371-
- component: {fileID: 410087042}
372326
m_Layer: 0
373327
m_Name: Directional Light
374328
m_TagString: Untagged
@@ -387,13 +341,13 @@ Light:
387341
serializedVersion: 11
388342
m_Type: 1
389343
m_Color: {r: 1, g: 1, b: 1, a: 1}
390-
m_Intensity: 2
344+
m_Intensity: 1
391345
m_Range: 10
392346
m_SpotAngle: 30
393347
m_InnerSpotAngle: 21.80208
394348
m_CookieSize: 10
395349
m_Shadows:
396-
m_Type: 2
350+
m_Type: 0
397351
m_Resolution: -1
398352
m_CustomResolution: -1
399353
m_Strength: 1
@@ -430,8 +384,8 @@ Light:
430384
m_LightShadowCasterMode: 0
431385
m_AreaSize: {x: 1, y: 1}
432386
m_BounceIntensity: 1
433-
m_ColorTemperature: 5000
434-
m_UseColorTemperature: 1
387+
m_ColorTemperature: 6570
388+
m_UseColorTemperature: 0
435389
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
436390
m_UseBoundingSphereOverride: 0
437391
m_UseViewFrustumForShadowCasterCull: 1
@@ -456,29 +410,6 @@ Transform:
456410
m_Children: []
457411
m_Father: {fileID: 0}
458412
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
459-
--- !u!114 &410087042
460-
MonoBehaviour:
461-
m_ObjectHideFlags: 0
462-
m_CorrespondingSourceObject: {fileID: 0}
463-
m_PrefabInstance: {fileID: 0}
464-
m_PrefabAsset: {fileID: 0}
465-
m_GameObject: {fileID: 410087039}
466-
m_Enabled: 1
467-
m_EditorHideFlags: 0
468-
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
469-
m_Name:
470-
m_EditorClassIdentifier:
471-
m_Version: 3
472-
m_UsePipelineSettings: 1
473-
m_AdditionalLightsShadowResolutionTier: 2
474-
m_LightLayerMask: 1
475-
m_RenderingLayers: 1
476-
m_CustomShadowLayers: 0
477-
m_ShadowLayerMask: 1
478-
m_ShadowRenderingLayers: 1
479-
m_LightCookieSize: {x: 1, y: 1}
480-
m_LightCookieOffset: {x: 0, y: 0}
481-
m_SoftShadowQuality: 1
482413
--- !u!1001 &721646432
483414
PrefabInstance:
484415
m_ObjectHideFlags: 0
@@ -541,55 +472,6 @@ Transform:
541472
m_CorrespondingSourceObject: {fileID: 4454199932067018079, guid: 28d082d6c802a844384715111b194769, type: 3}
542473
m_PrefabInstance: {fileID: 721646432}
543474
m_PrefabAsset: {fileID: 0}
544-
--- !u!1 &832575517
545-
GameObject:
546-
m_ObjectHideFlags: 0
547-
m_CorrespondingSourceObject: {fileID: 0}
548-
m_PrefabInstance: {fileID: 0}
549-
m_PrefabAsset: {fileID: 0}
550-
serializedVersion: 6
551-
m_Component:
552-
- component: {fileID: 832575519}
553-
- component: {fileID: 832575518}
554-
m_Layer: 0
555-
m_Name: Global Volume
556-
m_TagString: Untagged
557-
m_Icon: {fileID: 0}
558-
m_NavMeshLayer: 0
559-
m_StaticEditorFlags: 0
560-
m_IsActive: 1
561-
--- !u!114 &832575518
562-
MonoBehaviour:
563-
m_ObjectHideFlags: 0
564-
m_CorrespondingSourceObject: {fileID: 0}
565-
m_PrefabInstance: {fileID: 0}
566-
m_PrefabAsset: {fileID: 0}
567-
m_GameObject: {fileID: 832575517}
568-
m_Enabled: 1
569-
m_EditorHideFlags: 0
570-
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
571-
m_Name:
572-
m_EditorClassIdentifier:
573-
m_IsGlobal: 1
574-
priority: 0
575-
blendDistance: 0
576-
weight: 1
577-
sharedProfile: {fileID: 11400000, guid: 10fc4df2da32a41aaa32d77bc913491c, type: 2}
578-
--- !u!4 &832575519
579-
Transform:
580-
m_ObjectHideFlags: 0
581-
m_CorrespondingSourceObject: {fileID: 0}
582-
m_PrefabInstance: {fileID: 0}
583-
m_PrefabAsset: {fileID: 0}
584-
m_GameObject: {fileID: 832575517}
585-
serializedVersion: 2
586-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
587-
m_LocalPosition: {x: 0, y: 0, z: 0}
588-
m_LocalScale: {x: 1, y: 1, z: 1}
589-
m_ConstrainProportionsScale: 0
590-
m_Children: []
591-
m_Father: {fileID: 0}
592-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
593475
--- !u!1001 &1507901172
594476
PrefabInstance:
595477
m_ObjectHideFlags: 0
@@ -741,5 +623,4 @@ SceneRoots:
741623
m_ObjectHideFlags: 0
742624
m_Roots:
743625
- {fileID: 410087041}
744-
- {fileID: 832575519}
745626
- {fileID: 2050088264}

0 commit comments

Comments
 (0)