diff --git a/VACS.cs b/VACS.cs
index 42acf09bca70b7fe2e8cebf08cc9bab345b11380..33a2dd95d74fb7c1a1283c3e3e44fbfd9fce5a6e 100644
--- a/VACS.cs
+++ b/VACS.cs
@@ -22,13 +22,15 @@ namespace VA
public bool Connect()
{
bool b = NativeConnectLocalNetClient(_NetClient);
- Debug.Assert(b, "Not Connected to VA.");
+ Debug.Assert(b, "Couldn't connect to VA.");
return b;
}
public bool Connect( string HostIP , int Port )
{
- return NativeConnectNetClient(_NetClient, HostIP, Port);
+ bool b = NativeConnectNetClient(_NetClient, HostIP, Port);
+ Debug.Assert(b, "[VAU]Couldn't connect to VA.");
+ return b;
}
public bool IsConnected()
@@ -49,12 +51,9 @@ namespace VA
/**
* Create a listener (returns ID)
*/
- public int CreateListener( string Name, int AuraMode, int HRIR )
+ public int CreateListener( string Name)
{
- if (!IsConnected())
- return -1;
-
- return NativeCreateListener(_NetClient, Name, AuraMode, HRIR);
+ return NativeCreateListener(_NetClient, Name);
}
public void SetListenerPosition(int Listener, double x, double y, double z)
@@ -99,7 +98,7 @@ namespace VA
{
int b = NativeLoadHRIRDataset(_NetClient, FilePath, Name);
- Debug.Assert(b != -1);
+ Debug.Assert(b != -1,"[VAU]HRIRDataset konnte nicht geladen werden.");
return b;
}
@@ -371,7 +370,7 @@ namespace VA
double dUpX, double dUpY, double dUpZ,
double dVelocityX, double dVelocityY, double dVelocityZ );
//[ DllImport( "VANetCSWrapper" ) ] private static extern void NativeGetListenerIDs( IntPtr pClient, std::vector<int>& vListenerIDs );
- [ DllImport( "VANetCSWrapper" ) ] private static extern int NativeCreateListener( IntPtr pClient, string sName, int iAuralizationMode, int iHRIRDatasetID );
+ [ DllImport( "VANetCSWrapper" ) ] private static extern int NativeCreateListener( IntPtr pClient, string sName);
[ DllImport( "VANetCSWrapper" ) ] private static extern int NativeCreateListenerExplicitRenderer( IntPtr pClient, string sName, string sRendererID );
[ DllImport( "VANetCSWrapper" ) ] private static extern void NativeSetActiveListenerExplicitRenderer( IntPtr pClient, int iListenerID, string sRendererID );
[ DllImport( "VANetCSWrapper" ) ] private static extern int NativeGetActiveListenerExplicitRenderer( IntPtr pClient, string sRendererID );
diff --git a/VAUAdapter.cs b/VAUAdapter.cs
index b38c57bef0a1990cf66c67d3e4e75982b285a606..c4b10bcfe74aee84714f68e3957cd0aaff8e0729 100644
--- a/VAUAdapter.cs
+++ b/VAUAdapter.cs
@@ -45,10 +45,10 @@ public class VAUAdapter : MonoBehaviour {
defaulthrir = _VA.LoadHRIRDataset(DefaultHRIRPath, "DefaultHRIR");
defaultdirectivity = _VA.LoadDirectivity(DefaultDirectivityPath, "DefaultDirectivity");
_VA.SetGlobalAuralizationMode(GlobalAuralizationMode);
- Debug.Log("Connect to Server: " + HostIP);
+ Debug.Log("[VAU]Connect to Server: " + HostIP);
}
else
- Debug.Log("Already connected.");
+ Debug.Log("[VAU]Already connected.");
}
public static int DefaultHRIR
@@ -93,14 +93,14 @@ public class VAUAdapter : MonoBehaviour {
VAUSoundSource[] SoundSources = FindObjectsOfType<VAUSoundSource>();
foreach (VAUSoundSource SoundSource in SoundSources)
{
- Debug.Log("SoundSouce " + SoundSource.ID + " deleted.");
+ Debug.Log("[VAU]SoundSouce " + SoundSource.ID + " deleted.");
_VA.DeleteSoundSource(SoundSource.ID);
}
VAUListener[] Listeners = FindObjectsOfType<VAUListener>();
foreach (VAUListener Listener in Listeners)
{
- Debug.Log("Listener " + Listener.ID + " deleted.");
+ Debug.Log("[VAU]Listener " + Listener.ID + " deleted.");
_VA.DeleteListener(Listener.ID);
}
if (GetComponent<VAUAuralizationMode>() != null)
diff --git a/VAUAuralizationMode.cs b/VAUAuralizationMode.cs
index 294a5be37e463e7f8f61cd318a3c86ee113d5d5e..20638f4756c7963f56e9e34ef529cc9757070be2 100644
--- a/VAUAuralizationMode.cs
+++ b/VAUAuralizationMode.cs
@@ -159,6 +159,28 @@ public class VAUAuralizationMode : MonoBehaviour {
public void TriggerAuraStringChanged(string externAuraString)
{
+ if (externAuraString == "+DS") DirectSound = true;
+ if (externAuraString == "-DS") DirectSound = false;
+ if (externAuraString == "+ER") EarlyReflections = true;
+ if (externAuraString == "-ER") EarlyReflections = false;
+ if (externAuraString == "+DD") DiffuseDecay = true;
+ if (externAuraString == "-DD") DiffuseDecay = false;
+ if (externAuraString == "+DIR") SourceDirectivity = true;
+ if (externAuraString == "-DIR") SourceDirectivity = false;
+ if (externAuraString == "+AA") AirAbsorption = true;
+ if (externAuraString == "-AA") AirAbsorption = false;
+ if (externAuraString == "+TV") AtmosphericTemporalVariations = true;
+ if (externAuraString == "-TV") AtmosphericTemporalVariations = false;
+ if (externAuraString == "+SC") Scattering = true;
+ if (externAuraString == "-SC") Scattering = false;
+ if (externAuraString == "+DIF") Diffraction = true;
+ if (externAuraString == "-DIF") Diffraction = false;
+ if (externAuraString == "+NF") NearFielEffects = true;
+ if (externAuraString == "-NF") NearFielEffects = false;
+ if (externAuraString == "+DP") DopplerShifts = true;
+ if (externAuraString == "-DP") DopplerShifts = false;
+ if (externAuraString == "+SL") SphericalSpreadingLoss = true;
+ if (externAuraString == "-SL") SphericalSpreadingLoss = false;
AuraStringChanged(externAuraString);
}
AuralizationMode UpdateAuraModeSettings()
diff --git a/VAUListener.cs b/VAUListener.cs
index 033771531007791fe1f79ecd270b2fea6545e36a..fa4beeb8473991cc3ab7d035797803269f8e519c 100644
--- a/VAUListener.cs
+++ b/VAUListener.cs
@@ -29,10 +29,10 @@ public class VAUListener : MonoBehaviour {
void Start()
{
_VA = VAUAdapter.VA;
- Listener = _VA.CreateListener(listenername, 0, VAUAdapter.DefaultHRIR);
+ Listener = _VA.CreateListener(listenername);
listenername += " " + Listener;
_VA.SetListenerAuralizationMode(Listener, "all");
- Debug.Log(listenername + " created");
+ Debug.Log("[VAU]" + listenername + " created");
_VA.SetListenerHRIRDataset(Listener, VAUAdapter.DefaultHRIR);
SetListenerPositionOrientation();
_VA.SetArtificalReverbarationTime(VAAudioRenderer, 2);
diff --git a/VAUSoundSource.cs b/VAUSoundSource.cs
index 6360d5471b600070275145714b0ad48537699724..feee633f05ed71357e4394a4f1ef99912896106d 100644
--- a/VAUSoundSource.cs
+++ b/VAUSoundSource.cs
@@ -48,6 +48,7 @@ public class VAUSoundSource : MonoBehaviour {
directivity = VAUAdapter.DefaultDirectivity;
else
directivity = _VA.LoadDirectivity(directivitypath, "SoundSource " + SoundSource + " Directivity");
+ _VA.SetSoundSourceDirectivity(SoundSource, directivity);
if (GetComponent<AudioSource>() != null)
{
@@ -55,15 +56,15 @@ public class VAUSoundSource : MonoBehaviour {
{
SignalSource = _VA.CreateAudiofileSignalSource(AssetDatabase.GetAssetPath(GetComponent<AudioSource>().clip), this.name + "_signal");
_VA.SetSoundSourceSignalSource(SoundSource, SignalSource);
- Debug.Log(SignalSource + " connected to SoundSource " + SoundSource);
+ Debug.Log("[VAU]" + SignalSource + " connected to SoundSource " + SoundSource);
_VA.SetAudiofileSignalSourcePlaybackAction(SignalSource, "PLAYING");
_VA.SetAudiofileSignalSourceIsLooping(SignalSource, islooping);
}
else
- Debug.Log("No clip on AudioSource of GameObject: " + gameObject.name);
+ Debug.Log("[VAU]No clip on AudioSource of GameObject: " + gameObject.name);
}
else
- Debug.Log("No AudioSource on GameObject: " + gameObject.name);
+ Debug.Log("[VAU]No AudioSource on GameObject: " + gameObject.name);
if (GetComponent<VAUAuralizationMode>() != null)
{
GetComponent<VAUAuralizationMode>().AuraStringChanged += OnSoundSourceAuralizationModeChanged;