cgvr/DeltaVR
1
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Some FMOD events changed

Browse Source
This commit is contained in:
Timur Nizamov
2025-12-23 18:03:10 +02:00
parent 50dba2cd81
commit 34d102bcf4
20 changed files with 208 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset LFS
View File

Binary file not shown.

5
Assets/_PROJECT/Components/Server room/Alarm Trigger.cs
View File

@@ -1,6 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using System.Runtime.Remoting.Messaging;
using UnityEngine;
using UnityEngine.XR.Content.Interaction;
using FMOD.Studio;
@@ -30,7 +27,7 @@ public class AlarmTrigger : MonoBehaviour
void Start()
{
//start playing the Server overall sound
//RoomHum.start();
RoomHum.start();
if (PushButton != null)
{

2
Assets/_PROJECT/Components/Server room/Server rack.prefab
View File

@@ -152,4 +152,4 @@ MonoBehaviour:
PlayerOcclusionWidening: 1
OcclusionLayer:
serializedVersion: 2
m_Bits: 268442624
m_Bits: 268438528

BIN
Assets/_PROJECT/Scenes/DeltaBuilding_base.unity LFS
View File

Binary file not shown.

1
Assets/_PROJECT/Scripts/Audio/FMODEvents.cs
View File

@@ -18,6 +18,7 @@ public class FMODEvents : MonoBehaviour
[field: SerializeField] public EventReference DefaultGrab { get; private set; }
[field: SerializeField] public EventReference BowGrab { get; private set; }
[field: SerializeField] public EventReference Spray { get; private set; }
[field: SerializeField] public EventReference Coughing { get; private set; }
[field: Header("CAR")]
[field: SerializeField] public EventReference DoorOpen { get; private set; }

7
Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs
View File

@@ -2,7 +2,7 @@ using UnityEngine;
using FMODUnity;
using FMOD.Studio;
using System.Collections;
using System.Collections.Generic; // ADDED
using System.Collections.Generic;
public class FirstPersonOcclusion : MonoBehaviour
{
@@ -26,8 +26,6 @@ public class FirstPersonOcclusion : MonoBehaviour
private Color colour;
private bool initialisedExternally = false;
// ADDED: now stores ALL event instances that must be occluded
private List<EventInstance> managedInstances = new List<EventInstance>();
public void InitialiseWithInstance(EventInstance instance)
{
@@ -42,13 +40,12 @@ public class FirstPersonOcclusion : MonoBehaviour
//instance.setParameterByName("Occlusion", 1f, true);
managedInstances.Add(AudioOccluded); // ADDED
managedInstances.Add(AudioOccluded);
AudioOccluded.getDescription(out AudioDes);
AudioDes.getMinMaxDistance(out float min, out MaxDistance);
}
// ADDED: allows adding extra FMOD instances for occlusion
public void AddInstance(EventInstance instance)
{
if (instance.isValid())