From 8b7a3e1edbe1c321c2c03d367e9814751ca9cfe3 Mon Sep 17 00:00:00 2001 From: marcin Date: Mon, 3 Mar 2025 19:10:15 +0100 Subject: [PATCH] fixed camera shake, fixed scroll pickup --- .../iOS/addressables_content_state.bin | Bin 2517 -> 2517 bytes Assets/Meshes/scroll/scrollMat2D.mat | 6 +- .../Scenes/Land_01/Land_Of_Death_Demo.unity | 862 +++++++++--------- Assets/Scripts/Effects/CameraShaker.cs | 60 +- Assets/Settings/LWRP-HighQuality.asset | 58 +- ...niversalRenderPipelineGlobalSettings.asset | 60 +- 6 files changed, 548 insertions(+), 498 deletions(-) diff --git a/Assets/AddressableAssetsData/iOS/addressables_content_state.bin b/Assets/AddressableAssetsData/iOS/addressables_content_state.bin index b2cc2816708208404e45e921b3c02c2ff5e05363..348af4d472d8acde36ae704fa7a9b44ff1f67d24 100644 GIT binary patch delta 59 zcmV-B0L1^*6V(&2kO2WXvylO#1q7~QYVVUc2gd}!lQt2P0|P RWRnXCdIW@dTuhUR2~42M6|n#S delta 59 zcmV-B0L1^*6V(&2kO2WVvylO#1qAj)_au`z2gd{#OmZKS0|= duration) @@ -68,6 +78,36 @@ namespace Beyond mainCamera.localPosition -= lastShakeOffset; // Resetujemy shake lastShakeOffset = Vector3.zero; } + */ + if (isShaking && shakeTime < duration) + { + shakeTime += Time.deltaTime; + float shakeStrength = amplitude * shakeCurve.Evaluate(shakeTime / duration); + + // P�ynne drgania na bazie Perlin Noise + float x = (Mathf.PerlinNoise(Time.time * frequency, 0) * 2 - 1) * shakeStrength; + float y = (Mathf.PerlinNoise(0, Time.time * frequency) * 2 - 1) * shakeStrength; + float z = (Mathf.PerlinNoise(Time.time * frequency, Time.time * frequency) * 2 - 1) * shakeStrength; + + // Nowe przesuni�cie + localShakeOffset = new Vector3(x, y, z); + orginalPos = transform.position; + // Usuwamy poprzednie przesuni�cie, dodajemy nowe + transform.position += localShakeOffset; + } + + } + + void OnEndCameraRendering(ScriptableRenderContext context, Camera camera) + { + if (isShaking) + { + transform.position = orginalPos; + if (shakeTime >= duration) + { + isShaking = false; + } + } } } } diff --git a/Assets/Settings/LWRP-HighQuality.asset b/Assets/Settings/LWRP-HighQuality.asset index d79367805..c4906e0c9 100644 --- a/Assets/Settings/LWRP-HighQuality.asset +++ b/Assets/Settings/LWRP-HighQuality.asset @@ -82,7 +82,7 @@ MonoBehaviour: m_UseFastSRGBLinearConversion: 0 m_SupportDataDrivenLensFlare: 1 m_SupportScreenSpaceLensFlare: 1 - m_GPUResidentDrawerMode: 1 + m_GPUResidentDrawerMode: 0 m_SmallMeshScreenPercentage: 0 m_GPUResidentDrawerEnableOcclusionCullingInCameras: 1 m_ShadowType: 2 @@ -99,35 +99,35 @@ MonoBehaviour: obsoleteHasProbeVolumes: m_Keys: [] m_Values: - m_PrefilteringModeMainLightShadows: 1 - m_PrefilteringModeAdditionalLight: 4 - m_PrefilteringModeAdditionalLightShadows: 1 - m_PrefilterXRKeywords: 0 - m_PrefilteringModeForwardPlus: 1 - m_PrefilteringModeDeferredRendering: 1 - m_PrefilteringModeScreenSpaceOcclusion: 1 - m_PrefilterDebugKeywords: 0 - m_PrefilterWriteRenderingLayers: 0 - m_PrefilterHDROutput: 0 - m_PrefilterAlphaOutput: 0 - m_PrefilterSSAODepthNormals: 0 - m_PrefilterSSAOSourceDepthLow: 0 - m_PrefilterSSAOSourceDepthMedium: 0 - m_PrefilterSSAOSourceDepthHigh: 0 - m_PrefilterSSAOInterleaved: 0 - m_PrefilterSSAOBlueNoise: 0 - m_PrefilterSSAOSampleCountLow: 0 - m_PrefilterSSAOSampleCountMedium: 0 - m_PrefilterSSAOSampleCountHigh: 0 - m_PrefilterDBufferMRT1: 0 - m_PrefilterDBufferMRT2: 0 - m_PrefilterDBufferMRT3: 0 - m_PrefilterSoftShadowsQualityLow: 0 - m_PrefilterSoftShadowsQualityMedium: 0 - m_PrefilterSoftShadowsQualityHigh: 0 + m_PrefilteringModeMainLightShadows: 3 + m_PrefilteringModeAdditionalLight: 3 + m_PrefilteringModeAdditionalLightShadows: 2 + m_PrefilterXRKeywords: 1 + m_PrefilteringModeForwardPlus: 0 + m_PrefilteringModeDeferredRendering: 0 + m_PrefilteringModeScreenSpaceOcclusion: 0 + m_PrefilterDebugKeywords: 1 + m_PrefilterWriteRenderingLayers: 1 + m_PrefilterHDROutput: 1 + m_PrefilterAlphaOutput: 1 + m_PrefilterSSAODepthNormals: 1 + m_PrefilterSSAOSourceDepthLow: 1 + m_PrefilterSSAOSourceDepthMedium: 1 + m_PrefilterSSAOSourceDepthHigh: 1 + m_PrefilterSSAOInterleaved: 1 + m_PrefilterSSAOBlueNoise: 1 + m_PrefilterSSAOSampleCountLow: 1 + m_PrefilterSSAOSampleCountMedium: 1 + m_PrefilterSSAOSampleCountHigh: 1 + m_PrefilterDBufferMRT1: 1 + m_PrefilterDBufferMRT2: 1 + m_PrefilterDBufferMRT3: 1 + m_PrefilterSoftShadowsQualityLow: 1 + m_PrefilterSoftShadowsQualityMedium: 1 + m_PrefilterSoftShadowsQualityHigh: 1 m_PrefilterSoftShadows: 0 - m_PrefilterScreenCoord: 0 - m_PrefilterNativeRenderPass: 0 + m_PrefilterScreenCoord: 1 + m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 2 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index f40f62103..8b3639c34 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,30 +33,40 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 1525002040635556128 - - rid: 1525002040635556129 + - rid: 1525002378787684438 + - rid: 1525002378787684439 - rid: 6119840311943364610 - rid: 6119840311943364611 - rid: 6119840311943364612 - rid: 6119840311943364613 - - rid: 1525002040635556130 + - rid: 1525002378787684440 - rid: 6119840311943364615 - rid: 6119840311943364616 - rid: 6119840311943364617 - - rid: 1525002040635556131 - - rid: 1525002040635556132 + - rid: 1525002378787684441 + - rid: 1525002378787684442 - rid: 6119840311943364620 - - rid: 1525002040635556133 - - rid: 1525002040635556134 - - rid: 1525002040635556135 - - rid: 1525002040635556136 + - rid: 1525002378787684443 + - rid: 1525002378787684444 + - rid: 1525002378787684445 + - rid: 1525002378787684446 - rid: 6119840311943364625 - - rid: 1525002040635556137 - - rid: 1525002040635556138 + - rid: 1525002378787684447 + - rid: 1525002378787684448 - rid: 6119840311943364628 - - rid: 1525002040635556139 + - rid: 1525002378787684449 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 6119840311943364610 + - rid: 6119840311943364611 + - rid: 6119840311943364612 + - rid: 6119840311943364613 + - rid: 6119840311943364615 + - rid: 6119840311943364616 + - rid: 6119840311943364617 + - rid: 6119840311943364620 + - rid: 6119840311943364625 + - rid: 6119840311943364628 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -87,7 +97,7 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 1525002040635556128 + - rid: 1525002378787684438 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -103,7 +113,7 @@ MonoBehaviour: type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 1525002040635556129 + - rid: 1525002378787684439 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -125,7 +135,7 @@ MonoBehaviour: type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 1525002040635556130 + - rid: 1525002378787684440 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -133,7 +143,7 @@ MonoBehaviour: m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 1525002040635556131 + - rid: 1525002378787684441 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -157,7 +167,7 @@ MonoBehaviour: type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 1525002040635556132 + - rid: 1525002378787684442 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -179,7 +189,7 @@ MonoBehaviour: type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 1525002040635556133 + - rid: 1525002378787684443 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -189,14 +199,14 @@ MonoBehaviour: type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 1525002040635556134 + - rid: 1525002378787684444 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 1525002040635556135 + - rid: 1525002378787684445 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -218,13 +228,13 @@ MonoBehaviour: type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 1525002040635556136 + - rid: 1525002378787684446 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 1525002040635556137 + - rid: 1525002378787684447 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -240,12 +250,12 @@ MonoBehaviour: type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 1525002040635556138 + - rid: 1525002378787684448 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 1525002040635556139 + - rid: 1525002378787684449 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: