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

Steam Audio issue fixed, volume slider issue fixed

Browse Source
This commit is contained in:
Timur Nizamov
2025-12-14 20:32:59 +02:00
parent 4bf99dd820
commit 252e7a2fa6
57 changed files with 13013 additions and 504 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/SteamAudio/Resources/SteamAudioSettings.asset LFS
View File

Binary file not shown.

77
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab
View File

@@ -93,6 +93,7 @@ GameObject:
- component: {fileID: 1567291592690202059}
- component: {fileID: 8756359772621811462}
- component: {fileID: 6597554986000412572}
- component: {fileID: 6564746254256282602}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -175,7 +176,7 @@ AudioListener:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285459124454274477}
m_Enabled: 1
m_Enabled: 0
--- !u!114 &6874539830441913527
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -364,6 +365,35 @@ MonoBehaviour:
m_EditorClassIdentifier:
nonRigidbodyVelocity: 0
attenuationObject: {fileID: 0}
--- !u!114 &6564746254256282602
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 285459124454274477}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6fd9ebf1401392e4bbd47fea32f47642, type: 3}
m_Name:
m_EditorClassIdentifier:
currentBakedListener: {fileID: 0}
applyReverb: 0
reverbType: 0
useAllProbeBatches: 0
probeBatches: []
mTotalDataSize: 0
mProbeDataSizes:
mIdentifier:
type: 0
variation: 0
endpointInfluence:
center:
x: 0
y: 0
z: 0
radius: 0
mProbeBatchesUsed: []
--- !u!1 &326335054389456799
GameObject:
m_ObjectHideFlags: 0
@@ -3381,8 +3411,6 @@ GameObject:
- component: {fileID: 4833661431984909633}
- component: {fileID: 6982718084823378580}
- component: {fileID: 7143839380141204878}
- component: {fileID: 4420552791209831543}
- component: {fileID: 2875548118707696675}
m_Layer: 0
m_Name: XR Origin
m_TagString: Player
@@ -3500,49 +3528,6 @@ MonoBehaviour:
TeleportRayLine: {fileID: 1472230073214394331}
defaultGravity: {fileID: 1291266247855740630}
isInSpace: 0
--- !u!114 &4420552791209831543
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3865165877314776266}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3}
m_Name:
m_EditorClassIdentifier:
nonRigidbodyVelocity: 0
attenuationObject: {fileID: 3865165877314776266}
--- !u!114 &2875548118707696675
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3865165877314776266}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6fd9ebf1401392e4bbd47fea32f47642, type: 3}
m_Name:
m_EditorClassIdentifier:
currentBakedListener: {fileID: 0}
applyReverb: 0
reverbType: 0
useAllProbeBatches: 0
probeBatches: []
mTotalDataSize: 0
mProbeDataSizes:
mIdentifier:
type: 0
variation: 0
endpointInfluence:
center:
x: 0
y: 0
z: 0
radius: 0
mProbeBatchesUsed: []
--- !u!1 &3920485686434598800
GameObject:
m_ObjectHideFlags: 0

3
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/AudioSliderDragHandler.cs
View File

@@ -17,6 +17,8 @@ public class AudioSliderDragHandler : MonoBehaviour, IBeginDragHandler, IDragHan
private Vector2 backgroundStart;
private float backgroundWidth;
public System.Action<float> OnValueChanged;
void Awake()
{
handleRect = GetComponent<RectTransform>();
@@ -80,6 +82,7 @@ public class AudioSliderDragHandler : MonoBehaviour, IBeginDragHandler, IDragHan
CurrentValue = Mathf.Lerp(minValue, maxValue, normalized);
//Debug.Log(warningThreshholdValue);
OnValueChanged?.Invoke(CurrentValue);
}

5
Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/SliderToVCA.cs
View File

@@ -17,8 +17,9 @@ public class SliderToVCA : MonoBehaviour
private void Awake()
{
slider = GetComponent<AudioSliderDragHandler>();
slider.OnValueChanged += ApplyVolume;
}
private void Start()
private void Start()
{
float initialValue = GetInitialValueFromAudioManager();
slider.SetHandlePosition(initialValue); // we will add this function
@@ -40,7 +41,7 @@ private float GetInitialValueFromAudioManager()
case VCATarget.UI:
return AudioManager.Instance.UIVolume;
default:
return 1f;
return 0.5f;
}
}

17
Assets/_PROJECT/Multiplayer/NetworkPrefabs/KBMPlayer.prefab
View File

@@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 1377620620750533915}
- component: {fileID: 1970713256952188388}
- component: {fileID: 5044934254662751385}
- component: {fileID: -4170824526974918850}
m_Layer: 0
m_Name: Camera
m_TagString: Untagged
@@ -93,7 +92,7 @@ AudioListener:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1135870841938864998}
m_Enabled: 1
m_Enabled: 0
--- !u!114 &5044934254662751385
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -137,20 +136,6 @@ MonoBehaviour:
mipBias: 0
varianceClampScale: 0.9
contrastAdaptiveSharpening: 0
--- !u!114 &-4170824526974918850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1135870841938864998}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3}
m_Name:
m_EditorClassIdentifier:
nonRigidbodyVelocity: 0
attenuationObject: {fileID: 0}
--- !u!1 &8146527781413792986
GameObject:
m_ObjectHideFlags: 0

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

Binary file not shown.

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

@@ -116,34 +116,45 @@ public class AudioManager : MonoBehaviour
_instance.sfxVCA = RuntimeManager.GetVCA("vca:/SFX");
_instance.uiVCA = RuntimeManager.GetVCA("vca:/UI");
_instance.masterVCA.setVolume(_instance.MasterVolume);
_instance.musicVCA.setVolume(_instance.MusicVolume);
_instance.ambienceVCA.setVolume(_instance.AmbienceVolume);
_instance.sfxVCA.setVolume(_instance.SFXVolume);
_instance.uiVCA.setVolume(_instance.UIVolume);
}
public void SetMasterVCA(float value)
{
masterVCA.setVolume(value);
MasterVolume = value;
masterVCA.setVolume(MasterVolume);
}
public void SetMusicVCA(float value)
{
musicVCA.setVolume(value);
MusicVolume = value;
musicVCA.setVolume(MusicVolume);
}
public void SetAmbientVCA(float value)
{
ambienceVCA.setVolume(value);
AmbienceVolume = value;
ambienceVCA.setVolume(AmbienceVolume);
}
public void SetSFXVCA(float value)
{
sfxVCA.setVolume(value);
SFXVolume = value;
sfxVCA.setVolume(SFXVolume);
}
public void SetUIVCA(float value)
{
uiVCA.setVolume(value);
UIVolume = value;
uiVCA.setVolume(UIVolume);
}
private void Awake()
{
if (_instance && _instance != this)
@@ -161,23 +172,6 @@ public class AudioManager : MonoBehaviour
return eventInstance;
}
private void Update()
{
//musicBus.setVolume(MusicVolume);
//ambientBus.setVolume(AmbienceVolume);
//sfxBus.setVolume(SFXVolume);
//uiBus.setVolume(UIVolume);
//masterBus.setVolume(MasterVolume);
//VCA volumes
masterVCA.setVolume(MasterVolume);
ambienceVCA.setVolume(AmbienceVolume);
musicVCA.setVolume(MusicVolume);
sfxVCA.setVolume(SFXVolume);
uiVCA.setVolume(UIVolume);
}
public static bool IsEventReferenceValid(EventReference eventReference)
{
return eventReference.Guid != nullGuid;