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

Deleted MetaXR, fire alarm is still in progress

Browse Source
This commit is contained in:
Timur Nizamov
2025-12-17 16:06:08 +02:00
parent c999bafa22
commit c5c8fe1259
29 changed files with 2391 additions and 617 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.

BIN
Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll LFS
View File

Binary file not shown.

27
Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll.meta
View File

@@ -1,27 +0,0 @@
fileFormatVersion: 2
guid: 99296f87424cb724baddf545125501a2
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

227
Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js
View File

@@ -1,227 +0,0 @@
studio.plugins.registerPluginDescription("MetaXRAudio Spatializer", {
companyName: "Meta",
productName: "MetaXRAudio Source",
parameters: {
"Acoustics": { displayName: "Enable Acoustics" },
"Reverb Send": { displayName: "Reverb Send" },
"HRTF Intensity": { displayName: "HRTF Intensity" },
"V. Radius": { displayName: "Volumetric Radius" },
"Refl. Send": { displayName: "Early Reflections Send" },
"Directivity": { displayName: "Directivity Pattern", enumeration: ["None", "Human Voice"], },
"Dtv. Intensity": { displayName: "Directivity Intensity" },
"Direct Enabled": { displayName: "Direct Enabled" },
"Reverb Reach": { displayName: "Reverb Reach" },
"Occl. Intensity": { displayName: "Occlusion Intensity" },
"Medium Absrp.": { displayName: "Medium Absorption" },
},
deckUi: {
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.HBoxLayout,
spacing: 8,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.HBoxLayout,
contentsMargins: { left: 6, right: 6 },
spacing: 2,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.GridLayout,
contentsMargins: { left: 6, right: 6 },
spacing: 2,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.DistanceRolloffGraph,
row: 0,
column: 0,
columnSpan: 2,
minimumDistanceBinding: 'Atten. Min',
maximumDistanceBinding: 'Atten. Max',
rolloffTypeBinding: 'Atten. Mode',
rolloffTypes: {
0: studio.project.distanceRolloffType.LinearSquared,
1: studio.project.distanceRolloffType.Linear,
2: studio.project.distanceRolloffType.Inverse,
3: studio.project.distanceRolloffType.InverseTapered,
4: studio.project.distanceRolloffType.Custom,
},
},
{
deckWidgetType: studio.ui.deckWidgetType.Button,
binding: "Acoustics",
row: 1,
column: 0,
},
{
deckWidgetType: studio.ui.deckWidgetType.Dial,
binding: "Reverb Send",
row: 1,
column: 1,
},
],
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.HBoxLayout,
contentsMargins: { left: 0, right: 14 },
isFramed: true,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 6, right: 10 },
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Label,
text: "Experimental Controls:",
},
{
deckWidgetType: studio.ui.deckWidgetType.Pixmap,
filePath: __dirname + "/MetaLogo.png",
},
{
deckWidgetType: studio.ui.deckWidgetType.Dropdown, binding: "Directivity",
},
],
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 6, right: 10 },
spacing: 14,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "Dtv. Intensity",
},
{
deckWidgetType: studio.ui.deckWidgetType.Button, binding: "Medium Absrp.",
},
],
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.GridLayout,
contentsMargins: { left: 30, right: 30 },
spacing: 14,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "Refl. Send",
row: 0,
column: 0,
},
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "V. Radius",
row: 1,
column: 0,
},
],
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 6, right: 10 },
spacing: 14,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "HRTF Intensity",
row: 1,
column: 1,
},
{
deckWidgetType: studio.ui.deckWidgetType.Button, binding: "Direct Enabled",
},
],
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 6, right: 10 },
spacing: 14,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "Reverb Reach",
},
{
deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "Occl. Intensity",
},
],
},
],
},
],
},
{ deckWidgetType: studio.ui.deckWidgetType.OutputMeter, },
],
},
});
studio.plugins.registerPluginDescription("MetaXRAudio Ambisonics", {
companyName: "Meta",
productName: "MetaXRAudio Ambisonics",
parameters: {},
deckUi: {
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 6, right: 6, top: 6 },
spacing: 40,
items: [
{ deckWidgetType: studio.ui.deckWidgetType.Pixmap, filePath: __dirname + "/MetaLogo.png", },
],
}
});
studio.plugins.registerPluginDescription("MetaXRAudio Reflections", {
companyName: "Meta",
productName: "MetaXRAudio Reflections",
parameters: {
"Early Refl.": { displayName: "Early Reflections Enabled" },
"Reverb Enabled": { displayName: "Reverb Enabled" },
"Reverb Level": { displayName: "Reverb Level" },
"Voice Limit": { displayName: "Voice Limit" },
},
deckUi: {
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.HBoxLayout,
contentsMargins: { left: 6, right: 6 },
spacing: 12,
items: [
{ deckWidgetType: studio.ui.deckWidgetType.Pixmap, filePath: __dirname + "/MetaLogo.png" },
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.HBoxLayout,
contentsMargins: { left: 0, right: 14 },
spacing: 8,
items: [
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 0, right: 20 },
spacing: 14,
items: [
{ deckWidgetType: studio.ui.deckWidgetType.Button, binding: "Early Refl.", },
{ deckWidgetType: studio.ui.deckWidgetType.Button, binding: "Reverb Enabled", },
]
},
{
deckWidgetType: studio.ui.deckWidgetType.Layout,
layout: studio.ui.layoutType.VBoxLayout,
contentsMargins: { left: 0, right: 0 },
spacing: 14,
items: [
{ deckWidgetType: studio.ui.deckWidgetType.Dial, binding: "Reverb Level", },
{ deckWidgetType: studio.ui.deckWidgetType.NumberBox, binding: "Voice Limit", },
]
},
],
},
{ deckWidgetType: studio.ui.deckWidgetType.OutputMeter, },
],
}
});

7
Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ab37959ba9271d444953f8895308ff56
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Plugins/SteamAudio/Resources/SteamAudioSettings.asset LFS
View File

Binary file not shown.

BIN
Assets/Resources/MetaXRAcousticSettings.asset LFS
View File

Binary file not shown.

8
Assets/Resources/MetaXRAcousticSettings.asset.meta
View File

@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 2af207a59ff0c77449a495a5ff852a9f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

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

@@ -14,7 +14,6 @@ public class AlarmTrigger : MonoBehaviour
private EventInstance RoomHum;
private EventInstance AlarmSound;
private EventInstance ServerButton;
private FirstPersonOcclusion occlusion;
@@ -23,10 +22,11 @@ public class AlarmTrigger : MonoBehaviour
private void Awake()
{
RoomHum = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomHumming); //initialise the instance
RoomHum.setParameterByName("AlarmLogic", 1);
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); //initialise the instance
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
//AlarmSound = AudioManager.Instance.CreateInstance(FMODEvents.Instance.ServerRoomAlarm); //initialise the instance
//AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //make it 3d
occlusion = GetComponent<FirstPersonOcclusion>();
if (occlusion != null)
@@ -48,27 +48,24 @@ public class AlarmTrigger : MonoBehaviour
void OnButtonPressed()
{
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, gameObject); //3d oneshot instance
AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.ServerRoomButton, PushButton.gameObject); //3d oneshot instance
Debug.Log("Alarm button Pressed!");
if (!AudioManager.IsPlaying(AlarmSound)){ //if alarm isn't already triggered.
VentilationSequence.Stop();
AlarmSequence.Play();
RoomHum.setParameterByName("AlarmLogic", 0);
hasAlarm = true;
AlarmSound.start(); //start playing the sound
RoomHum.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT); //stop playing the sound
hasAlarm = true;
}
}
void Update()
{
if(hasAlarm && !AudioManager.IsPlaying(AlarmSound)) // If alarm state has ended.
RoomHum.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
AlarmSound.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); //updating 3d attributes
if (hasAlarm && !AudioManager.IsPlaying(AlarmSound)) // If alarm state has ended.
{
VentilationSequence.Play(); // Return to normal.
RoomHum.start();
AlarmSound.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT);
hasAlarm = false;
}

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

Binary file not shown.

16
Assets/_PROJECT/Scripts/Audio/AudioManager.cs
View File

@@ -232,6 +232,9 @@ public class AudioManager : MonoBehaviour
RuntimeManager.StudioSystem.setParameterByName(parameterName, value);
}
//=====//
//Some functions for initialising music, perhaps there will be a need in the future...
//=====//
public void InitializeMusic(EventReference musicEventReference)
{
if (musicEventReference.Guid == nullGuid)
@@ -262,11 +265,6 @@ public class AudioManager : MonoBehaviour
return position;
}
public void StopSFX()
{
sfxBus.stopAllEvents(FMOD.Studio.STOP_MODE.IMMEDIATE);
}
public void FadeOutMusic()
{
musicEventInstance.stop(FMOD.Studio.STOP_MODE.ALLOWFADEOUT);
@@ -280,6 +278,14 @@ public class AudioManager : MonoBehaviour
return state != PLAYBACK_STATE.STOPPED;
}
//=====//
//=====//
public void StopSFX()
{
sfxBus.stopAllEvents(FMOD.Studio.STOP_MODE.IMMEDIATE);
}
public static bool IsPlaying(EventInstance instance)
{
instance.getPlaybackState(out PLAYBACK_STATE state);