From 4dc698f1449990e5c5cc2ec6757a3588a8f9f4c2 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Sat, 29 Jun 2024 15:24:32 +0100 Subject: [PATCH 1/2] Add PPv2 and configure AO --- Assets/PostProcessing.meta | 8 ++ .../ID_Camera (eye) Profile.asset | 65 +++++++++++ .../ID_Camera (eye) Profile.asset.meta | 8 ++ Assets/Prefabs/CameraRig.prefab | 106 +++++++++++++----- Packages/manifest.json | 1 + Packages/packages-lock.json | 9 ++ ProjectSettings/ProjectSettings.asset | 16 ++- 7 files changed, 183 insertions(+), 30 deletions(-) create mode 100644 Assets/PostProcessing.meta create mode 100644 Assets/PostProcessing/ID_Camera (eye) Profile.asset create mode 100644 Assets/PostProcessing/ID_Camera (eye) Profile.asset.meta diff --git a/Assets/PostProcessing.meta b/Assets/PostProcessing.meta new file mode 100644 index 00000000..1ff90a3e --- /dev/null +++ b/Assets/PostProcessing.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5009fe14ede5ee04088b4a15df5f424d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PostProcessing/ID_Camera (eye) Profile.asset b/Assets/PostProcessing/ID_Camera (eye) Profile.asset new file mode 100644 index 00000000..1e42e3b1 --- /dev/null +++ b/Assets/PostProcessing/ID_Camera (eye) Profile.asset @@ -0,0 +1,65 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3680059828405760202 +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: c1cb7e9e120078f43bce4f0b1be547a7, type: 3} + m_Name: AmbientOcclusion + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + mode: + overrideState: 1 + value: 1 + intensity: + overrideState: 1 + value: 2.21 + color: + overrideState: 0 + value: {r: 0, g: 0, b: 0, a: 1} + ambientOnly: + overrideState: 0 + value: 1 + noiseFilterTolerance: + overrideState: 0 + value: 0 + blurTolerance: + overrideState: 0 + value: -4.6 + upsampleTolerance: + overrideState: 0 + value: -12 + thicknessModifier: + overrideState: 0 + value: 1 + directLightingStrength: + overrideState: 0 + value: 0 + radius: + overrideState: 0 + value: 0.25 + quality: + overrideState: 0 + value: 2 +--- !u!114 &11400000 +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: 8e6292b2c06870d4495f009f912b9600, type: 3} + m_Name: ID_Camera (eye) Profile + m_EditorClassIdentifier: + settings: + - {fileID: -3680059828405760202} diff --git a/Assets/PostProcessing/ID_Camera (eye) Profile.asset.meta b/Assets/PostProcessing/ID_Camera (eye) Profile.asset.meta new file mode 100644 index 00000000..f3a8a49e --- /dev/null +++ b/Assets/PostProcessing/ID_Camera (eye) Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1989b8cd21c04c1478823c49ac5df649 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/CameraRig.prefab b/Assets/Prefabs/CameraRig.prefab index d249e9f0..8847a19d 100644 --- a/Assets/Prefabs/CameraRig.prefab +++ b/Assets/Prefabs/CameraRig.prefab @@ -9358,7 +9358,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224991721833942628} - - component: {fileID: 33931078607798932} - component: {fileID: 23400739857238160} - component: {fileID: 222863757601499486} - component: {fileID: 114889146673854390} @@ -9388,14 +9387,6 @@ RectTransform: m_AnchoredPosition: {x: -0.0000049592927, y: 0.51994324} m_SizeDelta: {x: 148.4, y: 32.67} m_Pivot: {x: 0.5, y: 0.5} ---- !u!33 &33931078607798932 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1125421002062496} - m_Mesh: {fileID: 0} --- !u!23 &23400739857238160 MeshRenderer: m_ObjectHideFlags: 0 @@ -29347,6 +29338,8 @@ GameObject: - component: {fileID: 4372130950751408} - component: {fileID: 20010936846075698} - component: {fileID: 124158705867986396} + - component: {fileID: 7092043780209215652} + - component: {fileID: 3326459383624913714} m_Layer: 10 m_Name: ID_Camera (eye) m_TagString: MainCamera @@ -29421,6 +29414,83 @@ Behaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1389873695960628} m_Enabled: 1 +--- !u!114 &7092043780209215652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389873695960628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 4372130950751408} + volumeLayer: + serializedVersion: 2 + m_Bits: 1024 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 1 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] +--- !u!114 &3326459383624913714 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389873695960628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 1989b8cd21c04c1478823c49ac5df649, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 --- !u!1 &1390375767157118 GameObject: m_ObjectHideFlags: 0 @@ -35422,7 +35492,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224353535023853912} - - component: {fileID: 33894183074636898} - component: {fileID: 23779459973462100} - component: {fileID: 222675228110726036} - component: {fileID: 114756877966986152} @@ -35452,14 +35521,6 @@ RectTransform: m_AnchoredPosition: {x: -0.00038269162, y: 0.002600002} m_SizeDelta: {x: 148.4, y: 32.67} m_Pivot: {x: 0.5, y: 0.5} ---- !u!33 &33894183074636898 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1490861234011590} - m_Mesh: {fileID: 0} --- !u!23 &23779459973462100 MeshRenderer: m_ObjectHideFlags: 0 @@ -46856,7 +46917,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224792478581430570} - - component: {fileID: 33180587196729598} - component: {fileID: 23689086375512880} - component: {fileID: 222656296281821840} - component: {fileID: 114302973119263724} @@ -46886,14 +46946,6 @@ RectTransform: m_AnchoredPosition: {x: 0.000000015832484, y: 0.51995945} m_SizeDelta: {x: 148.4, y: 32.67} m_Pivot: {x: 0.5, y: 0.5} ---- !u!33 &33180587196729598 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631856206869138} - m_Mesh: {fileID: 0} --- !u!23 &23689086375512880 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 3bf8bf36..806cbc06 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,6 +3,7 @@ "com.newtonsoft.json": "1.0.1", "com.unity.ide.rider": "1.2.1", "com.unity.ide.vscode": "1.2.5", + "com.unity.postprocessing": "3.1.1", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "2.1.6", "com.unity.timeline": "1.2.18", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 55e63d8a..2ade0c9e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -30,6 +30,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.postprocessing": { + "version": "3.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a34ea6ad..b13ca4be 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -661,13 +661,23 @@ PlayerSettings: webGLThreadsSupport: 0 webGLWasmStreaming: 0 scriptingDefineSymbols: - 1: CROSS_PLATFORM_INPUT;TMP_PRESENT + 1: CROSS_PLATFORM_INPUT;TMP_PRESENT;UNITY_POST_PROCESSING_STACK_V2 4: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT - 14: MOBILE_INPUT + 7: CROSS_PLATFORM_INPUT;MOBILE_INPUT;UNITY_POST_PROCESSING_STACK_V2 + 13: UNITY_POST_PROCESSING_STACK_V2 + 14: MOBILE_INPUT;UNITY_POST_PROCESSING_STACK_V2 17: MOBILE_INPUT + 19: UNITY_POST_PROCESSING_STACK_V2 20: MOBILE_INPUT + 21: UNITY_POST_PROCESSING_STACK_V2 22: MOBILE_INPUT + 25: UNITY_POST_PROCESSING_STACK_V2 + 27: UNITY_POST_PROCESSING_STACK_V2 + 28: UNITY_POST_PROCESSING_STACK_V2 + 29: UNITY_POST_PROCESSING_STACK_V2 + 30: UNITY_POST_PROCESSING_STACK_V2 + 32: UNITY_POST_PROCESSING_STACK_V2 + 33: UNITY_POST_PROCESSING_STACK_V2 platformArchitecture: iPhone: 2 tvOS: 1 From 4ace14af4568d95702eec37d9f5359a78075a958 Mon Sep 17 00:00:00 2001 From: Andy Baker Date: Fri, 12 Jul 2024 09:03:19 +0100 Subject: [PATCH 2/2] Less AO --- Assets/PostProcessing/ID_Camera (eye) Profile.asset | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/PostProcessing/ID_Camera (eye) Profile.asset b/Assets/PostProcessing/ID_Camera (eye) Profile.asset index 1e42e3b1..6143319c 100644 --- a/Assets/PostProcessing/ID_Camera (eye) Profile.asset +++ b/Assets/PostProcessing/ID_Camera (eye) Profile.asset @@ -21,7 +21,7 @@ MonoBehaviour: value: 1 intensity: overrideState: 1 - value: 2.21 + value: 0.75 color: overrideState: 0 value: {r: 0, g: 0, b: 0, a: 1} @@ -44,8 +44,8 @@ MonoBehaviour: overrideState: 0 value: 0 radius: - overrideState: 0 - value: 0.25 + overrideState: 1 + value: 0.05 quality: overrideState: 0 value: 2