From a220ab979930fc9f503d88baf4d29f089897a467 Mon Sep 17 00:00:00 2001 From: ntr Date: Tue, 3 Oct 2023 20:38:56 +1100 Subject: [PATCH] blur and lighting --- Assets/Rendering/BlurVolume Profile.asset | 2 - Assets/Rendering/MenuVolume.asset | 62 +++++++++++++ Assets/Rendering/MenuVolume.asset.meta | 8 ++ Assets/Rendering/URP.asset | 22 ++++- Assets/Rendering/URPAsset.asset | 2 +- ...niversalRenderPipelineGlobalSettings.asset | 2 +- Assets/Scenes/msg_blackstar.unity | 85 ++---------------- Assets/Scenes/sr_alpha_centaurus.unity | 4 + Assets/Scenes/sr_junglism2.unity | 4 + Assets/Scenes/sr_pascal.unity | 4 + Assets/Scenes/sr_sfz/LightingData.asset | Bin 18192 -> 18192 bytes Assets/Scenes/sr_sfz/SpaSkyboxCube.mat | 2 +- Assets/Scenes/sr_silverstorage.unity | 4 + Packages/manifest.json | 1 + Packages/packages-lock.json | 10 +++ ProjectSettings/GraphicsSettings.asset | 2 +- ProjectSettings/ProjectSettings.asset | 0 ProjectSettings/QualitySettings.asset | 2 +- 18 files changed, 131 insertions(+), 85 deletions(-) create mode 100644 Assets/Rendering/MenuVolume.asset create mode 100644 Assets/Rendering/MenuVolume.asset.meta mode change 100755 => 100644 Assets/Scenes/sr_alpha_centaurus.unity mode change 100755 => 100644 Assets/Scenes/sr_junglism2.unity mode change 100755 => 100644 Assets/Scenes/sr_silverstorage.unity mode change 100755 => 100644 ProjectSettings/ProjectSettings.asset mode change 100755 => 100644 ProjectSettings/QualitySettings.asset diff --git a/Assets/Rendering/BlurVolume Profile.asset b/Assets/Rendering/BlurVolume Profile.asset index 7eb1cc0..d5f9a38 100644 --- a/Assets/Rendering/BlurVolume Profile.asset +++ b/Assets/Rendering/BlurVolume Profile.asset @@ -30,8 +30,6 @@ MonoBehaviour: m_EditorClassIdentifier: components: - {fileID: 1198423244784227193} - - {fileID: -2883599012407652817} - - {fileID: 622347435305072226} --- !u!114 &622347435305072226 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/Rendering/MenuVolume.asset b/Assets/Rendering/MenuVolume.asset new file mode 100644 index 0000000..b42f821 --- /dev/null +++ b/Assets/Rendering/MenuVolume.asset @@ -0,0 +1,62 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5862707208502833326 +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: c01700fd266d6914ababb731e09af2eb, type: 3} + m_Name: DepthOfField + m_EditorClassIdentifier: + active: 0 + mode: + m_OverrideState: 1 + m_Value: 2 + gaussianStart: + m_OverrideState: 0 + m_Value: 10 + gaussianEnd: + m_OverrideState: 0 + m_Value: 30 + gaussianMaxRadius: + m_OverrideState: 0 + m_Value: 1 + highQualitySampling: + m_OverrideState: 0 + m_Value: 0 + focusDistance: + m_OverrideState: 1 + m_Value: 0.14 + aperture: + m_OverrideState: 0 + m_Value: 5.6 + focalLength: + m_OverrideState: 0 + m_Value: 50 + bladeCount: + m_OverrideState: 0 + m_Value: 5 + bladeCurvature: + m_OverrideState: 0 + m_Value: 1 + bladeRotation: + m_OverrideState: 0 + m_Value: 0 +--- !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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: MenuVolume + m_EditorClassIdentifier: + components: + - {fileID: -5862707208502833326} diff --git a/Assets/Rendering/MenuVolume.asset.meta b/Assets/Rendering/MenuVolume.asset.meta new file mode 100644 index 0000000..67f5110 --- /dev/null +++ b/Assets/Rendering/MenuVolume.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbfcb35fcfd2a413db1ce3f0174dd1e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Rendering/URP.asset b/Assets/Rendering/URP.asset index 56521e3..7177348 100644 --- a/Assets/Rendering/URP.asset +++ b/Assets/Rendering/URP.asset @@ -14,6 +14,23 @@ MonoBehaviour: m_EditorClassIdentifier: m_Active: 1 shader: {fileID: 4800000, guid: a8806b096c701424f865bdd5e4b76928, type: 3} +--- !u!114 &-8224620987732954696 +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: 6d613f08f173d4dd895bb07b3230baa9, type: 3} + m_Name: FullScreenPassRendererFeature + m_EditorClassIdentifier: + m_Active: 1 + passMaterial: {fileID: 2100000, guid: 78a08787ca30045abb69f6f7dd878e09, type: 2} + injectionPoint: 600 + requirements: 4 + passIndex: 0 --- !u!114 &-8214219660811744041 MonoBehaviour: m_ObjectHideFlags: 0 @@ -57,8 +74,9 @@ MonoBehaviour: debugShaders: debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} - m_RendererFeatures: [] - m_RendererFeatureMap: + m_RendererFeatures: + - {fileID: -8224620987732954696} + m_RendererFeatureMap: b871f49dc946dc8d m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} diff --git a/Assets/Rendering/URPAsset.asset b/Assets/Rendering/URPAsset.asset index 308160f..c83c946 100644 --- a/Assets/Rendering/URPAsset.asset +++ b/Assets/Rendering/URPAsset.asset @@ -25,7 +25,7 @@ MonoBehaviour: m_SupportsTerrainHoles: 1 m_SupportsHDR: 1 m_HDRColorBufferPrecision: 0 - m_MSAA: 2 + m_MSAA: 1 m_RenderScale: 1 m_UpscalingFilter: 0 m_FsrOverrideSharpness: 0 diff --git a/Assets/Rendering/UniversalRenderPipelineGlobalSettings.asset b/Assets/Rendering/UniversalRenderPipelineGlobalSettings.asset index 44ea320..f772c01 100644 --- a/Assets/Rendering/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Rendering/UniversalRenderPipelineGlobalSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ec995e51a6e251468d2a3fd8a686257, type: 3} m_Name: UniversalRenderPipelineGlobalSettings m_EditorClassIdentifier: - m_ShaderVariantLogLevel: 0 + m_ShaderVariantLogLevel: 2 m_ExportShaderVariants: 1 k_AssetVersion: 3 m_RenderingLayerNames: diff --git a/Assets/Scenes/msg_blackstar.unity b/Assets/Scenes/msg_blackstar.unity index 9cf40a8..3fb92f9 100644 --- a/Assets/Scenes/msg_blackstar.unity +++ b/Assets/Scenes/msg_blackstar.unity @@ -123,55 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &52048083 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 52048085} - - component: {fileID: 52048084} - m_Layer: 0 - m_Name: Global Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &52048084 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52048083} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: 2cc94c0bac3e5054595b7d263cd0deb8, type: 2} ---- !u!4 &52048085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 52048083} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 977.23474, y: -165.7302, z: -2086.4595} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &183545438 GameObject: m_ObjectHideFlags: 0 @@ -291,6 +242,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3033317543584580398, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: sharedProfile + value: + objectReference: {fileID: 11400000, guid: dc8a6b6eba1fd7443adb3c1814cb7e73, type: 2} - target: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: m_Name value: Menu @@ -311,6 +266,10 @@ PrefabInstance: propertyPath: timingUi value: objectReference: {fileID: 571777219} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: shipAudio + value: + objectReference: {fileID: 602427663} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: @@ -384,10 +343,7 @@ PrefabInstance: m_RemovedGameObjects: - {fileID: 7435896455896431905, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} - insertIndex: -1 - addedObject: {fileID: 943464879} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} --- !u!1001 &571777217 PrefabInstance: @@ -773,28 +729,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &943464869 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} - m_PrefabInstance: {fileID: 327871849} - m_PrefabAsset: {fileID: 0} ---- !u!114 &943464879 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943464869} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IsGlobal: 1 - priority: 10 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: dc8a6b6eba1fd7443adb3c1814cb7e73, type: 2} --- !u!1 &1047904317 GameObject: m_ObjectHideFlags: 0 @@ -969,7 +903,6 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1906469785} - - {fileID: 52048085} - {fileID: 327871849} - {fileID: 183545441} - {fileID: 1047904321} diff --git a/Assets/Scenes/sr_alpha_centaurus.unity b/Assets/Scenes/sr_alpha_centaurus.unity old mode 100755 new mode 100644 index b47a6b7..e4a9114 --- a/Assets/Scenes/sr_alpha_centaurus.unity +++ b/Assets/Scenes/sr_alpha_centaurus.unity @@ -1301,6 +1301,10 @@ PrefabInstance: propertyPath: timingUi value: objectReference: {fileID: 766862836} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: shipAudio + value: + objectReference: {fileID: 618591844} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: diff --git a/Assets/Scenes/sr_junglism2.unity b/Assets/Scenes/sr_junglism2.unity old mode 100755 new mode 100644 index d941f52..392afc4 --- a/Assets/Scenes/sr_junglism2.unity +++ b/Assets/Scenes/sr_junglism2.unity @@ -5762,6 +5762,10 @@ PrefabInstance: propertyPath: timingUi value: objectReference: {fileID: 766862836} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: shipAudio + value: + objectReference: {fileID: 2015948217} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: diff --git a/Assets/Scenes/sr_pascal.unity b/Assets/Scenes/sr_pascal.unity index ddda0ce..f464424 100644 --- a/Assets/Scenes/sr_pascal.unity +++ b/Assets/Scenes/sr_pascal.unity @@ -1325,6 +1325,10 @@ PrefabInstance: propertyPath: timingUi value: objectReference: {fileID: 766862836} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: shipAudio + value: + objectReference: {fileID: 5198188376350273128} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: diff --git a/Assets/Scenes/sr_sfz/LightingData.asset b/Assets/Scenes/sr_sfz/LightingData.asset index d4c5b9c32aabe9eb8681df77c3225ef59daec31c..472a5c5ea1051a3885a31c689bf112208668a879 100644 GIT binary patch delta 28 hcmbQx$2g&nal;}vJ_Sbxh6EsHVE7LNlQ*~}004`h3d{fi delta 28 YcmbQx$2g&nal;}vJ_Zypd4pR50Aia3&Hw-a diff --git a/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat index d7f359f..10a06bd 100644 --- a/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat +++ b/Assets/Scenes/sr_sfz/SpaSkyboxCube.mat @@ -101,7 +101,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _UpTex: - m_Texture: {fileID: 2800000, guid: 3cde222545e5d27b5aa807cc125c4c76, type: 3} + m_Texture: {fileID: 2800000, guid: dadbfd71eadaf364ca6524d5a979dad9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: diff --git a/Assets/Scenes/sr_silverstorage.unity b/Assets/Scenes/sr_silverstorage.unity old mode 100755 new mode 100644 index f549580..cd42585 --- a/Assets/Scenes/sr_silverstorage.unity +++ b/Assets/Scenes/sr_silverstorage.unity @@ -917,6 +917,10 @@ PrefabInstance: propertyPath: timingUi value: objectReference: {fileID: 766862836} + - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} + propertyPath: shipAudio + value: + objectReference: {fileID: 5198188376350273128} - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3} propertyPath: timingDoc value: diff --git a/Packages/manifest.json b/Packages/manifest.json index 26e6e89..70e6a95 100755 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.5", + "com.unity.toolchain.linux-x86_64": "2.0.6", "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.vectorgraphics": "2.0.0-preview.21", "com.unity.visualeffectgraph": "14.0.8", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e857774..dceecf9 100755 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -208,6 +208,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.linux-x86_64": { + "version": "2.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "2.0.7", + "com.unity.sysroot.linux-x86_64": "2.0.6" + }, + "url": "https://packages.unity.com" + }, "com.unity.toolchain.win-x86_64-linux-x86_64": { "version": "2.0.6", "depth": 0, diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 4f8cb33..60595ab 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -59,7 +59,7 @@ GraphicsSettings: m_LightsUseLinearIntensity: 0 m_LightsUseColorTemperature: 1 m_DefaultRenderingLayerMask: 1 - m_LogWhenShaderIsCompiled: 0 + m_LogWhenShaderIsCompiled: 1 m_SRPDefaultSettings: UnityEngine.Rendering.Universal.UniversalRenderPipeline: {fileID: 11400000, guid: 202eb30993b099ac6873d84ee9b37b87, type: 2} m_LightProbeOutsideHullStrategy: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset old mode 100755 new mode 100644 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset old mode 100755 new mode 100644 index 8d0bce7..152a42a --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -267,7 +267,7 @@ QualitySettings: globalTextureMipmapLimit: 0 textureMipmapLimitSettings: [] anisotropicTextures: 2 - antiAliasing: 2 + antiAliasing: 0 softParticles: 1 softVegetation: 1 realtimeReflectionProbes: 1