Skip to content

Commit ff650d8

Browse files
Pandeliifreezy
Pandelii
authored and
freezy
committed
Material and prefab changes to support DXR rendering.
Changed ray trace interaction to static various prefabs. Added basic simple glass material. Added a sling switch prefab with material assignments.
1 parent 59957c4 commit ff650d8

25 files changed

+1356
-32
lines changed

‎Assets/Art/Materials/Default/Glass.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/Art/Materials/Default/Glass/BasicGlass.mat‎

Lines changed: 262 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,262 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-7268166443681859482
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: da692e001514ec24dbc4cca1949ff7e8, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 12
16+
hdPluginSubTargetMaterialVersions:
17+
m_Keys: []
18+
m_Values:
19+
--- !u!21 &2100000
20+
Material:
21+
serializedVersion: 6
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_Name: BasicGlass
27+
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
28+
m_ShaderKeywords: _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE _REFRACTION_PLANE
29+
_SURFACE_TYPE_TRANSPARENT
30+
m_LightmapFlags: 4
31+
m_EnableInstancingVariants: 0
32+
m_DoubleSidedGI: 0
33+
m_CustomRenderQueue: 3000
34+
stringTagMap:
35+
RenderType: Transparent
36+
disabledShaderPasses:
37+
- MOTIONVECTORS
38+
- TransparentBackface
39+
m_SavedProperties:
40+
serializedVersion: 3
41+
m_TexEnvs:
42+
- _AnisotropyMap:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _BaseColorMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _BentNormalMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _BentNormalMapOS:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _CoatMaskMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
- _DetailMap:
63+
m_Texture: {fileID: 0}
64+
m_Scale: {x: 1, y: 1}
65+
m_Offset: {x: 0, y: 0}
66+
- _EmissiveColorMap:
67+
m_Texture: {fileID: 0}
68+
m_Scale: {x: 1, y: 1}
69+
m_Offset: {x: 0, y: 0}
70+
- _HeightMap:
71+
m_Texture: {fileID: 0}
72+
m_Scale: {x: 1, y: 1}
73+
m_Offset: {x: 0, y: 0}
74+
- _IridescenceMaskMap:
75+
m_Texture: {fileID: 0}
76+
m_Scale: {x: 1, y: 1}
77+
m_Offset: {x: 0, y: 0}
78+
- _IridescenceThicknessMap:
79+
m_Texture: {fileID: 0}
80+
m_Scale: {x: 1, y: 1}
81+
m_Offset: {x: 0, y: 0}
82+
- _MainTex:
83+
m_Texture: {fileID: 0}
84+
m_Scale: {x: 1, y: 1}
85+
m_Offset: {x: 0, y: 0}
86+
- _MaskMap:
87+
m_Texture: {fileID: 0}
88+
m_Scale: {x: 1, y: 1}
89+
m_Offset: {x: 0, y: 0}
90+
- _NormalMap:
91+
m_Texture: {fileID: 0}
92+
m_Scale: {x: 1, y: 1}
93+
m_Offset: {x: 0, y: 0}
94+
- _NormalMapOS:
95+
m_Texture: {fileID: 0}
96+
m_Scale: {x: 1, y: 1}
97+
m_Offset: {x: 0, y: 0}
98+
- _SpecularColorMap:
99+
m_Texture: {fileID: 0}
100+
m_Scale: {x: 1, y: 1}
101+
m_Offset: {x: 0, y: 0}
102+
- _SubsurfaceMaskMap:
103+
m_Texture: {fileID: 0}
104+
m_Scale: {x: 1, y: 1}
105+
m_Offset: {x: 0, y: 0}
106+
- _TangentMap:
107+
m_Texture: {fileID: 0}
108+
m_Scale: {x: 1, y: 1}
109+
m_Offset: {x: 0, y: 0}
110+
- _TangentMapOS:
111+
m_Texture: {fileID: 0}
112+
m_Scale: {x: 1, y: 1}
113+
m_Offset: {x: 0, y: 0}
114+
- _ThicknessMap:
115+
m_Texture: {fileID: 0}
116+
m_Scale: {x: 1, y: 1}
117+
m_Offset: {x: 0, y: 0}
118+
- _TransmittanceColorMap:
119+
m_Texture: {fileID: 0}
120+
m_Scale: {x: 1, y: 1}
121+
m_Offset: {x: 0, y: 0}
122+
- unity_Lightmaps:
123+
m_Texture: {fileID: 0}
124+
m_Scale: {x: 1, y: 1}
125+
m_Offset: {x: 0, y: 0}
126+
- unity_LightmapsInd:
127+
m_Texture: {fileID: 0}
128+
m_Scale: {x: 1, y: 1}
129+
m_Offset: {x: 0, y: 0}
130+
- unity_ShadowMasks:
131+
m_Texture: {fileID: 0}
132+
m_Scale: {x: 1, y: 1}
133+
m_Offset: {x: 0, y: 0}
134+
m_Ints: []
135+
m_Floats:
136+
- _AORemapMax: 1
137+
- _AORemapMin: 0
138+
- _ATDistance: 1
139+
- _AddPrecomputedVelocity: 0
140+
- _AlbedoAffectEmissive: 0
141+
- _AlphaCutoff: 0.5
142+
- _AlphaCutoffEnable: 0
143+
- _AlphaCutoffPostpass: 0.5
144+
- _AlphaCutoffPrepass: 0.5
145+
- _AlphaCutoffShadow: 0.5
146+
- _AlphaDstBlend: 10
147+
- _AlphaSrcBlend: 1
148+
- _AlphaToMask: 0
149+
- _AlphaToMaskInspectorValue: 0
150+
- _Anisotropy: 0
151+
- _BlendMode: 0
152+
- _CoatMask: 0
153+
- _CullMode: 2
154+
- _CullModeForward: 2
155+
- _Cutoff: 0.5
156+
- _DepthOffsetEnable: 0
157+
- _DetailAlbedoScale: 1
158+
- _DetailNormalScale: 1
159+
- _DetailSmoothnessScale: 1
160+
- _DiffusionProfile: 0
161+
- _DiffusionProfileHash: 0
162+
- _DisplacementLockObjectScale: 1
163+
- _DisplacementLockTilingScale: 1
164+
- _DisplacementMode: 0
165+
- _DoubleSidedEnable: 0
166+
- _DoubleSidedGIMode: 0
167+
- _DoubleSidedNormalMode: 1
168+
- _DstBlend: 10
169+
- _EmissiveColorMode: 1
170+
- _EmissiveExposureWeight: 1
171+
- _EmissiveIntensity: 1
172+
- _EmissiveIntensityUnit: 0
173+
- _EnableBlendModePreserveSpecularLighting: 1
174+
- _EnableFogOnTransparent: 1
175+
- _EnableGeometricSpecularAA: 0
176+
- _EnergyConservingSpecularColor: 1
177+
- _HeightAmplitude: 0.02
178+
- _HeightCenter: 0.5
179+
- _HeightMapParametrization: 0
180+
- _HeightMax: 1
181+
- _HeightMin: -1
182+
- _HeightOffset: 0
183+
- _HeightPoMAmplitude: 2
184+
- _HeightTessAmplitude: 2
185+
- _HeightTessCenter: 0.5
186+
- _InvTilingScale: 1
187+
- _Ior: 1
188+
- _IridescenceMask: 1
189+
- _IridescenceThickness: 1
190+
- _LinkDetailsWithBase: 1
191+
- _MaterialID: 1
192+
- _Metallic: 0
193+
- _MetallicRemapMax: 1
194+
- _MetallicRemapMin: 0
195+
- _NormalMapSpace: 0
196+
- _NormalScale: 1
197+
- _OpaqueCullMode: 2
198+
- _PPDLodThreshold: 5
199+
- _PPDMaxSamples: 15
200+
- _PPDMinSamples: 5
201+
- _PPDPrimitiveLength: 1
202+
- _PPDPrimitiveWidth: 1
203+
- _RayTracing: 1
204+
- _ReceivesSSR: 1
205+
- _ReceivesSSRTransparent: 1
206+
- _RefractionModel: 1
207+
- _Smoothness: 0.979
208+
- _SmoothnessRemapMax: 1
209+
- _SmoothnessRemapMin: 0
210+
- _SpecularAAScreenSpaceVariance: 0.1
211+
- _SpecularAAThreshold: 0.2
212+
- _SpecularOcclusionMode: 1
213+
- _SrcBlend: 1
214+
- _StencilRef: 0
215+
- _StencilRefDepth: 8
216+
- _StencilRefGBuffer: 10
217+
- _StencilRefMV: 40
218+
- _StencilWriteMask: 6
219+
- _StencilWriteMaskDepth: 8
220+
- _StencilWriteMaskGBuffer: 14
221+
- _StencilWriteMaskMV: 40
222+
- _SubsurfaceMask: 1
223+
- _SupportDecals: 1
224+
- _SurfaceType: 1
225+
- _TexWorldScale: 1
226+
- _TexWorldScaleEmissive: 1
227+
- _Thickness: 1
228+
- _TransmissionEnable: 1
229+
- _TransparentBackfaceEnable: 0
230+
- _TransparentCullMode: 2
231+
- _TransparentDepthPostpassEnable: 1
232+
- _TransparentDepthPrepassEnable: 1
233+
- _TransparentSortPriority: 0
234+
- _TransparentWritingMotionVec: 0
235+
- _TransparentZWrite: 0
236+
- _UVBase: 0
237+
- _UVDetail: 0
238+
- _UVEmissive: 0
239+
- _UseEmissiveIntensity: 0
240+
- _UseShadowThreshold: 0
241+
- _ZTestDepthEqualForOpaque: 4
242+
- _ZTestGBuffer: 4
243+
- _ZTestTransparent: 4
244+
- _ZWrite: 0
245+
m_Colors:
246+
- _BaseColor: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0}
247+
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
248+
- _Color: {r: 0.8490566, g: 0.8490566, b: 0.8490566, a: 0}
249+
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
250+
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
251+
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
252+
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
253+
- _EmissiveColorLDR: {r: 0, g: 0, b: 0, a: 1}
254+
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
255+
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
256+
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
257+
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
258+
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
259+
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
260+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
261+
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
262+
m_BuildTextureStacks: []

‎Assets/Art/Materials/Default/Glass/BasicGlass.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/Art/Materials/Default/Plastic/Plastics Edges.mat‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Material:
2222
disabledShaderPasses:
2323
- MOTIONVECTORS
2424
- TransparentDepthPrepass
25-
- RayTracingPrepass
2625
- TransparentDepthPostpass
2726
m_SavedProperties:
2827
serializedVersion: 3
@@ -356,7 +355,7 @@ Material:
356355
- _PPDPrimitiveWidth: 1
357356
- _Parallax: 0.02
358357
- _PlanarSpace: 0
359-
- _RayTracing: 0
358+
- _RayTracing: 1
360359
- _RayTracingTexFilteringScale: 0.07
361360
- _ReceivesSSR: 1
362361
- _ReceivesSSRTransparent: 0

‎Assets/Art/Materials/Default/Plastic/Plastics Top.mat‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Material:
2222
disabledShaderPasses:
2323
- MOTIONVECTORS
2424
- TransparentDepthPrepass
25-
- RayTracingPrepass
2625
- TransparentDepthPostpass
2726
m_SavedProperties:
2827
serializedVersion: 3
@@ -356,7 +355,7 @@ Material:
356355
- _PPDPrimitiveWidth: 1
357356
- _Parallax: 0.02
358357
- _PlanarSpace: 0
359-
- _RayTracing: 0
358+
- _RayTracing: 1
360359
- _RayTracingTexFilteringScale: 0.07
361360
- _ReceivesSSR: 1
362361
- _ReceivesSSRTransparent: 0

‎Assets/Art/Materials/Inserts/BulbFakeOrange.mat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ Material:
169169
- _DstBlend: 0
170170
- _EmissiveColorMode: 1
171171
- _EmissiveExposureWeight: 1
172-
- _EmissiveIntensity: 565
172+
- _EmissiveIntensity: 563
173173
- _EmissiveIntensityUnit: 0
174174
- _EnableBlendModePreserveSpecularLighting: 1
175175
- _EnableFogOnTransparent: 1
@@ -250,7 +250,7 @@ Material:
250250
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
251251
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
252252
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
253-
- _EmissiveColor: {r: 565, g: 548.40234, b: 338.45847, a: 565}
253+
- _EmissiveColor: {r: 563, g: 546.4611, b: 337.26038, a: 563}
254254
- _EmissiveColorLDR: {r: 1, g: 0.9869742, b: 0.7971698, a: 1}
255255
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
256256
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}

‎Assets/EditorResources/Prefabs/EditorLighting.prefab‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ Light:
293293
m_Type: 2
294294
m_Shape: 0
295295
m_Color: {r: 1, g: 1, b: 1, a: 1}
296-
m_Intensity: 692.5152
296+
m_Intensity: 460.76562
297297
m_Range: 12.08
298298
m_SpotAngle: 122.6
299299
m_InnerSpotAngle: 21.80208
@@ -340,7 +340,7 @@ Light:
340340
m_UseColorTemperature: 1
341341
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 12.08}
342342
m_UseBoundingSphereOverride: 1
343-
m_UseViewFrustumForShadowCasterCull: 1
343+
m_UseViewFrustumForShadowCasterCull: 0
344344
m_ShadowRadius: 0
345345
m_ShadowAngle: 0
346346
--- !u!114 &518453661
@@ -355,7 +355,7 @@ MonoBehaviour:
355355
m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
356356
m_Name:
357357
m_EditorClassIdentifier:
358-
m_Intensity: 782.9946
358+
m_Intensity: 520.9662
359359
m_EnableSpotReflector: 1
360360
m_LuxAtDistance: 1
361361
m_InnerSpotPercent: 54.4
@@ -382,7 +382,7 @@ MonoBehaviour:
382382
m_IESPoint: {fileID: 0}
383383
m_IESSpot: {fileID: 0}
384384
m_IncludeForRayTracing: 1
385-
m_AreaLightShadowCone: 33.6
385+
m_AreaLightShadowCone: 40
386386
m_UseScreenSpaceShadows: 0
387387
m_InteractsWithSky: 1
388388
m_AngularDiameter: 0.5
@@ -407,7 +407,7 @@ MonoBehaviour:
407407
m_EvsmBlurPasses: 0
408408
m_LightlayersMask: 1
409409
m_LinkShadowLayers: 1
410-
m_ShadowNearPlane: 0.42
410+
m_ShadowNearPlane: 0.5
411411
m_BlockerSampleCount: 24
412412
m_FilterSampleCount: 16
413413
m_MinFilterSize: 0.1
@@ -430,9 +430,9 @@ MonoBehaviour:
430430
m_PenumbraTint: 0
431431
m_NormalBias: 0.75
432432
m_SlopeBias: 0.5
433-
m_ShadowUpdateMode: 0
433+
m_ShadowUpdateMode: 1
434434
m_AlwaysDrawDynamicShadows: 0
435-
m_UpdateShadowOnLightMovement: 0
435+
m_UpdateShadowOnLightMovement: 1
436436
m_CachedShadowTranslationThreshold: 0.01
437437
m_CachedShadowAngularThreshold: 0.5
438438
m_BarnDoorAngle: 90
@@ -567,7 +567,7 @@ GameObject:
567567
m_Icon: {fileID: 0}
568568
m_NavMeshLayer: 0
569569
m_StaticEditorFlags: 0
570-
m_IsActive: 1
570+
m_IsActive: 0
571571
--- !u!4 &1123326636472795819
572572
Transform:
573573
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)