From a0d1ee35cdc6beb663e705ed5f9a1a545c5fd4e8 Mon Sep 17 00:00:00 2001 From: henrisel Date: Thu, 29 Jan 2026 19:26:16 +0200 Subject: [PATCH] fix FirstPersonOcclusion invalid event handle error --- 3d-generation-pipeline/README.md | 2 +- .../Resources/Fonts & Materials/Anton SDF.asset | 4 ++-- .../Resources/Fonts & Materials/Bangers SDF.asset | 4 ++-- .../Fonts & Materials/Electronic Highway Sign SDF.asset | 4 ++-- .../Resources/Fonts & Materials/Oswald Bold SDF.asset | 4 ++-- .../Resources/Fonts & Materials/Roboto-Bold SDF.asset | 4 ++-- Assets/_PROJECT/Scenes/DeltaBuilding_base.unity | 4 ++-- Assets/_PROJECT/Scripts/Audio/AudioManager.cs | 7 ++++--- Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/3d-generation-pipeline/README.md b/3d-generation-pipeline/README.md index 596d3020..562b9168 100644 --- a/3d-generation-pipeline/README.md +++ b/3d-generation-pipeline/README.md @@ -1,6 +1,6 @@ ### TODO * user flow: grab item? mida krabada -* võtta spawnitud mudeli mõõtmed: meshcollideri max x, max y, etc? bounding box? +* võtta spawnitud mudeli mõõtmed: meshcollideri max x, max y, etc? bounding box? ja kontrollida spawnimisel scale'i * shape scanner: * peenikesemad kiired * mitte lihtsalt ontriggerenter ja -exit, sest kui mitu objekti lähevad samal ajal sisse diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset index c9dd0c9d..9cf711af 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f435fea6bc4a529088adc67c39d424661d38f0b31a26563def17099ade8650d9 -size 2108207 +oid sha256:3d5cfcffff8dff4e78b27660e504f3f3c7e33bc90635f4ecea5fba734cea9076 +size 8426 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset index 50ff39ad..703f2486 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b47997e80ccff54c264647b610f7eba06fffb0fe3db9149b56941e37d000399 -size 2175673 +oid sha256:cd9b73f8a66de23601f20f4ee0be0146d3bb10a3ee71549cb5df990d0b58580c +size 76143 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset index 0dae27c8..d3d2e36b 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e7333394bc81dcc9782e8b20cf713c3eb64ec6fb7a1a8ec04c8c95eab39b2eb -size 2107703 +oid sha256:0b91d586ea5e3b650560f7626572004d37022e69998298493bd3bbbc7458d132 +size 8542 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset index 07970f95..7a4c27ee 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cf664ff0017780087734b43fb4a0d55baf838e06eb7f1e2c59b390d9842ddfb -size 2169374 +oid sha256:87cd6656b74c1aeaca65492c12c7f13854f553643782f3c21e7be8922a6bb25e +size 69579 diff --git a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset index 1a3fe5ba..efd99ccb 100644 --- a/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset +++ b/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1be748bdc6f2f96214a19513747b4ebe53f3e0507fd1d7dbb479811bd4ea84c5 -size 2787854 +oid sha256:be30842c9400a3cee8e0a04837a440a13ed3987dfe7414baf3d7cc09906912da +size 688126 diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 4618a4ed..770c9775 100644 --- a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity +++ b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87e5b288d6e21c10c32f786e049d0165805ccdf7aeacc8f06ebc6c886cebcc42 -size 67957032 +oid sha256:e919800badd9e34386f9cfbf51da5b683b5f425207c3d51761d31ca09ac41222 +size 67957213 diff --git a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs index 6f343527..69c988e2 100644 --- a/Assets/_PROJECT/Scripts/Audio/AudioManager.cs +++ b/Assets/_PROJECT/Scripts/Audio/AudioManager.cs @@ -430,11 +430,12 @@ public class AudioManager : MonoBehaviour { foreach (EventInstance eventInstance in eventInstances) { - eventInstance.stop(FMOD.Studio.STOP_MODE.IMMEDIATE); - eventInstance.release(); + if (eventInstance.isValid()) { + eventInstance.stop(FMOD.Studio.STOP_MODE.IMMEDIATE); + eventInstance.release(); + } } } - } private void OnDestroy() { diff --git a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs index 91ca2839..9191d251 100644 --- a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs +++ b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs @@ -75,7 +75,7 @@ public class FirstPersonOcclusion : MonoBehaviour AudioOccluded.start(); // 4. Releasing Instance (This allows the event to self-manage its lifetime, which is fine) - AudioOccluded.release(); + //AudioOccluded.release(); managedInstances.Add(AudioOccluded); // ADDED