diff --git a/Assets/Prefabs/SHADER_VOLUME.prefab b/Assets/Prefabs/SHADER_VOLUME.prefab index ee43ea6..8595257 100644 --- a/Assets/Prefabs/SHADER_VOLUME.prefab +++ b/Assets/Prefabs/SHADER_VOLUME.prefab @@ -45,7 +45,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IsGlobal: 1 - priority: 0 + priority: 1 blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: c3b45ae649e3364408bb0986304f0649, type: 2} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 4c62480..777f69e 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -540,7 +540,7 @@ Camera: field of view: 60 orthographic: 0 orthographic size: 5 - m_Depth: -1 + m_Depth: 1 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -616,7 +616,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IsGlobal: 1 - priority: 0 + priority: 1 blendDistance: 0 weight: 1 sharedProfile: {fileID: 11400000, guid: c3b45ae649e3364408bb0986304f0649, type: 2} diff --git a/Assets/Scenes/Volume/crtVolme.asset b/Assets/Scenes/Volume/crtVolme.asset index 8ca1048..e30f2c0 100644 --- a/Assets/Scenes/Volume/crtVolme.asset +++ b/Assets/Scenes/Volume/crtVolme.asset @@ -17,22 +17,6 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 0 ---- !u!114 &-4700976073357303510 -MonoBehaviour: - m_ObjectHideFlags: 3 - 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: 2dce45078901e8743bb35a183fe9b463, type: 3} - m_Name: CustomEffectComponent - m_EditorClassIdentifier: - active: 1 - intensity: - m_OverrideState: 1 - m_Value: 1 --- !u!114 &-4031894175476099154 MonoBehaviour: m_ObjectHideFlags: 3 @@ -62,7 +46,7 @@ MonoBehaviour: m_Name: crtVolme m_EditorClassIdentifier: components: - - {fileID: -4700976073357303510} + - {fileID: 4398727553444423296} --- !u!114 &1967504787037751920 MonoBehaviour: m_ObjectHideFlags: 3 @@ -96,3 +80,19 @@ MonoBehaviour: intensity: m_OverrideState: 1 m_Value: 1 +--- !u!114 &4398727553444423296 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 2dce45078901e8743bb35a183fe9b463, type: 3} + m_Name: CustomEffectComponent + m_EditorClassIdentifier: + active: 1 + intensity: + m_OverrideState: 1 + m_Value: 0.96 diff --git a/Assets/Settings/URP-Balanced-Renderer.asset b/Assets/Settings/URP-Balanced-Renderer.asset index 20bd4d4..e61c312 100644 --- a/Assets/Settings/URP-Balanced-Renderer.asset +++ b/Assets/Settings/URP-Balanced-Renderer.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: SSAO m_EditorClassIdentifier: m_Active: 1 - m_Shader: {fileID: 0} + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} m_Settings: Downsample: 1 AfterOpaque: 0 @@ -40,9 +40,11 @@ MonoBehaviour: type: 3} m_RendererFeatures: - {fileID: -1878332245247344467} - m_RendererFeatureMap: adc0de57c6d2eee5 + - {fileID: 8085504866986450578} + m_RendererFeatureMap: adc0de57c6d2eee5925e6b72d67b3570 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} @@ -51,10 +53,14 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + m_AssetVersion: 1 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -74,3 +80,17 @@ MonoBehaviour: m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 + m_IntermediateTextureMode: 1 +--- !u!114 &8085504866986450578 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: e4a5752e025fc3d4c98d3aad409aac42, type: 3} + m_Name: CustomPostProcessRenderer + m_EditorClassIdentifier: + m_Active: 1 diff --git a/Assets/Settings/URP-HighFidelity-Renderer.asset b/Assets/Settings/URP-HighFidelity-Renderer.asset index 5533c98..325db65 100644 --- a/Assets/Settings/URP-HighFidelity-Renderer.asset +++ b/Assets/Settings/URP-HighFidelity-Renderer.asset @@ -42,7 +42,7 @@ MonoBehaviour: - {fileID: -1878332245247344467} - {fileID: 7294651837198521499} m_RendererFeatureMap: adc0de57c6d2eee59b545e7c32cf3b65 - m_UseNativeRenderPass: 0 + m_UseNativeRenderPass: 1 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: diff --git a/Assets/Settings/URP-HighFidelity.asset b/Assets/Settings/URP-HighFidelity.asset index 40e1106..2d001b3 100644 --- a/Assets/Settings/URP-HighFidelity.asset +++ b/Assets/Settings/URP-HighFidelity.asset @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_StoreActionsOptimization: 0 m_SupportsHDR: 1 - m_MSAA: 4 + m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 @@ -61,7 +61,7 @@ MonoBehaviour: m_SupportsLightLayers: 0 m_DebugLevel: 0 m_UseAdaptivePerformance: 1 - m_ColorGradingMode: 0 + m_ColorGradingMode: 1 m_ColorGradingLutSize: 32 m_UseFastSRGBLinearConversion: 0 m_ShadowType: 1 diff --git a/Assets/Settings/URP-Performant-Renderer.asset b/Assets/Settings/URP-Performant-Renderer.asset index 56c53f0..f5db854 100644 --- a/Assets/Settings/URP-Performant-Renderer.asset +++ b/Assets/Settings/URP-Performant-Renderer.asset @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6378745591178501688 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: e4a5752e025fc3d4c98d3aad409aac42, type: 3} + m_Name: CustomPostProcessRenderer + m_EditorClassIdentifier: + m_Active: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15,10 +28,12 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: + m_RendererFeatures: + - {fileID: -6378745591178501688} + m_RendererFeatureMap: c861374dae247aa7 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} shaders: blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} @@ -27,10 +42,14 @@ MonoBehaviour: stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} - coreBlitPS: {fileID: 0} - coreBlitColorAndDepthPS: {fileID: 0} - cameraMotionVector: {fileID: 0} - objectMotionVector: {fileID: 0} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, + type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, + type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, + type: 3} + m_AssetVersion: 1 m_OpaqueLayerMask: serializedVersion: 2 m_Bits: 4294967295 @@ -50,3 +69,4 @@ MonoBehaviour: m_AccurateGbufferNormals: 0 m_ClusteredRendering: 0 m_TileSize: 32 + m_IntermediateTextureMode: 1 diff --git a/Assets/Shaders/CRTMaterialShaderFixed.mat b/Assets/Shaders/CRTMaterialShaderFixed.mat index db37cac..72b3b79 100644 --- a/Assets/Shaders/CRTMaterialShaderFixed.mat +++ b/Assets/Shaders/CRTMaterialShaderFixed.mat @@ -105,7 +105,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Intensity: 1 + - _Intensity: 0.96 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 @@ -118,24 +118,24 @@ Material: - _Surface: 0 - _WorkflowMode: 1 - _ZWrite: 1 - - u_bend: 4.84 + - u_bend: 4.03 - u_blue_offset_y: 0.0021 - u_green_offset_y: 0 - u_noise_amount: 0.0154 - u_noise_size: 417 - - u_red_offset_y: -0.0021 + - u_red_offset_y: -0.0024 - u_scanlin_transparence1: 0.005 - u_scanlin_transparence2: 0.005 - - u_scanline_amount: 0.178 + - u_scanline_amount: 0.143 - u_scanline_size_1: 277 - u_scanline_size_2: 521 - u_scanline_speed_1: 1569.4 - u_scanline_speed_2: 76.6 - - u_space_bend: 2 + - u_space_bend: 1.993 - u_time: 5.1 - - u_vignette_edge_round: 6 - - u_vignette_size: 1.81 - - u_vignette_smoothness: 0.51 + - u_vignette_edge_round: 11.6 + - u_vignette_size: 1.95 + - u_vignette_smoothness: 0.82 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6238eb7..f101af3 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -95,7 +95,7 @@ QualitySettings: skinWeights: 255 textureQuality: 0 anisotropicTextures: 2 - antiAliasing: 4 + antiAliasing: 0 softParticles: 0 softVegetation: 1 realtimeReflectionProbes: 1 @@ -120,9 +120,9 @@ QualitySettings: m_PerPlatformDefaultQuality: Android: 1 CloudRendering: 2 - Lumin: 2 GameCoreScarlett: 2 GameCoreXboxOne: 2 + Lumin: 2 Nintendo Switch: 2 PS4: 2 PS5: 2