diff --git a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset index 246cbc0f..44d6e67f 100644 --- a/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset +++ b/Assets/Plugins/FMOD/Resources/FMODStudioSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5376e8b08c03fa0b41a7b0207d68fbe9fd800ca5f3f0a9e0212afa3fe9ebd9cf -size 20242 +oid sha256:56844102e1e5868fce59e725b13bc43bedb8d29ccc341c7b6af859f9b80bac84 +size 20290 diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png new file mode 100644 index 00000000..d17ca834 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faca2622ecf145158010dc1ca74b28602e94b83e0318f80a7a4832bda7a4bd79 +size 3314 diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png.meta new file mode 100644 index 00000000..0010a9b5 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaLogo.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 0a872fd50be2db447a17fb4bc7ae6e6f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll new file mode 100644 index 00000000..ce6e8af6 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e2120a4d3827b6f1d05404c87213bc68b23e6a4dce91923dff25b34923c3558 +size 2603008 diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll.meta new file mode 100644 index 00000000..1d7aa279 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.dll.meta @@ -0,0 +1,27 @@ +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: diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js new file mode 100644 index 00000000..6e7cf8d1 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js @@ -0,0 +1,227 @@ +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, }, + ], + } +}); diff --git a/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js.meta b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js.meta new file mode 100644 index 00000000..1e67f5b0 --- /dev/null +++ b/Assets/Plugins/FMOD/platforms/win/lib/x86_64/MetaXRAudioFMOD.plugin.js.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab37959ba9271d444953f8895308ff56 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 00000000..75f64a01 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cea7bca5f2b0981489443a1ab4b97e7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/MetaXRAcousticSettings.asset b/Assets/Resources/MetaXRAcousticSettings.asset new file mode 100644 index 00000000..5123ffdd --- /dev/null +++ b/Assets/Resources/MetaXRAcousticSettings.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:475420a55b2ab44c0816753813ba05519c5f2e961508ade8cf67f9fb277a7de8 +size 494 diff --git a/Assets/Resources/MetaXRAcousticSettings.asset.meta b/Assets/Resources/MetaXRAcousticSettings.asset.meta new file mode 100644 index 00000000..a7a24047 --- /dev/null +++ b/Assets/Resources/MetaXRAcousticSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2af207a59ff0c77449a495a5ff852a9f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs index a686b91f..c795464f 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs @@ -24,6 +24,9 @@ public class CarDrivingRoutine : NetworkBehaviour private bool stopSoundPlayed = false; private float stopThreshold = 0.05f; // consider speed "0" when below this + private bool isBeingStoppedByPlayer = false; + + [Header("Tires")] public List FrontTires; public List BackTires; @@ -54,25 +57,26 @@ public class CarDrivingRoutine : NetworkBehaviour rollTires(); // Just an aesthetic improvement. - if (Quaternion.Angle(transform.rotation, desiredRotation) > 1f) // If the car is turning. + if (!isBeingStoppedByPlayer) { - if (!isTurning) + if (Quaternion.Angle(transform.rotation, desiredRotation) > 1f) { - AudioController.SetRPM(1300); //set externally in CarAudioController.cs - setTireRotation(tireTurnAngle); + if (!isTurning) + { + setTireRotation(tireTurnAngle); + AudioController.SetRPM(1300); + } + isTurning = true; } - - isTurning = true; - } - if (Quaternion.Angle(transform.rotation, desiredRotation) <= 1f) // Reset the turn value. - { - if (isTurning) + else { - AudioController.SetRPM(1450); - setTireRotation(-tireTurnAngle); + if (isTurning) + { + setTireRotation(-tireTurnAngle); + AudioController.SetRPM(1450); + } + isTurning = false; } - - isTurning = false; } // Check if close enough to the waypoint @@ -85,12 +89,14 @@ public class CarDrivingRoutine : NetworkBehaviour if (StraightSpeed <= stopThreshold && !stopSoundPlayed) { - stopSoundPlayed = true; - - // Play the sound normally from your audio controller - //AudioController.SetRPM(475); - AudioController.PlayStopSound(); - + float currentRPM = AudioController.GetCurrentRPM(); + //Debug.LogError(currentRPM); + if (currentRPM <= 550f) // confirms we are in the correct engine state + { + stopSoundPlayed = true; + AudioController.PlayStopSound(); + //Debug.LogError("piiks"); + } } } @@ -120,29 +126,29 @@ public class CarDrivingRoutine : NetworkBehaviour } private void OnTriggerEnter(Collider other) - {; + { if (other.GetComponentInParent() == null) return; - StartCoroutine(SmoothAdjustSpeed(0, 0, haltspeed)); // Smoothly halt in 1 second - //_tireSound.Stop(); - //_stopSound.Play(); + + isBeingStoppedByPlayer = true; + + StartCoroutine(SmoothAdjustSpeed(0, 0, haltspeed)); AudioController.SetRPM(475); - //AudioController.PlayStopSound(); - } private void OnTriggerExit(Collider other) { if (other.GetComponentInParent() == null) return; - StartCoroutine(SmoothAdjustSpeed(targetSpeed, targetRotationSpeed, haltspeed)); // Smoothly resume speed in 1 second - //_stopSound.Stop(); - //_tireSound.Play(); + + isBeingStoppedByPlayer = false; + + StartCoroutine(SmoothAdjustSpeed(targetSpeed, targetRotationSpeed, haltspeed)); AudioController.SetRPM(1450); stopSoundPlayed = false; - } + private IEnumerator SmoothAdjustSpeed(float targetStraightSpeed, float targetRotationSpeed, float duration) { float initialStraightSpeed = StraightSpeed; diff --git a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs index eabd67fb..6a2cd40e 100644 --- a/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs +++ b/Assets/_PROJECT/Components/Bolt/Intercation Logic/CarAudioController.cs @@ -4,6 +4,7 @@ using FMOD.Studio; public class CarAudioController : MonoBehaviour { private EventInstance carMovementInstance; + private EventInstance carStopInstance; private FirstPersonOcclusion occlusion; private void Awake() @@ -15,13 +16,21 @@ public class CarAudioController : MonoBehaviour //Debug.LogError("Car Simple Driving:"); //Debug.LogError(FMODEvents.Instance.BoltCarSimpleDriving); carMovementInstance = AudioManager.Instance.CreateInstance(FMODEvents.Instance.CarModulatedDriving); + carStopInstance = AudioManager.Instance.CreateInstance(FMODEvents.Instance.BoltCarStopSound); + carMovementInstance.setParameterByName("RPM", 1450); carMovementInstance.setParameterByName("Load", 0); + carMovementInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + carStopInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); occlusion = GetComponent(); + if (occlusion != null) - occlusion.InitialiseWithInstance(carMovementInstance); + { + occlusion.InitialiseWithInstance(carMovementInstance); // main looping engine sound + occlusion.AddInstance(carStopInstance); // additional sound + } } private void Start() @@ -34,6 +43,7 @@ public class CarAudioController : MonoBehaviour { // Always update 3D position to follow the car model transform carMovementInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); + carStopInstance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(gameObject)); } // These methods are called externally by CarDrivingRoutine @@ -44,8 +54,13 @@ public class CarAudioController : MonoBehaviour public void PlayStopSound() { - - AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BoltCarStopSound, gameObject); + carStopInstance.start(); + //AudioManager.Instance.PlayAttachedInstance(FMODEvents.Instance.BoltCarStopSound, gameObject); } + public float GetCurrentRPM() + { + carMovementInstance.getParameterByName("RPM", out float value); + return value; + } } diff --git a/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity b/Assets/_PROJECT/Scenes/DeltaBuilding_base.unity index 874b0573..93a891e5 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:daaf261ebc20f83d2b709ea8870ea9631c223094bd1de3407d12ac714dd2b3a6 -size 66771371 +oid sha256:aa10ea8d85839c1e237c9f8f77498c7a36e88b998234043e98fd38a3feb336a8 +size 66771533 diff --git a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs index bdc8b2e1..7a7cfb7d 100644 --- a/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs +++ b/Assets/_PROJECT/Scripts/Audio/FirstPersonOcclusion.cs @@ -2,6 +2,7 @@ using UnityEngine; using FMODUnity; using FMOD.Studio; using System.Collections; +using System.Collections.Generic; // ADDED public class FirstPersonOcclusion : MonoBehaviour { @@ -26,6 +27,10 @@ public class FirstPersonOcclusion : MonoBehaviour private bool initialisedExternally = false; + // ADDED: now stores ALL event instances that must be occluded + private List managedInstances = new List(); + + public void InitialiseWithInstance(EventInstance instance) { AudioOccluded = instance; @@ -37,9 +42,28 @@ public class FirstPersonOcclusion : MonoBehaviour GetComponent() ); + managedInstances.Add(AudioOccluded); // ADDED + 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()) + { + RuntimeManager.AttachInstanceToGameObject( + instance, + gameObject, + GetComponent() + ); + + managedInstances.Add(instance); + } + } + + private IEnumerator Start() { // If already initialised, skip internal creation @@ -47,13 +71,18 @@ public class FirstPersonOcclusion : MonoBehaviour if (!initialisedExternally) { AudioOccluded = RuntimeManager.CreateInstance(SelectAudio); + // 2. Attaching Instance RuntimeManager.AttachInstanceToGameObject(AudioOccluded, gameObject); + // 3. Starting Audio AudioOccluded.start(); + // 4. Releasing Instance (This allows the event to self-manage its lifetime, which is fine) AudioOccluded.release(); + managedInstances.Add(AudioOccluded); // ADDED + // 5. Getting Event Description and Max Distance AudioDes = RuntimeManager.GetEventDescription(SelectAudio); AudioDes.getMinMaxDistance(out float minDistance, out MaxDistance); @@ -64,6 +93,7 @@ public class FirstPersonOcclusion : MonoBehaviour Listener = FindObjectOfType(); } + private void FixedUpdate() { if (Listener == null) return; @@ -82,6 +112,7 @@ public class FirstPersonOcclusion : MonoBehaviour lineCastHitCount = 0f; } + private void OccludeBetween(Vector3 sound, Vector3 listener) { // 9. Calculate Points (Log only a few to avoid clutter) @@ -117,6 +148,7 @@ public class FirstPersonOcclusion : MonoBehaviour SetParameter(); } + private Vector3 CalculatePoint(Vector3 a, Vector3 b, float m, bool posOrneg) { float n = Vector3.Distance(new Vector3(a.x, 0f, a.z), new Vector3(b.x, 0f, b.z)); @@ -139,9 +171,11 @@ public class FirstPersonOcclusion : MonoBehaviour return new Vector3(x, a.y, z); } + private void CastLine(Vector3 Start, Vector3 End) { RaycastHit hit; + // 11. Raycast result bool isHit = Physics.Linecast(Start, End, out hit, OcclusionLayer); @@ -156,10 +190,18 @@ public class FirstPersonOcclusion : MonoBehaviour } } + private void SetParameter() { float occlusionValue = lineCastHitCount / 11; + // 12. Final Parameter Value - AudioOccluded.setParameterByName("Occlusion", occlusionValue); + foreach (var inst in managedInstances) + { + if (inst.isValid()) + { + inst.setParameterByName("Occlusion", occlusionValue); + } + } } } diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br index 7187a179..5a1166f1 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Ambience.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br index 622229ee..245cb355 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Master.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br index 56e29576..79beb26d 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Music.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br index c9beb56a..d4fd48ff 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/SFX.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br index 88a04428..c64c1b14 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/UI.br differ diff --git a/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br b/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br index 4a690a95..00159ee3 100644 Binary files a/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br and b/DeltaVRFMOD/.cache/buildrecords/Desktop/Voiceovers.br differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/0CA0F7F0.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/0CA0F7F0.fobj index 64ff7fdf..20a27f3c 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/0CA0F7F0.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/0CA0F7F0.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/0EEDFB4C.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/0EEDFB4C.fobj index 23ecf788..8edf3e9d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/0EEDFB4C.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/0EEDFB4C.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/10DD1FDC.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/10DD1FDC.fobj index abe0d380..a83c4038 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/10DD1FDC.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/10DD1FDC.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1238A4C7.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1238A4C7.fobj index 7902e034..8fb883d3 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/1238A4C7.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1238A4C7.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/13EA9556.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/13EA9556.fobj index cb58fb7c..b52059c3 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/13EA9556.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/13EA9556.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/168C9B05.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/168C9B05.fobj index d5bd82c8..399b0361 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/168C9B05.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/168C9B05.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/19C17E4D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/19C17E4D.fobj index 1bfc7c96..f6489355 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/19C17E4D.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/19C17E4D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1B113F1D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1B113F1D.fobj index fdedc335..96e19b9c 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/1B113F1D.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1B113F1D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1B179F00.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1B179F00.fobj index 09593549..c63727ed 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/1B179F00.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1B179F00.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj index fc5839f6..b184146f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1CCFC295.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/1E3393A5.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/1E3393A5.fobj index 2b3a57b1..6192ff07 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/1E3393A5.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/1E3393A5.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/21123BA5.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/21123BA5.fobj index 65002a0f..40b4b6bf 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/21123BA5.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/21123BA5.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/21273475.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/21273475.fobj index 1a29cc49..788497da 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/21273475.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/21273475.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/25C2BC69.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/25C2BC69.fobj index e32e699e..70770738 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/25C2BC69.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/25C2BC69.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/2B103991.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/2B103991.fobj index b7be39e0..a8f5b0bf 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/2B103991.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/2B103991.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/31598058.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/31598058.fobj index 2ed02b4f..bec650cf 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/31598058.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/31598058.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/35AE90B1.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/35AE90B1.fobj index 317aaf60..0c9af715 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/35AE90B1.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/35AE90B1.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/36AF1337.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/36AF1337.fobj index 20b89ae7..65f45f87 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/36AF1337.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/36AF1337.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/392BD049.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/392BD049.fobj index cdb81a49..53d298e0 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/392BD049.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/392BD049.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/39C335AB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/39C335AB.fobj index 09bc9af7..4a437c22 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/39C335AB.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/39C335AB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj index 5d152fc5..5705fe47 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/3A2168FB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj index 519066c3..90d73acd 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/3B86A42D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/436EB27B.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/436EB27B.fobj index 98cecccb..c4947f3e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/436EB27B.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/436EB27B.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/45A8087E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/45A8087E.fobj index 79e0e6e2..bfccb901 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/45A8087E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/45A8087E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4C9DD5F7.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4C9DD5F7.fobj index 913de283..650b2f3c 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4C9DD5F7.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4C9DD5F7.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4CA9FE41.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4CA9FE41.fobj index 5055d655..ee23c7e3 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4CA9FE41.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4CA9FE41.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4DA6BEFD.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4DA6BEFD.fobj index 05c1b907..1a4eda8d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4DA6BEFD.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4DA6BEFD.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4DD33918.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4DD33918.fobj index 37f1ebc1..e70068c4 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4DD33918.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4DD33918.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4E479F85.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4E479F85.fobj index 4e2cdc9d..724731bf 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4E479F85.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4E479F85.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj index 1846503c..eace1ab9 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/4F58503D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/50BBAD9B.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/50BBAD9B.fobj index c680b2ac..61221995 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/50BBAD9B.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/50BBAD9B.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/539A559B.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/539A559B.fobj index 9da331ef..2965987a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/539A559B.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/539A559B.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/58A71864.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/58A71864.fobj index ccaab313..ff750634 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/58A71864.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/58A71864.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5B9D5F45.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5B9D5F45.fobj index 084d4466..773843ec 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/5B9D5F45.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5B9D5F45.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5C6D2D6A.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5C6D2D6A.fobj index be65f8ab..3c9f36c5 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/5C6D2D6A.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5C6D2D6A.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5CBD651B.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5CBD651B.fobj index 330e3b0d..29de3e82 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/5CBD651B.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5CBD651B.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5D33D248.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D33D248.fobj new file mode 100644 index 00000000..3cae7435 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D33D248.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj index 9f968000..595192e1 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/5D9EF9FE.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/6144936A.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/6144936A.fobj index 3c4ba985..428aba93 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/6144936A.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/6144936A.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/62EAD057.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/62EAD057.fobj index ce767b4e..a645f7e7 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/62EAD057.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/62EAD057.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj index ed1510ef..d3990540 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/63CC1F2F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/68F1B21F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/68F1B21F.fobj index fd83d8c3..1efca7ac 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/68F1B21F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/68F1B21F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/6D9C18E1.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/6D9C18E1.fobj index ec5c3d0d..4346b378 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/6D9C18E1.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/6D9C18E1.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/6FF9F17F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/6FF9F17F.fobj index 4589cbfd..02b9804c 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/6FF9F17F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/6FF9F17F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/707AC0E1.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/707AC0E1.fobj index d687825e..4d49aacf 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/707AC0E1.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/707AC0E1.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj index eab12e67..d3568000 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/70DAD674.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/70F421FA.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/70F421FA.fobj index 60f5e6e4..817d928f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/70F421FA.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/70F421FA.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj index 234be882..4e1dde82 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/71B772AB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/729AC483.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/729AC483.fobj index d8dd678f..c3b5ca07 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/729AC483.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/729AC483.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj index 6c054c89..dfab4152 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7351E2AB.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/74919DF8.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/74919DF8.fobj index 91059d8f..6a3df887 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/74919DF8.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/74919DF8.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/756F0234.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/756F0234.fobj index b08a3c11..1cb3f7e2 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/756F0234.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/756F0234.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/772DD71E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/772DD71E.fobj index 01bae3b1..c473877f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/772DD71E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/772DD71E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7983A72E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7983A72E.fobj index 9351e721..f8a0c7f4 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7983A72E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7983A72E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7A0C7F1E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7A0C7F1E.fobj index 8aaf6cf4..e9fdd343 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7A0C7F1E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7A0C7F1E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7B449809.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7B449809.fobj index 30eefa35..a4da8ab0 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7B449809.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7B449809.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7C3D1C23.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7C3D1C23.fobj index 2a5225a1..86f1768b 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7C3D1C23.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7C3D1C23.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj index 52a76e3c..a2af20d1 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7E5CEA89.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7EC280BF.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7EC280BF.fobj index 2bb05a88..0620bc29 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7EC280BF.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7EC280BF.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/7F944DA2.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/7F944DA2.fobj index 2ba80d77..66a89742 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/7F944DA2.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/7F944DA2.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/80714BF7.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/80714BF7.fobj index df8ddab6..5980bb6a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/80714BF7.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/80714BF7.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/81645E32.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/81645E32.fobj index d2afdc04..18d059e9 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/81645E32.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/81645E32.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/83226933.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/83226933.fobj index ba0d4a06..20be3f3f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/83226933.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/83226933.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/84B4A896.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/84B4A896.fobj index 9379d31a..292b7631 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/84B4A896.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/84B4A896.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/859F4B6C.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/859F4B6C.fobj index 02d939a9..15b76c5a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/859F4B6C.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/859F4B6C.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/89E34BF9.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/89E34BF9.fobj index 4ede2906..749f36dd 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/89E34BF9.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/89E34BF9.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8A69701A.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8A69701A.fobj index 0dbf546d..b36b2b5e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/8A69701A.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8A69701A.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8C5437C9.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8C5437C9.fobj new file mode 100644 index 00000000..c9212223 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8C5437C9.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8E329522.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8E329522.fobj index 25992ce9..619e1cee 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/8E329522.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8E329522.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8EE345C4.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8EE345C4.fobj index 0b4c0047..c3c67f11 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/8EE345C4.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8EE345C4.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj index cda8286e..fa295876 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/8F1BE0FA.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/92D064C3.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/92D064C3.fobj index 5739077d..9607b970 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/92D064C3.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/92D064C3.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/947A50D3.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/947A50D3.fobj index fc6909ce..1d7304c5 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/947A50D3.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/947A50D3.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/9627BD63.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/9627BD63.fobj new file mode 100644 index 00000000..4bcb3679 Binary files /dev/null and b/DeltaVRFMOD/.cache/fsbcache/Desktop/9627BD63.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/98DE7B74.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/98DE7B74.fobj index 0c96b46d..807ff72d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/98DE7B74.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/98DE7B74.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/9CA0E659.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/9CA0E659.fobj index 2467850b..23edfd61 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/9CA0E659.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/9CA0E659.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/A25F7529.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/A25F7529.fobj index 65e09fab..2a815a36 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/A25F7529.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/A25F7529.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/AFD56064.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/AFD56064.fobj index ae79229e..1ab6705d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/AFD56064.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/AFD56064.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B089E9A8.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B089E9A8.fobj index 86928297..f1be7002 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B089E9A8.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B089E9A8.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj index ba421b83..aa3a35d6 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B0AD5C08.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B2B40864.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B2B40864.fobj index fab26e75..4044c5eb 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B2B40864.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B2B40864.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B3D52519.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B3D52519.fobj index a54ee490..7cc71eee 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B3D52519.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B3D52519.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B3EC7828.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B3EC7828.fobj index e455b2db..45c6e62d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B3EC7828.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B3EC7828.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B4BA94C9.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B4BA94C9.fobj index d15fe301..b6b8c3e9 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B4BA94C9.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B4BA94C9.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B82BB4C7.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B82BB4C7.fobj index 3f20c960..f1a56489 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B82BB4C7.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B82BB4C7.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/B9356406.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/B9356406.fobj index 1e442338..380e1835 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/B9356406.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/B9356406.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/BB51836A.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/BB51836A.fobj index df515eb1..224c7c0d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/BB51836A.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/BB51836A.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/BB91DDC8.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/BB91DDC8.fobj index 753efb70..5c5fab77 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/BB91DDC8.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/BB91DDC8.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/BE7085C8.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/BE7085C8.fobj index 9434f683..89ab7151 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/BE7085C8.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/BE7085C8.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/C1ED047F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/C1ED047F.fobj index 5c0824d3..50b3294d 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/C1ED047F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/C1ED047F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/CA4D934E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/CA4D934E.fobj index 3eb682bc..166160a3 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/CA4D934E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/CA4D934E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/CB246C8D.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/CB246C8D.fobj index d946dad8..1fb08574 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/CB246C8D.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/CB246C8D.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/CB9FC727.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/CB9FC727.fobj index a7ea3fbd..5216213e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/CB9FC727.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/CB9FC727.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj index 09e05853..82a3129f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/D0A3D171.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/D415690F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/D415690F.fobj index d186ebe3..d6d41a83 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/D415690F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/D415690F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/D5BF551F.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/D5BF551F.fobj index 8c0b2980..80d16658 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/D5BF551F.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/D5BF551F.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/DDD5D826.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/DDD5D826.fobj index a026cee2..feafa1de 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/DDD5D826.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/DDD5D826.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/E02A63F6.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/E02A63F6.fobj index 74e7a8b3..3d4a6895 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/E02A63F6.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/E02A63F6.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/E673532C.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/E673532C.fobj index f0c128ad..759e05ca 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/E673532C.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/E673532C.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/EA44CAC3.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/EA44CAC3.fobj index 1d81d8aa..c2045dc6 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/EA44CAC3.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/EA44CAC3.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj index 987a2116..d4036b9b 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/ECF897C4.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/EE664F27.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/EE664F27.fobj index 345109e0..64fe679a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/EE664F27.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/EE664F27.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj index 3d878be1..435d1a74 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/EEB9C972.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/EF8BB6D9.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/EF8BB6D9.fobj index bb85d056..b342640e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/EF8BB6D9.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/EF8BB6D9.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F0328AC6.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F0328AC6.fobj index c4a3868b..18a00a4a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F0328AC6.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F0328AC6.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F125C5E0.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F125C5E0.fobj index 2677a96b..8b92442f 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F125C5E0.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F125C5E0.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F13F1C8C.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F13F1C8C.fobj index 83835ba3..a9f4a32a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F13F1C8C.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F13F1C8C.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F1824B96.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F1824B96.fobj index c1350521..3353ba82 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F1824B96.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F1824B96.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj index 09ec3e14..8d9b7a8a 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F246625E.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F399CEFD.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F399CEFD.fobj index af7330e2..ca1427ea 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F399CEFD.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F399CEFD.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F4D6123B.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F4D6123B.fobj index 9b743ef2..7463b3bd 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F4D6123B.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F4D6123B.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F671D218.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F671D218.fobj index fc39215f..0a9b7eee 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F671D218.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F671D218.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F6E63885.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F6E63885.fobj index cf599eed..f5d47aff 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F6E63885.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F6E63885.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj index 81daed8e..e0b2ac1e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F8AEEC18.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/F95980D7.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/F95980D7.fobj index 61ce8c45..b3f4d55e 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/F95980D7.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/F95980D7.fobj differ diff --git a/DeltaVRFMOD/.cache/fsbcache/Desktop/FFDD5870.fobj b/DeltaVRFMOD/.cache/fsbcache/Desktop/FFDD5870.fobj index 1fcce4e7..e05ce832 100644 Binary files a/DeltaVRFMOD/.cache/fsbcache/Desktop/FFDD5870.fobj and b/DeltaVRFMOD/.cache/fsbcache/Desktop/FFDD5870.fobj differ diff --git a/DeltaVRFMOD/.cache/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.pdc b/DeltaVRFMOD/.cache/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.pdc new file mode 100644 index 00000000..e8fc5e3b Binary files /dev/null and b/DeltaVRFMOD/.cache/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.pdc differ diff --git a/DeltaVRFMOD/.cache/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.pdc b/DeltaVRFMOD/.cache/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.pdc new file mode 100644 index 00000000..b692b33f Binary files /dev/null and b/DeltaVRFMOD/.cache/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.pdc differ diff --git a/DeltaVRFMOD/.cache/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.pdc b/DeltaVRFMOD/.cache/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.pdc new file mode 100644 index 00000000..348ff73b Binary files /dev/null and b/DeltaVRFMOD/.cache/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.pdc differ diff --git a/DeltaVRFMOD/.cache/{402e0901-85da-4d71-9569-441181cc51e6}.pdc b/DeltaVRFMOD/.cache/{402e0901-85da-4d71-9569-441181cc51e6}.pdc new file mode 100644 index 00000000..a15f7305 Binary files /dev/null and b/DeltaVRFMOD/.cache/{402e0901-85da-4d71-9569-441181cc51e6}.pdc differ diff --git a/DeltaVRFMOD/Assets/Ambience, Restaurant & Bar, Bakery Cafeteria, People Chattering, Machine Sounds, Movement, Cashier, Sao Luis, Brazil 02 (AmbiX) SND122099.wav b/DeltaVRFMOD/Assets/Ambience, Restaurant & Bar, Bakery Cafeteria, People Chattering, Machine Sounds, Movement, Cashier, Sao Luis, Brazil 02 (AmbiX) SND122099.wav new file mode 100644 index 00000000..716ba915 --- /dev/null +++ b/DeltaVRFMOD/Assets/Ambience, Restaurant & Bar, Bakery Cafeteria, People Chattering, Machine Sounds, Movement, Cashier, Sao Luis, Brazil 02 (AmbiX) SND122099.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:473808c17dc0b94e9309f25ba90a4649b90efef9a39deb7852f92b592791d1d1 +size 238326260 diff --git a/DeltaVRFMOD/Assets/PortalNonMagical 2.wav b/DeltaVRFMOD/Assets/PortalNonMagical 2.wav new file mode 100644 index 00000000..e808decb --- /dev/null +++ b/DeltaVRFMOD/Assets/PortalNonMagical 2.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:852452cec4c76eb2ffea537a71e495a1b704027bb64a52779c04c0ab1c2e8806 +size 10752044 diff --git a/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345 1.wav b/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345 1.wav new file mode 100644 index 00000000..60151575 --- /dev/null +++ b/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345 1.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d8f881dfffb16e85a66e17f93079a1cb01dc6d5e26340d3c90e1c9c5f322ad3 +size 1115992 diff --git a/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345.wav b/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345.wav new file mode 100644 index 00000000..ba2e1763 --- /dev/null +++ b/DeltaVRFMOD/Assets/Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81b29d63a36b9a5ed12093cf523fc20d482614982f30780e88427b0a1a6bf3f0 +size 846976 diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank index 2dd4ab09..a1fc8b66 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Ambience.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank index 8b267ed6..6eda694b 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank index 3dac05a2..31d0b723 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Master.strings.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank b/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank index 299b110c..c78433af 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/Music.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank index 120ba09c..148c6ec5 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/SFX.bank differ diff --git a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank index 013e55b9..4eb4a04d 100644 Binary files a/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank and b/DeltaVRFMOD/Build/Desktop/Desktop/UI.bank differ diff --git a/DeltaVRFMOD/Metadata/AudioFile/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.xml b/DeltaVRFMOD/Metadata/AudioFile/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.xml new file mode 100644 index 00000000..c4dfb5e6 --- /dev/null +++ b/DeltaVRFMOD/Metadata/AudioFile/{025d6408-eb1d-499c-8f6a-3a02ee5ccbda}.xml @@ -0,0 +1,20 @@ + + + + + Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345 1.wav + + + 96 + + + 2 + + + 1.9373020833333334 + + + {0fbc34f9-6022-42da-8b3b-f18344a8ea0f} + + + diff --git a/DeltaVRFMOD/Metadata/AudioFile/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.xml b/DeltaVRFMOD/Metadata/AudioFile/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.xml new file mode 100644 index 00000000..bae9cf4e --- /dev/null +++ b/DeltaVRFMOD/Metadata/AudioFile/{0e0474ef-d138-4850-b782-ac2c7ccca63a}.xml @@ -0,0 +1,23 @@ + + + + + PortalNonMagical 2.wav + + + true + + + 48 + + + 4 + + + 14 + + + {0fbc34f9-6022-42da-8b3b-f18344a8ea0f} + + + diff --git a/DeltaVRFMOD/Metadata/AudioFile/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.xml b/DeltaVRFMOD/Metadata/AudioFile/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.xml new file mode 100644 index 00000000..320276a4 --- /dev/null +++ b/DeltaVRFMOD/Metadata/AudioFile/{1e3e4350-609a-4ce4-a418-9c1bb50b9123}.xml @@ -0,0 +1,20 @@ + + + + + Vehicles, Horn, Car, Audi Q5, Short, Exterior, Multiple SND3345.wav + + + 96 + + + 2 + + + 1.4702604166666666 + + + {0fbc34f9-6022-42da-8b3b-f18344a8ea0f} + + + diff --git a/DeltaVRFMOD/Metadata/AudioFile/{402e0901-85da-4d71-9569-441181cc51e6}.xml b/DeltaVRFMOD/Metadata/AudioFile/{402e0901-85da-4d71-9569-441181cc51e6}.xml new file mode 100644 index 00000000..a0aa42ea --- /dev/null +++ b/DeltaVRFMOD/Metadata/AudioFile/{402e0901-85da-4d71-9569-441181cc51e6}.xml @@ -0,0 +1,23 @@ + + + + + Ambience, Restaurant & Bar, Bakery Cafeteria, People Chattering, Machine Sounds, Movement, Cashier, Sao Luis, Brazil 02 (AmbiX) SND122099.wav + + + true + + + 96 + + + 4 + + + 206.88037499999999 + + + {0fbc34f9-6022-42da-8b3b-f18344a8ea0f} + + + diff --git a/DeltaVRFMOD/Metadata/EncodingSetting/{db21f68e-cbb6-4508-93fd-291c051c1dae}.xml b/DeltaVRFMOD/Metadata/EncodingSetting/{db21f68e-cbb6-4508-93fd-291c051c1dae}.xml index c4c9b851..0c65b2d2 100644 --- a/DeltaVRFMOD/Metadata/EncodingSetting/{db21f68e-cbb6-4508-93fd-291c051c1dae}.xml +++ b/DeltaVRFMOD/Metadata/EncodingSetting/{db21f68e-cbb6-4508-93fd-291c051c1dae}.xml @@ -2,10 +2,10 @@ - 3 + 1 - 53 + 37 {66cdeefb-266a-484b-97e7-58ddd0a32ff2} diff --git a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml index 339163f2..6f2d06a3 100644 --- a/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml +++ b/DeltaVRFMOD/Metadata/Event/{0cc3b481-962c-43bc-a963-058a71c1632b}.xml @@ -5,7 +5,7 @@ PortalSpacial - 5 + 2 {e5bf65ee-d6e7-4aa2-8f58-f527d31905fa} @@ -207,9 +207,8 @@ + {1fa0b00b-9ea4-4d5e-9800-9d8b13331627} {018473e4-0f0a-45f3-bcda-c733c71ad55e} - {db98d02a-7f61-4302-91b6-d6bbcd7b1bdb} - {abb71e19-d4dd-40a4-8768-d3e84d173117} {1b59e476-ff30-46fa-be6f-43a65cbf5b64} @@ -264,16 +263,8 @@ {50c8ed2a-a7f5-474d-bb5e-242ed4771c16} + - - - - true - - - {0ad09f58-e094-42d0-a51b-d8be1fcebb74} - - 19834.9668 @@ -348,49 +339,6 @@ -3.46837234 - - - Steam Audio Spatializer - - - {ab4b7596-405d-4a79-a487-4a89c03bb335} - {dc9c6152-4668-4939-94c4-ff4875d49008} - {9fb5845a-af67-4361-86e5-9a758524fe07} - {fc083177-0d68-45cb-9e5d-c58838761232} - {4018b353-6254-4156-abc6-79e07e77ed0a} - {cc502b95-6a11-4d11-887c-009812a65add} - {ede23a25-cee4-4c74-a1c3-a5528bc90ed4} - {df7b2d9b-1b66-4209-9ae4-a08ca85f9440} - {dbb2ff33-5859-4793-a613-b395cada8c79} - {bed13428-92cf-4746-8a55-efa76a0a767a} - {ff5823ea-8cf7-4b43-b8be-fc5bf6568e5a} - {c832b338-f51a-4000-a5d4-9dde1cdfb201} - {8d06c7cf-27ff-4e89-bf21-21d4f3b55e74} - {a7430a85-3994-4ca9-ba82-9ddd96b6ed20} - {c3a6e55c-a313-4145-ac56-55ea55b97c56} - {e420d06f-af57-4b13-93b4-cec491f2f43a} - {0c39b6e6-b666-4e2c-a40b-6335dcb1a719} - {4f73d5f5-80bb-42a2-8c89-a050c86c9836} - {b6483975-66fc-4811-9563-793d143aa0b1} - {02c91b12-7285-4002-8011-b09bb23c4af3} - {210b4177-a17c-4bd1-8d4d-aca10dc7b776} - {2c078bb2-c91f-4c45-b565-5d962dea218b} - {fd697f7c-1550-49bb-9604-e6732051700c} - {cf5f1732-d989-4b03-aec1-f4b6fb0fe17a} - {2a0a2858-a718-486d-a244-815408d242d3} - {7b516128-50e8-4d73-90ef-b690ce989634} - {e91e1284-2096-42f0-9c88-e4cc4f95388f} - {1764410a-8e4a-4dd8-8815-0538f4ec3481} - {b349845a-e93c-4ed0-8d08-9db5e5b5e60d} - {5652ba39-17ba-4369-938d-31e2f67c8b82} - {ce2906a4-eb23-46e5-8994-ac3bbfff0732} - {9d9418c8-cb5c-4bd2-a300-9903b5be82a4} - {c6bf6e40-6b55-47f5-9ca5-bec0e325d29e} - {39d9f24e-4e60-4cf2-bb95-11f68ef8b91e} - {a2c0cb01-a6b9-4e29-a868-9876e1f24b6e} - {38040401-218f-4f75-bc87-dbb3bfa714f4} - - frequencyA @@ -399,402 +347,6 @@ {789ce553-d213-4652-8f66-d3b6138b3699} - - - SourcePos - - - -2 - - - - - OverallGain - - - -1 - - - - - ApplyDA - - - 1 - - - 0 - - - 2 - - - - - ApplyAA - - - 0 - - - 0 - - - 2 - - - - - ApplyDir - - - 1 - - - 0 - - - 2 - - - - - ApplyOccl - - - 0 - - - 0 - - - 2 - - - - - ApplyTrans - - - 0 - - - 0 - - - 2 - - - - - ApplyRefl - - - false - - - - - ApplyPath - - - false - - - - - Interpolation - - - 0 - - - 0 - - - 1 - - - - - DistAtt - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - DAType - - - 1 - - - 0 - - - 4 - - - - - DAMinDist - - - 1 - - - {(0.000000,0.000000)(1.000000,10000.000000)} - - - - - DAMaxDist - - - 50 - - - {(0.000000,0.000000)(1.000000,10000.000000)} - - - - - AirAbsLow - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - AirAbsMid - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - AirAbsHigh - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - Directivity - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - DipoleWeight - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - DipolePower - - - 4 - - - {(0.000000,1.000000)(1.000000,4.000000)} - - - - - Occlusion - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - TransType - - - 0 - - - 0 - - - 1 - - - - - TransLow - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - TransMid - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - TransHigh - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - DirMixLevel - - - 1 - - - {(0.000000,0.000000)(1.000000,1.000000)} - - - - - ReflBinaural - - - false - - - - - ReflMixLevel - - - 1 - - - {(0.000000,0.000000)(1.000000,10.000000)} - - - - - PathBinaural - - - false - - - - - PathMixLevel - - - 1 - - - {(0.000000,0.000000)(1.000000,10.000000)} - - - - - SimOutputs - - - 0 - - - - - DirectBinaural - - - true - - - - - DistRange - - - -6 - - - - - SimOutHandle - - - -1 - - - -1 - - - 10000 - - - - - OutputFormat - - - 0 - - - 0 - - - 2 - - - - - PathNormEQ - - - false - - {fb894807-eb7f-48db-b3de-e2f5dd3322a2} diff --git a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml index 46ca3ecc..a584c692 100644 --- a/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml +++ b/DeltaVRFMOD/Metadata/Event/{4d5ea694-f330-46d1-a569-9b03007fb85f}.xml @@ -60,7 +60,7 @@ - {1db0440c-6a8a-470f-850a-d2fd0dd070cb} + {fad2f0a3-34f1-4b99-8cd9-1a40634a3fbe} {b8ab8648-8ab9-4b07-a6af-76d508502d9c} @@ -68,7 +68,7 @@ - {1db0440c-6a8a-470f-850a-d2fd0dd070cb} + {fad2f0a3-34f1-4b99-8cd9-1a40634a3fbe} @@ -88,26 +88,29 @@ - + - 1.4000000000000001 + 0.40000000000000002 - 1.3899999999999999 + 0.97999999999999976 - 1.4600000000000002 + 0.039999999999999813 - {111a1b6f-a8ed-41dc-b6a8-69d90e344aff} + {4a94fa19-4f76-4017-b150-e97c656f1bcc} + + + {4ce112e6-6406-4b22-8e96-970dfa348f96} - {e5c8c7bf-afb1-4055-a1b0-a2c3f583f42c} + {025d6408-eb1d-499c-8f6a-3a02ee5ccbda} - -7.5 + 5 Audio 1 @@ -126,16 +129,26 @@ {3736e3ae-7ec8-45fc-8a21-17a45aa7e86a} {e2c1f77e-3ab7-4be7-bdbd-65a35dcc99c5} + {59a6fded-8c00-4770-b511-d17f89ae485a} + {1112f9e7-08a0-46ea-b399-7fb72048fcd6} - + - {87542ae9-e834-42d6-b53e-cf380095bc2c} + {df4fe024-bb4d-4cb0-856a-1818b096c24d} - {d80a7e09-dd1f-41d9-90aa-23da2eca0c0e} + {4fa939b1-d2ba-4f39-900c-5a7d99d835e7} + + + + + {7f422562-5558-48cb-ba8c-8d39a51fac65} + + + {46faba62-10b4-46c4-878d-808a5c0dc7e2} @@ -146,24 +159,128 @@ - + + + 5 + + + 21999.9902 + + + 547.282654 + + + 0.696887434 + + + 0.33908385 + + + + + 20000 + + + 0.680000007 + + + {9321dce1-f118-4a03-afec-bca741994140} + + + - 1.4000000000000001 + 0.40000000000000002 0 - -0.220267966 + -0.0792723075 - + - 1.4600000000000002 + 0.48000000000000004 1 + + + 0.93999999999999906 + + + 1 + + + 0.237292022 + + + + + 1.379999999999999 + + + 0 + + + + + frequencyA + + + {7abf0982-75de-459a-ae97-bd6d092ab33c} + + + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {65ee03d2-5398-4450-9248-49cd08e1211a} + {b4fbfa1e-e01f-49dc-b548-a7d745a92a81} + {226839ab-c0f6-4912-9a6d-79748b290d69} + {9c6501f4-ac98-437e-b4d0-066a9114f456} + + + + + 0 + + + 22000 + + + -0.00232479558 + + + + + 1 + + + 20 + + + + + 0.5 + + + 700 + + + -0.383039117 + + + + + 0.96999999999999997 + + + 70 + + diff --git a/DeltaVRFMOD/Metadata/Event/{ffd83336-2b2c-4be8-8882-0465aced08cc}.xml b/DeltaVRFMOD/Metadata/Event/{ffd83336-2b2c-4be8-8882-0465aced08cc}.xml new file mode 100644 index 00000000..7138ddc2 --- /dev/null +++ b/DeltaVRFMOD/Metadata/Event/{ffd83336-2b2c-4be8-8882-0465aced08cc}.xml @@ -0,0 +1,323 @@ + + + + + AmbisonicTesting + + + 1 + + + {e5bf65ee-d6e7-4aa2-8f58-f527d31905fa} + + + {d809938d-1f9f-4a8a-b9c4-b0467ed6bc50} + + + {2af84330-10a5-47dd-bf0e-16a79b8cf877} + + + {0643406d-0e5d-44a3-b01d-9127924b01ca} + + + {66209596-a0de-4b44-a040-655519972fa2} + + + {8a17d50c-4c7a-40d4-a064-8240cd9dc438} + + + {75c4c869-c780-4d12-b477-bf207e5d42ac} + + + {6ae83379-ff03-4e71-bb5f-9d741142e1be} + + + {d3add78c-790b-4abb-8ab0-61ce3541ee18} + + + {f141f2d4-6fa9-465a-a607-941cef3e083a} + + + + + {e2ef8db4-506e-4782-a900-24f3ef71f830} + + + + + {1222c392-0c86-4979-8b67-295f7f4fb023} + + + {e2ef8db4-506e-4782-a900-24f3ef71f830} + + + + + {92b5c503-509b-4328-a944-c4932f178cf6} + + + {831a7c65-2870-497f-9442-892abed24b63} + + + {ce68ea24-56d6-4af5-a850-87bda0652ecc} + + + + + + + {93681de2-f179-42b2-90f2-c16ab18b08c3} + + + {2986671b-9785-4aee-a650-30abe9c7ce67} + + + + + {93681de2-f179-42b2-90f2-c16ab18b08c3} + + + {ba5c2161-2efa-4558-9a36-ef1442e055cd} + + + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + + + {e4b43fa8-2d0d-4b09-9f36-eb5f58d4799f} + + + {2ce88739-3ddb-414c-b02f-a1e3492a29f0} + + + {a805616e-47fe-4b74-907c-5dc3f11e9f16} + + + {d809938d-1f9f-4a8a-b9c4-b0467ed6bc50} + + + + + {e4b43fa8-2d0d-4b09-9f36-eb5f58d4799f} + + + + + {379c1b83-5167-45a5-b8cd-c8ae6d3e30fa} + + + + + + 206.88037499999999 + + + {402e0901-85da-4d71-9569-441181cc51e6} + + + + + Audio 1 + + + {09158993-fa8b-4746-96c3-92f9f1bade6f} + + + {76fc0ba7-0982-48ef-b61d-30f9ca0572aa} + + + {e2ef8db4-506e-4782-a900-24f3ef71f830} + + + + + 0 + + + 206.88037499999999 + + + {6ae83379-ff03-4e71-bb5f-9d741142e1be} + + + {8a17d50c-4c7a-40d4-a064-8240cd9dc438} + + + + + volume + + + {6b9b64a2-66ae-4b0c-a2ff-992ba9d18416} + + + + + {ed41e156-0db5-4cd1-ac43-9df3cb00997b} + {9c2ddb63-14e0-45fd-b576-15f001aee7ff} + {e7d10720-a5d3-4f41-a65b-24b2283137d2} + + + + + + + {f5b1017b-0403-46cd-bba6-0409480e08cd} + + + + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {0e02f8b2-1440-4979-ab69-bde307a9e862} + {2f19d35d-c514-43bf-ba85-c79d93fcf127} + {d0e921ab-f5bb-4a73-98a9-3e95e670f6d4} + {bf6e3a54-d688-4653-8fea-680376e81de3} + + + + + {d0afea29-a68d-48b1-adb6-281476e30de2} + + + + + + 22000 + + + {4f0234cb-53aa-497d-b938-6bf933238cfa} + + + + + + 0 + + + 0 + + + + + 1 + + + -80 + + + + + 0.56355932203389836 + + + -5 + + + + + 0.91949152542372881 + + + -11.498188 + + + + + MetaXRAudio Ambisonics + + + {a43f74da-e6c4-4b38-bc1b-d5eec08db0d7} + {ad3437ed-c62e-4118-a0ea-cec43242445b} + {c8b85373-5975-4acc-89fc-1dfb9ff19c76} + + + + + frequencyA + + + {9379e6eb-4743-405c-9b34-591b973bc093} + + + + + 3D Attributes + + + + -2 + + + + + Overall Gain + + + + -1 + + + + + Mode + + + 0 + + + {(0.000000,0.000000)(1.000000,1.000000)} + + + + + {fb894807-eb7f-48db-b3de-e2f5dd3322a2} + + + {6525b2e9-1b7a-46a8-a8ba-05ddc07fa089} + {894e559b-ada6-47b1-85e3-e110a9ce115a} + {156859e8-993a-4a04-a39d-3596c45e9193} + {c203e957-cf1f-47e4-8026-25ed71a489bc} + + + + + 0.0005649717514124294 + + + 18000 + + + -0.0347861312 + + + + + 0.98997916666666663 + + + 20 + + + + + 0.5 + + + 3000 + + + + + 0.95000000000000007 + + + 220 + + + diff --git a/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml b/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml index a3ab7bc7..065d9e9c 100644 --- a/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml +++ b/DeltaVRFMOD/Metadata/ParameterPreset/{c4b79f2b-c503-4e8a-bc42-6c104c7bac33}.xml @@ -26,6 +26,9 @@ 2.4000000953674316 + + 2.2000000476837158 + true diff --git a/DeltaVRFMOD/Plugins/MetaLogo.png b/DeltaVRFMOD/Plugins/MetaLogo.png new file mode 100644 index 00000000..d17ca834 --- /dev/null +++ b/DeltaVRFMOD/Plugins/MetaLogo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:faca2622ecf145158010dc1ca74b28602e94b83e0318f80a7a4832bda7a4bd79 +size 3314 diff --git a/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.dll b/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.dll new file mode 100644 index 00000000..ce6e8af6 --- /dev/null +++ b/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e2120a4d3827b6f1d05404c87213bc68b23e6a4dce91923dff25b34923c3558 +size 2603008 diff --git a/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.plugin.js b/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.plugin.js new file mode 100644 index 00000000..6e7cf8d1 --- /dev/null +++ b/DeltaVRFMOD/Plugins/MetaXRAudioFMOD.plugin.js @@ -0,0 +1,227 @@ +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, }, + ], + } +}); diff --git a/Packages/manifest.json b/Packages/manifest.json index c1390d2e..fe88d8ce 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.meta.xr.sdk.acoustics": "file:C:/Users/nizamov/Downloads/meta_xr_audio_sdk_fmod_81.0/FMOD/Unity/MetaXRSDKAcousticsFMOD.tgz", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ai.navigation": "1.1.1", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d56d202b..11e05355 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,6 +6,12 @@ "source": "embedded", "dependencies": {} }, + "com.meta.xr.sdk.acoustics": { + "version": "file:C:/Users/nizamov/Downloads/meta_xr_audio_sdk_fmod_81.0/FMOD/Unity/MetaXRSDKAcousticsFMOD.tgz", + "depth": 0, + "source": "local-tarball", + "dependencies": {} + }, "com.unity.2d.sprite": { "version": "1.0.0", "depth": 0,