Skip to content

Commit 1c842ae

Browse files
Pandeliifreezy
authored andcommitted
Material misc adjustments. Light prefab adjustment.
Moved the faux filament to be a child of the light. Slight color adjustment. Adjustments to the emissive glow material to let it fit in the adjustment setup. Generic hardware material update.
1 parent ff650d8 commit 1c842ae

File tree

5 files changed

+1806
-149
lines changed

5 files changed

+1806
-149
lines changed

Assets/Art/Materials/Default/Metal/BrushedMetals/Chrome_Brushed_Aniso.mat

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ MonoBehaviour:
1313
m_Name:
1414
m_EditorClassIdentifier:
1515
version: 12
16+
hdPluginSubTargetMaterialVersions:
17+
m_Keys: []
18+
m_Values:
1619
--- !u!21 &2100000
1720
Material:
1821
serializedVersion: 6
@@ -135,6 +138,7 @@ Material:
135138
m_Texture: {fileID: 0}
136139
m_Scale: {x: 1, y: 1}
137140
m_Offset: {x: 0, y: 0}
141+
m_Ints: []
138142
m_Floats:
139143
- _AORemapMax: 1
140144
- _AORemapMin: 0.8445946
@@ -265,9 +269,9 @@ Material:
265269
- _ZTestTransparent: 4
266270
- _ZWrite: 1
267271
m_Colors:
268-
- _BaseColor: {r: 0.96078426, g: 0.96078426, b: 0.96078426, a: 1}
272+
- _BaseColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
269273
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
270-
- _Color: {r: 0.96078426, g: 0.96078426, b: 0.96078426, a: 1}
274+
- _Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 1}
271275
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
272276
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
273277
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Art/Materials/Default/Metal/GenericHardware.mat

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Material:
4747
m_Scale: {x: 1, y: 1}
4848
m_Offset: {x: 0, y: 0}
4949
- _BaseColorMap:
50-
m_Texture: {fileID: 2800000, guid: 94e13b673921ff24f8317acde3927271, type: 3}
50+
m_Texture: {fileID: 2800000, guid: 447ef6ecc48eef64ba701f1031142492, type: 3}
5151
m_Scale: {x: 1, y: 1}
5252
m_Offset: {x: 0, y: 0}
5353
- _BentNormalMap:
@@ -87,15 +87,15 @@ Material:
8787
m_Scale: {x: 1, y: 1}
8888
m_Offset: {x: 0, y: 0}
8989
- _MainTex:
90-
m_Texture: {fileID: 2800000, guid: 94e13b673921ff24f8317acde3927271, type: 3}
90+
m_Texture: {fileID: 2800000, guid: 447ef6ecc48eef64ba701f1031142492, type: 3}
9191
m_Scale: {x: 1, y: 1}
9292
m_Offset: {x: 0, y: 0}
9393
- _MaskMap:
94-
m_Texture: {fileID: 2800000, guid: 3cf43afb5fa545340a6983741b73e66d, type: 3}
94+
m_Texture: {fileID: 2800000, guid: dc9deb9e6cb55484da40bf03bbe2532a, type: 3}
9595
m_Scale: {x: 1, y: 1}
9696
m_Offset: {x: 0, y: 0}
9797
- _NormalMap:
98-
m_Texture: {fileID: 2800000, guid: 5b4aa3726ac212a478660417b4708b1b, type: 3}
98+
m_Texture: {fileID: 2800000, guid: f63bdf2c29b043b4a94a154ba1ad2c1f, type: 3}
9999
m_Scale: {x: 1, y: 1}
100100
m_Offset: {x: 0, y: 0}
101101
- _NormalMapOS:
@@ -213,9 +213,9 @@ Material:
213213
- _MaterialID: 1
214214
- _Metallic: 1
215215
- _MetallicRemapMax: 1
216-
- _MetallicRemapMin: 1
216+
- _MetallicRemapMin: 0
217217
- _NormalMapSpace: 0
218-
- _NormalScale: 0.5
218+
- _NormalScale: 1
219219
- _OpaqueCullMode: 2
220220
- _PPDLodThreshold: 5
221221
- _PPDMaxSamples: 15
@@ -229,7 +229,7 @@ Material:
229229
- _SSRefractionProjectionModel: 0
230230
- _Smoothness: 0.6
231231
- _SmoothnessRemapMax: 1
232-
- _SmoothnessRemapMin: 0.5084843
232+
- _SmoothnessRemapMin: 0.18848701
233233
- _SpecularAAScreenSpaceVariance: 0.05
234234
- _SpecularAAThreshold: 0.105
235235
- _SpecularOcclusionMode: 1

Assets/Art/Materials/Default/Special/Emissive/EmissiveGlow.mat

Lines changed: 171 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,103 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: EmissiveGlow
11-
m_Shader: {fileID: -6465566751694194690, guid: 7c5213a9a416ba74fb5b451a30315928, type: 3}
12-
m_ShaderKeywords:
11+
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
12+
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
1313
m_LightmapFlags: 1
1414
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: 2225
1717
stringTagMap:
1818
MotionVector: User
1919
disabledShaderPasses:
2020
- TransparentDepthPrepass
2121
- TransparentDepthPostpass
2222
- TransparentBackface
2323
- MOTIONVECTORS
24+
- RayTracingPrepass
2425
m_SavedProperties:
2526
serializedVersion: 3
2627
m_TexEnvs:
28+
- _AnisotropyMap:
29+
m_Texture: {fileID: 0}
30+
m_Scale: {x: 1, y: 1}
31+
m_Offset: {x: 0, y: 0}
32+
- _BaseColorMap:
33+
m_Texture: {fileID: 0}
34+
m_Scale: {x: 1, y: 1}
35+
m_Offset: {x: 0, y: 0}
36+
- _BentNormalMap:
37+
m_Texture: {fileID: 0}
38+
m_Scale: {x: 1, y: 1}
39+
m_Offset: {x: 0, y: 0}
40+
- _BentNormalMapOS:
41+
m_Texture: {fileID: 0}
42+
m_Scale: {x: 1, y: 1}
43+
m_Offset: {x: 0, y: 0}
44+
- _CoatMaskMap:
45+
m_Texture: {fileID: 0}
46+
m_Scale: {x: 1, y: 1}
47+
m_Offset: {x: 0, y: 0}
48+
- _DetailMap:
49+
m_Texture: {fileID: 0}
50+
m_Scale: {x: 1, y: 1}
51+
m_Offset: {x: 0, y: 0}
52+
- _EmissiveColorMap:
53+
m_Texture: {fileID: 0}
54+
m_Scale: {x: 1, y: 1}
55+
m_Offset: {x: 0, y: 0}
56+
- _HeightMap:
57+
m_Texture: {fileID: 0}
58+
m_Scale: {x: 1, y: 1}
59+
m_Offset: {x: 0, y: 0}
60+
- _IridescenceMaskMap:
61+
m_Texture: {fileID: 0}
62+
m_Scale: {x: 1, y: 1}
63+
m_Offset: {x: 0, y: 0}
64+
- _IridescenceThicknessMap:
65+
m_Texture: {fileID: 0}
66+
m_Scale: {x: 1, y: 1}
67+
m_Offset: {x: 0, y: 0}
68+
- _MainTex:
69+
m_Texture: {fileID: 0}
70+
m_Scale: {x: 1, y: 1}
71+
m_Offset: {x: 0, y: 0}
72+
- _MaskMap:
73+
m_Texture: {fileID: 0}
74+
m_Scale: {x: 1, y: 1}
75+
m_Offset: {x: 0, y: 0}
76+
- _NormalMap:
77+
m_Texture: {fileID: 0}
78+
m_Scale: {x: 1, y: 1}
79+
m_Offset: {x: 0, y: 0}
80+
- _NormalMapOS:
81+
m_Texture: {fileID: 0}
82+
m_Scale: {x: 1, y: 1}
83+
m_Offset: {x: 0, y: 0}
84+
- _SpecularColorMap:
85+
m_Texture: {fileID: 0}
86+
m_Scale: {x: 1, y: 1}
87+
m_Offset: {x: 0, y: 0}
88+
- _SubsurfaceMaskMap:
89+
m_Texture: {fileID: 0}
90+
m_Scale: {x: 1, y: 1}
91+
m_Offset: {x: 0, y: 0}
92+
- _TangentMap:
93+
m_Texture: {fileID: 0}
94+
m_Scale: {x: 1, y: 1}
95+
m_Offset: {x: 0, y: 0}
96+
- _TangentMapOS:
97+
m_Texture: {fileID: 0}
98+
m_Scale: {x: 1, y: 1}
99+
m_Offset: {x: 0, y: 0}
100+
- _ThicknessMap:
101+
m_Texture: {fileID: 0}
102+
m_Scale: {x: 1, y: 1}
103+
m_Offset: {x: 0, y: 0}
104+
- _TransmittanceColorMap:
105+
m_Texture: {fileID: 0}
106+
m_Scale: {x: 1, y: 1}
107+
m_Offset: {x: 0, y: 0}
27108
- unity_Lightmaps:
28109
m_Texture: {fileID: 0}
29110
m_Scale: {x: 1, y: 1}
@@ -38,54 +119,138 @@ Material:
38119
m_Offset: {x: 0, y: 0}
39120
m_Ints: []
40121
m_Floats:
122+
- _AORemapMax: 1
123+
- _AORemapMin: 0
124+
- _ATDistance: 1
41125
- _AddPrecomputedVelocity: 0
126+
- _AlbedoAffectEmissive: 0
127+
- _AlphaCutoff: 0.5
42128
- _AlphaCutoffEnable: 0
129+
- _AlphaCutoffPostpass: 0.5
130+
- _AlphaCutoffPrepass: 0.5
131+
- _AlphaCutoffShadow: 0.5
43132
- _AlphaDstBlend: 0
44133
- _AlphaSrcBlend: 1
45134
- _AlphaToMask: 0
46135
- _AlphaToMaskInspectorValue: 0
136+
- _Anisotropy: 0
47137
- _BlendMode: 0
138+
- _CoatMask: 0
48139
- _ConservativeDepthOffsetEnable: 0
49140
- _CullMode: 2
50141
- _CullModeForward: 2
142+
- _Cutoff: 0.5
51143
- _DepthOffsetEnable: 0
144+
- _DetailAlbedoScale: 1
145+
- _DetailNormalScale: 1
146+
- _DetailSmoothnessScale: 1
147+
- _DiffusionProfile: 0
148+
- _DiffusionProfileHash: 0
149+
- _DisplacementLockObjectScale: 1
150+
- _DisplacementLockTilingScale: 1
151+
- _DisplacementMode: 0
52152
- _DoubleSidedEnable: 0
53153
- _DoubleSidedGIMode: 0
54154
- _DoubleSidedNormalMode: 2
55155
- _DstBlend: 0
56156
- _Emission_Intensity: 14.43
157+
- _EmissiveColorMode: 1
158+
- _EmissiveExposureWeight: 1
159+
- _EmissiveIntensity: 1200
160+
- _EmissiveIntensityUnit: 0
57161
- _EnableBlendModePreserveSpecularLighting: 0
58162
- _EnableFogOnTransparent: 1
163+
- _EnableGeometricSpecularAA: 0
164+
- _EnergyConservingSpecularColor: 1
165+
- _HeightAmplitude: 0.02
166+
- _HeightCenter: 0.5
167+
- _HeightMapParametrization: 0
168+
- _HeightMax: 1
169+
- _HeightMin: -1
170+
- _HeightOffset: 0
171+
- _HeightPoMAmplitude: 2
172+
- _HeightTessAmplitude: 2
173+
- _HeightTessCenter: 0.5
174+
- _InvTilingScale: 1
175+
- _Ior: 1.5
176+
- _IridescenceMask: 1
177+
- _IridescenceThickness: 1
178+
- _LinkDetailsWithBase: 1
179+
- _MaterialID: 1
180+
- _Metallic: 0
181+
- _MetallicRemapMax: 1
182+
- _MetallicRemapMin: 0
183+
- _NormalMapSpace: 0
184+
- _NormalScale: 1
59185
- _OpaqueCullMode: 2
186+
- _PPDLodThreshold: 5
187+
- _PPDMaxSamples: 15
188+
- _PPDMinSamples: 5
189+
- _PPDPrimitiveLength: 1
190+
- _PPDPrimitiveWidth: 1
191+
- _RayTracing: 0
192+
- _ReceivesSSR: 1
193+
- _ReceivesSSRTransparent: 0
194+
- _RefractionModel: 0
60195
- _RenderQueueType: 1
196+
- _Smoothness: 0.5
197+
- _SmoothnessRemapMax: 1
198+
- _SmoothnessRemapMin: 0
199+
- _SpecularAAScreenSpaceVariance: 0.1
200+
- _SpecularAAThreshold: 0.2
201+
- _SpecularOcclusionMode: 1
61202
- _SrcBlend: 1
62203
- _StencilRef: 0
63-
- _StencilRefDepth: 0
204+
- _StencilRefDepth: 8
64205
- _StencilRefDistortionVec: 4
65-
- _StencilRefGBuffer: 2
66-
- _StencilRefMV: 32
206+
- _StencilRefGBuffer: 10
207+
- _StencilRefMV: 40
67208
- _StencilWriteMask: 6
68209
- _StencilWriteMaskDepth: 8
69210
- _StencilWriteMaskDistortionVec: 4
70211
- _StencilWriteMaskGBuffer: 14
71212
- _StencilWriteMaskMV: 40
213+
- _SubsurfaceMask: 1
214+
- _SupportDecals: 1
72215
- _SurfaceType: 0
216+
- _TexWorldScale: 1
217+
- _TexWorldScaleEmissive: 1
218+
- _Thickness: 1
219+
- _TransmissionEnable: 1
73220
- _TransparentBackfaceEnable: 0
74221
- _TransparentCullMode: 2
75222
- _TransparentDepthPostpassEnable: 0
76223
- _TransparentDepthPrepassEnable: 0
77224
- _TransparentSortPriority: 0
78225
- _TransparentWritingMotionVec: 0
79226
- _TransparentZWrite: 0
227+
- _UVBase: 0
228+
- _UVDetail: 0
229+
- _UVEmissive: 0
230+
- _UseEmissiveIntensity: 1
80231
- _UseShadowThreshold: 0
81232
- _ZTestDepthEqualForOpaque: 3
82233
- _ZTestGBuffer: 4
83234
- _ZTestTransparent: 4
84235
- _ZWrite: 1
85236
m_Colors:
237+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
238+
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
239+
- _Color: {r: 1, g: 1, b: 1, a: 1}
240+
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
86241
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
87242
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
88243
- _Emission_Color: {r: 1, g: 0.92501426, b: 0.7122642, a: 1}
244+
- _EmissiveColor: {r: 1200, g: 1171.4609, b: 699.89813, a: 1200}
245+
- _EmissiveColorLDR: {r: 1, g: 0.9894721, b: 0.7877358, a: 1}
246+
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
247+
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
248+
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
249+
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
250+
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
251+
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
252+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
253+
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
89254
m_BuildTextureStacks: []
90255
--- !u!114 &2587545780360812095
91256
MonoBehaviour:

0 commit comments

Comments
 (0)