forked from cgvr/DeltaVR
WIP animate mouth scale based on precalculated voiceline amplitude timelines
This commit is contained in:
@@ -3,7 +3,6 @@ using FMODUnity;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.InteropServices;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
|
||||
@@ -49,6 +48,7 @@ public class AudioManager : MonoBehaviour
|
||||
private Bus musicBus;
|
||||
private Bus sfxBus;
|
||||
private Bus uiBus;
|
||||
private Bus voiceoverBus;
|
||||
|
||||
const string sid = "00000000-0000-0000-0000-000000000000";
|
||||
static readonly Guid nullGuid = new Guid(sid);
|
||||
@@ -112,6 +112,7 @@ public class AudioManager : MonoBehaviour
|
||||
_instance.ambientBus = RuntimeManager.GetBus("bus:/Ambiences");
|
||||
_instance.sfxBus = RuntimeManager.GetBus("bus:/SFX");
|
||||
_instance.uiBus = RuntimeManager.GetBus("bus:/UI");
|
||||
_instance.voiceoverBus = RuntimeManager.GetBus("bus:/Voiceovers");
|
||||
|
||||
_instance.masterVCA = RuntimeManager.GetVCA("vca:/Master");
|
||||
_instance.musicVCA = RuntimeManager.GetVCA("vca:/Music");
|
||||
@@ -294,7 +295,7 @@ public class AudioManager : MonoBehaviour
|
||||
//=====//
|
||||
//=====//
|
||||
|
||||
public void PlayDialogue(string audioTableKey, GameObject emitter = null, float radioAmount = 0f)
|
||||
public EventInstance PlayDialogue(string audioTableKey, GameObject emitter = null, float radioAmount = 0f)
|
||||
{
|
||||
|
||||
var dialogueEvent = FMODEvents.Instance.VoiceoverAll;
|
||||
@@ -302,7 +303,7 @@ public class AudioManager : MonoBehaviour
|
||||
if (dialogueEvent.IsNull)
|
||||
{
|
||||
Debug.LogWarning("Dialogue EventReference is not assigned!");
|
||||
return;
|
||||
return default;
|
||||
}
|
||||
|
||||
EventInstance instance = RuntimeManager.CreateInstance(dialogueEvent);
|
||||
@@ -310,7 +311,7 @@ public class AudioManager : MonoBehaviour
|
||||
if (emitter != null)
|
||||
{
|
||||
RuntimeManager.AttachInstanceToGameObject(instance, emitter);
|
||||
instance.set3DAttributes(FMODUnity.RuntimeUtils.To3DAttributes(emitter.gameObject));
|
||||
instance.set3DAttributes(RuntimeUtils.To3DAttributes(emitter.gameObject));
|
||||
}
|
||||
|
||||
// Assign the FMOD parameter value (in this case: Continous type)
|
||||
@@ -334,7 +335,8 @@ public class AudioManager : MonoBehaviour
|
||||
}
|
||||
|
||||
instance.start();
|
||||
instance.release();
|
||||
// instance.release();
|
||||
return instance;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user