Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change urp grading mode to hdr #73

Merged
merged 5 commits into from
Dec 7, 2022
Merged

Change urp grading mode to hdr #73

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcc7543
Switch grading mode to HDR
chrispope Dec 3, 2022
550dea4
Changed post processing settings to account for HDR, also changed col…
jilfranco-unity Dec 5, 2022
8f4f01d
a couple more tiny color edits to the pick up materials
jilfranco-unity Dec 5, 2022
d2d1147
Merge branch 'develop' into Change-urp-grading-mode-to-HDR
chrispope Dec 6, 2022
9d385ee
Merge branch 'develop' into Change-urp-grading-mode-to-HDR
jilfranco-unity Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Basic/ClientDriven/Assets/Materials/DarkGray_02.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Material:
- _ZWrite: 1
- _ZWriteControl: 0
m_Colors:
- _Base_Color: {r: 0.034423035, g: 0, b: 0.17899999, a: 1}
- _Base_Color: {r: 0.068447985, g: 0.05106, b: 0.138, a: 1}
- _Color: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
Expand Down
9 changes: 5 additions & 4 deletions Basic/ClientDriven/Assets/Materials/Gradient.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,15 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.477
- _GlossyReflections: 0
- _Gradient_Emissive_Strength: 11.64
- _Gradient_Emissive_Strength: 2.47
- _Gradient_Height: 0.91
- _Gradient_Height_Add: 2.78
- _Gradient_Height_Multiply: 4.37
- _Gradient_Height_Add: 6.28
- _Gradient_Height_Multiply: -3.31
- _Grid_Normal_Strength: 1.93
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 0
- _Opacity: 0.48
- _Parallax: 0.02
- _QueueControl: 0
- _QueueOffset: 0
Expand All @@ -187,7 +188,7 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _Emissive_Color: {r: 0, g: 0.31666684, b: 1, a: 0}
- _Gradient_Color: {r: 0.0991911, g: 0.058823526, b: 1, a: 0}
- _Gradient_Color: {r: 0.61821043, g: 0.597, b: 1, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling_and_Offset: {r: 1, g: 1, b: 0, a: 0}
Expand Down
2 changes: 1 addition & 1 deletion Basic/ClientDriven/Assets/Materials/Gray.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Material:
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Base_Color: {r: 0.47126138, g: 0.426, b: 0.75, a: 0}
- _Base_Color: {r: 0.64274037, g: 0.623739, b: 0.77099997, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
Expand Down
2 changes: 1 addition & 1 deletion Basic/ClientDriven/Assets/Materials/Gray_02.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Material:
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Base_Color: {r: 0.23627616, g: 0.16470592, b: 0.4392157, a: 0}
- _Base_Color: {r: 0.33546042, g: 0.2995451, b: 0.4392157, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
Expand Down
6 changes: 3 additions & 3 deletions Basic/ClientDriven/Assets/Materials/GridDark.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Material:
- Boolean_35A71344: 0
- Boolean_7A5F3F39: 1
- Boolean_7AC8D832: 1
- Vector1_3402D67A: 0.31
- Vector1_3402D67A: 0.5
- Vector1_3655428E: 0.98
- Vector1_5B05FA1F: 0
- Vector1_6B67A8FF: -50
Expand Down Expand Up @@ -175,8 +175,8 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_2B671050: {r: 0.13850757, g: 0.09508201, b: 0.318, a: 1}
- Color_30A0CA2F: {r: 0.19082457, g: 0.13274999, b: 0.53099996, a: 1}
- Color_2B671050: {r: 0.22510593, g: 0.20297648, b: 0.31764707, a: 1}
- Color_30A0CA2F: {r: 0.50897586, g: 0.37299997, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Base_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
6 changes: 3 additions & 3 deletions Basic/ClientDriven/Assets/Materials/GridDarkest.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Material:
- Boolean_35A71344: 0
- Boolean_7A5F3F39: 1
- Boolean_7AC8D832: 1
- Vector1_3402D67A: 0.31
- Vector1_3402D67A: 0.5
- Vector1_3655428E: 0.67
- Vector1_5B05FA1F: 0
- Vector1_6B67A8FF: -50
Expand Down Expand Up @@ -175,8 +175,8 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_2B671050: {r: 0.01460869, g: 0.003652173, b: 0.042, a: 0}
- Color_30A0CA2F: {r: 0.19082457, g: 0.13274999, b: 0.53099996, a: 1}
- Color_2B671050: {r: 0.029247062, g: 0.023294117, b: 0.043137256, a: 0}
- Color_30A0CA2F: {r: 0.50897586, g: 0.37299997, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Base_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
10 changes: 5 additions & 5 deletions Basic/ClientDriven/Assets/Materials/GridLight.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,15 @@ Material:
- Boolean_35A71344: 0
- Boolean_7A5F3F39: 1
- Boolean_7AC8D832: 1
- Vector1_3402D67A: 0.31
- Vector1_3402D67A: 0.5
- Vector1_3655428E: 0.98
- Vector1_5B05FA1F: 0
- Vector1_6B67A8FF: -50
- Vector1_7810F718: 0.424
- Vector1_7810F718: 1
- Vector1_B6126E6E: 0
- Vector1_CA7D5F3: 13.75
- Vector1_D5FBE925: 3.48
- Vector1_F2A922B4: 1
- Vector1_F2A922B4: 1.48
- Vector1_F5FD9210: 34.1
- _AlphaClip: 0
- _Blend: 0
Expand Down Expand Up @@ -175,8 +175,8 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- Color_2B671050: {r: 0.8353805, g: 0.767, b: 1, a: 0}
- Color_30A0CA2F: {r: 0.19082457, g: 0.13274999, b: 0.53099996, a: 1}
- Color_2B671050: {r: 0.94225854, g: 0.9044392, b: 0.99607843, a: 0}
- Color_30A0CA2F: {r: 0.50897586, g: 0.37299997, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Base_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
4 changes: 2 additions & 2 deletions Basic/ClientDriven/Assets/Materials/GridMed.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ Material:
- Boolean_35A71344: 0
- Boolean_7A5F3F39: 1
- Boolean_7AC8D832: 1
- Vector1_3402D67A: 0.31
- Vector1_3402D67A: 0.5
- Vector1_3655428E: 0.67
- Vector1_5B05FA1F: 0
- Vector1_6B67A8FF: -50
Expand Down Expand Up @@ -176,7 +176,7 @@ Material:
- _ZWrite: 1
m_Colors:
- Color_2B671050: {r: 0.27931342, g: 0.253847, b: 0.517, a: 0}
- Color_30A0CA2F: {r: 0.19082457, g: 0.13274999, b: 0.53099996, a: 1}
- Color_30A0CA2F: {r: 0.50897586, g: 0.37299997, b: 1, a: 1}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _Base_Color: {r: 1, g: 1, b: 1, a: 1}
Expand Down
8 changes: 4 additions & 4 deletions Basic/ClientDriven/Assets/Materials/PickupBlue.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,14 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EmissiveGlowSpeed: 3
- _EmissiveGlowStrength: 2
- _EmissiveGlowStrength: 3
- _Fresnel_Emissive_Strength: 1.25
- _Fresnel_Opacity: 2.18
- _Fresnel_Power: 1.05
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Main_Emissive_Strength: 2.04
- _Main_Emissive_Strength: 4.8
- _Main_Opacity: 0.4
- _Metallic: 0
- _Mode: 3
Expand All @@ -127,6 +127,6 @@ Material:
m_Colors:
- _Color: {r: 0, g: 0.5652962, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Fresnel_Color: {r: 0, g: 0.07563019, b: 1, a: 1}
- _Main_Pickup_Color: {r: 0.02352941, g: 0.25137278, b: 1, a: 1}
- _Fresnel_Color: {r: 0, g: 0.29999995, b: 1, a: 1}
- _Main_Pickup_Color: {r: 0.02352941, g: 0.33923388, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 4 additions & 4 deletions Basic/ClientDriven/Assets/Materials/PickupPurple.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _EmissiveGlowSpeed: 2.5
- _EmissiveGlowStrength: 1.64
- _EmissiveGlowStrength: 8.29
- _Fresnel_Emissive_Strength: 1.25
- _Fresnel_Opacity: 2.55
- _Fresnel_Power: 1.05
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Main_Emissive_Strength: 1.71
- _Main_Emissive_Strength: 1.4
- _Main_Opacity: -0.87
- _Metallic: 0
- _Mode: 0
Expand All @@ -114,8 +114,8 @@ Material:
m_Colors:
- _Color: {r: 0.80116653, g: 0, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Fresnel_Color: {r: 0.120326504, g: 0.090196066, b: 0.30588236, a: 0}
- _Main_Pickup_Color: {r: 0.3408963, g: 0.28018868, b: 0.495, a: 0}
- _Fresnel_Color: {r: 0.16933, g: 0.16933, b: 0.41, a: 0}
- _Main_Pickup_Color: {r: 0.4465828, g: 0.39582747, b: 0.5803922, a: 0}
m_BuildTextureStacks: []
--- !u!114 &4439061200948001316
MonoBehaviour:
Expand Down
6 changes: 3 additions & 3 deletions Basic/ClientDriven/Assets/Materials/PickupRed.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Material:
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Main_Emissive_Strength: 1.77
- _Main_Emissive_Strength: 1.22
- _Main_Opacity: 0.4
- _Metallic: 0
- _Mode: 0
Expand All @@ -114,8 +114,8 @@ Material:
m_Colors:
- _Color: {r: 1, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Fresnel_Color: {r: 0.25490198, g: 0, b: 0.053317934, a: 1}
- _Main_Pickup_Color: {r: 0.4117647, g: 0.07058823, b: 0.13039781, a: 1}
- _Fresnel_Color: {r: 0.4745098, g: 0, b: 0.2570247, a: 1}
- _Main_Pickup_Color: {r: 0.6156863, g: 0, b: 0.24826066, a: 1}
m_BuildTextureStacks: []
--- !u!114 &2715421772106534400
MonoBehaviour:
Expand Down
6 changes: 3 additions & 3 deletions Basic/ClientDriven/Assets/Materials/Skybox.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AtmosphereThickness: 0.47
- _AtmosphereThickness: 0.65
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 4.17
- _Exposure: 2.51
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
Expand All @@ -83,6 +83,6 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _GroundColor: {r: 0.3728888, g: 0.30669805, b: 0.5019608, a: 1}
- _GroundColor: {r: 0.31676742, g: 0.2213647, b: 0.5019608, a: 1}
- _SkyTint: {r: 0.69307065, g: 0.41299412, b: 0.807, a: 1}
m_BuildTextureStacks: []
2 changes: 1 addition & 1 deletion Basic/ClientDriven/Assets/Materials/White.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Material:
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Base_Color: {r: 0.8352941, g: 0.76862746, b: 1, a: 0}
- _Base_Color: {r: 0.90761423, g: 0.8496549, b: 0.99607843, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
Expand Down
135 changes: 135 additions & 0 deletions Basic/ClientDriven/Assets/Materials/White_02.mat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: White_02
m_Shader: {fileID: -6465566751694194690, guid: ca58319a8d28b4743ac79e9d48635f5c, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Base_Texture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _Blend: 0
- _BumpScale: 1
- _CastShadows: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZTest: 4
- _ZWrite: 1
- _ZWriteControl: 0
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Base_Color: {r: 1.8110893, g: 1.7386457, b: 1.9766746, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: []
--- !u!114 &6087303183906255408
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
8 changes: 8 additions & 0 deletions Basic/ClientDriven/Assets/Materials/White_02.mat.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.