Skip to content

Commit 8d44853

Browse files
committed
Asset renaming and adjustment.
Various material adjustments and renaming of inserts.
1 parent 2979b84 commit 8d44853

17 files changed

+529
-55
lines changed

Assets/Art/Materials/Default/Metal/AdjustableWearMetals/Aluminum_AW_Heavy.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,6 @@ Material:
284284
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
285285
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
286286
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
287-
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287+
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
288288
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
289289
m_BuildTextureStacks: []

Assets/Art/Materials/Default/Metal/AdjustableWearMetals/Nickel_AW_Heavy.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ Material:
268268
- _ZTestTransparent: 4
269269
- _ZWrite: 1
270270
m_Colors:
271-
- _BaseColor: {r: 0.827451, g: 0.79607844, b: 0.74509805, a: 1}
271+
- _BaseColor: {r: 0.85800004, g: 0.82546926, b: 0.7726067, a: 1}
272272
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
273-
- _Color: {r: 0.827451, g: 0.79607844, b: 0.74509805, a: 1}
273+
- _Color: {r: 0.85800004, g: 0.82546926, b: 0.7726067, a: 1}
274274
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
275275
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
276276
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Art/Materials/Default/Metal/BaseReferenceMetals/StainlessSteel_Base.mat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ Material:
268268
- _ZTestTransparent: 4
269269
- _ZWrite: 1
270270
m_Colors:
271-
- _BaseColor: {r: 0.64705884, g: 0.64705884, b: 0.6509804, a: 1}
271+
- _BaseColor: {r: 0.8160542, g: 0.8160542, b: 0.821, a: 1}
272272
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
273-
- _Color: {r: 0.64705884, g: 0.64705884, b: 0.6509804, a: 1}
273+
- _Color: {r: 0.8160542, g: 0.8160542, b: 0.821, a: 1}
274274
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
275275
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
276276
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ Material:
283283
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
284284
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
285285
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
286-
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
286+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287287
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
288288
m_BuildTextureStacks: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ Material:
283283
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
284284
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
285285
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
286-
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
286+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287287
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
288288
m_BuildTextureStacks: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ Material:
283283
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
284284
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
285285
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
286-
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
286+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287287
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
288288
m_BuildTextureStacks: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ Material:
283283
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
284284
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
285285
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
286-
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
286+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287287
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
288288
m_BuildTextureStacks: []

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,6 @@ Material:
283283
- _ThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
284284
- _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
285285
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
286-
- _UVMappingMask: {r: 0, g: 0, b: 0, a: 0}
286+
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
287287
- _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0}
288288
m_BuildTextureStacks: []

Assets/Art/Materials/Default/Plastic/HardTransparent/Plastic_Hard_Trans_White.mat

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ Material:
2424
m_PrefabAsset: {fileID: 0}
2525
m_Name: Plastic_Hard_Trans_White
2626
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
27-
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _MATERIAL_FEATURE_SPECULAR_COLOR
28-
_NORMALMAP _NORMALMAP_TANGENT_SPACE _REFRACTION_THIN _SURFACE_TYPE_TRANSPARENT
27+
m_ShaderKeywords: _MASKMAP _MATERIAL_FEATURE_TRANSMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE
28+
_REFRACTION_THIN _SURFACE_TYPE_TRANSPARENT
2929
m_LightmapFlags: 4
3030
m_EnableInstancingVariants: 1
3131
m_DoubleSidedGI: 0
@@ -35,10 +35,9 @@ Material:
3535
disabledShaderPasses:
3636
- DistortionVectors
3737
- MOTIONVECTORS
38-
- TransparentDepthPrepass
38+
- ForwardEmissiveForDeferred
3939
- TransparentDepthPostpass
4040
- RayTracingPrepass
41-
- ForwardEmissiveForDeferred
4241
m_SavedProperties:
4342
serializedVersion: 3
4443
m_TexEnvs:
@@ -272,12 +271,12 @@ Material:
272271
- _HeightTessAmplitude: 2
273272
- _HeightTessCenter: 0.5
274273
- _InvTilingScale: 0.12062726
275-
- _Ior: 1.46
274+
- _Ior: 2.5
276275
- _IridescenceMask: 1
277276
- _IridescenceThickness: 1
278277
- _LinkDetailsWithBase: 1
279278
- _MappingMode: 0
280-
- _MaterialID: 4
279+
- _MaterialID: 5
281280
- _Metallic: 0
282281
- _MetallicRemapMax: 0
283282
- _MetallicRemapMin: 0
@@ -292,7 +291,7 @@ Material:
292291
- _PlanarSpace: 0
293292
- _RayTracing: 0
294293
- _ReceivesSSR: 1
295-
- _ReceivesSSRTransparent: 0
294+
- _ReceivesSSRTransparent: 1
296295
- _RefractionModel: 3
297296
- _SSRefractionProjectionModel: 0
298297
- _SVBRDF_BRDFType: 1
@@ -301,16 +300,16 @@ Material:
301300
- _SVBRDF_SpecularLobeMapScale: 1
302301
- _Smoothness: 0.907
303302
- _SmoothnessRemapMax: 1
304-
- _SmoothnessRemapMin: 0.43594652
303+
- _SmoothnessRemapMin: 0.4934081
305304
- _SpecularAAScreenSpaceVariance: 0.1
306305
- _SpecularAAThreshold: 0.2
307306
- _SpecularOcclusionMode: 1
308307
- _SrcBlend: 1
309308
- _StencilRef: 0
310-
- _StencilRefDepth: 0
309+
- _StencilRefDepth: 8
311310
- _StencilRefDistortionVec: 4
312-
- _StencilRefGBuffer: 2
313-
- _StencilRefMV: 32
311+
- _StencilRefGBuffer: 10
312+
- _StencilRefMV: 40
314313
- _StencilWriteMask: 6
315314
- _StencilWriteMaskDepth: 8
316315
- _StencilWriteMaskDistortionVec: 4
@@ -321,7 +320,7 @@ Material:
321320
- _SurfaceType: 1
322321
- _TexWorldScale: 1.45
323322
- _TexWorldScaleEmissive: 1
324-
- _Thickness: 0.1
323+
- _Thickness: 0.059
325324
- _TransmissionEnable: 1
326325
- _TransparentBackfaceEnable: 1
327326
- _TransparentCullMode: 2
@@ -341,15 +340,15 @@ Material:
341340
- _ZTestTransparent: 4
342341
- _ZWrite: 0
343342
m_Colors:
344-
- _BaseColor: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 0.20784314}
343+
- _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 0.28235295}
345344
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
346345
- _CarPaint2_BRDFColorMapUVScale: {r: 1, g: 1, b: 0, a: 0}
347346
- _CarPaint2_BTFFlakeMap_SO: {r: 1, g: 1, b: 0, a: 0}
348347
- _CarPaint2_CTCoeffs: {r: 1, g: 1, b: 1, a: 0}
349348
- _CarPaint2_CTF0s: {r: 1, g: 1, b: 1, a: 0}
350349
- _CarPaint2_CTSpreads: {r: 1, g: 1, b: 1, a: 0}
351350
- _ClearcoatNormalMap_SO: {r: 1, g: 1, b: 0, a: 0}
352-
- _Color: {r: 0.9339623, g: 0.9339623, b: 0.9339623, a: 0.20784314}
351+
- _Color: {r: 0.8, g: 0.8, b: 0.8, a: 0.28235295}
353352
- _DiffusionProfileAsset: {r: -1.0489695e-36, g: -3.621176e-36, b: 9.418237e-25, a: 6.583603e+19}
354353
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
355354
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

Assets/Art/Materials/Inserts/InsertArrow2In_Yellow.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ Material:
187187
- _HeightTessAmplitude: 2
188188
- _HeightTessCenter: 0.5
189189
- _InvTilingScale: 1
190-
- _Ior: 1.485
190+
- _Ior: 1.331
191191
- _IridescenceMask: 1
192192
- _IridescenceThickness: 0.255
193193
- _LinkDetailsWithBase: 1
@@ -196,7 +196,7 @@ Material:
196196
- _MetallicRemapMax: 1
197197
- _MetallicRemapMin: 0
198198
- _NormalMapSpace: 0
199-
- _NormalScale: 1.4
199+
- _NormalScale: 1.5
200200
- _OpaqueCullMode: 2
201201
- _PPDLodThreshold: 5
202202
- _PPDMaxSamples: 15
@@ -257,7 +257,7 @@ Material:
257257
- _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
258258
- _IridescenceThicknessRemap: {r: 0, g: 1, b: 0, a: 0}
259259
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
260-
- _ThicknessRemap: {r: 0, g: 0.07739218, b: 0, a: 0}
260+
- _ThicknessRemap: {r: 0, g: 0.05897598, b: 0, a: 0}
261261
- _TransmittanceColor: {r: 1, g: 0.85633945, b: 0, a: 1}
262262
- _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
263263
- _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

0 commit comments

Comments
 (0)