Commit 4ac90cd1 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen

Merge branch 'develop'

parents de9d8988 114c2f84
using UnityEngine;
using System.Collections;
using VA;
using UnityEngine.UI;
public class LHMAuraMenu : MonoBehaviour {
public Color setcolor;
public Color notsetcolor;
private VAUAuralizationMode auralizationMode;
private string auraMode;
private bool DS;
private bool ER;
private bool DD;
private bool DIR;
private bool AA;
private bool TV;
private bool SC;
private bool DIF;
private bool NF;
private bool DP;
private bool SL;
void Start()
{
auralizationMode = FindObjectOfType<VAUAdapter>().gameObject.GetComponent<VAUAuralizationMode>();
if (auralizationMode == null)
Debug.Log("Global AuralizationMode can't be set: No VAUAuralizationMode on VA-Object.");
auralizationMode.AuraStringChanged += AuralizationMode_AuraStringChanged;
RefreshAuraMode();
}
private void AuralizationMode_AuraStringChanged(string sAuraString)
{
RefreshAuraMode();
}
void RefreshAuraMode()
{
DS = auralizationMode.DirectSound;
ER = auralizationMode.EarlyReflections;
DD = auralizationMode.DiffuseDecay;
DIR = auralizationMode.SourceDirectivity;
AA = auralizationMode.AirAbsorption;
TV = auralizationMode.AtmosphericTemporalVariations;
SC = auralizationMode.Scattering;
DIF = auralizationMode.Diffraction;
NF = auralizationMode.NearFielEffects;
DP = auralizationMode.DopplerShifts;
SL = auralizationMode.SphericalSpreadingLoss;
gameObject.transform.FindChild("DSButton").GetComponent<Image>().color = (DS) ? setcolor : notsetcolor;
gameObject.transform.FindChild("ERButton").GetComponent<Image>().color = (ER) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DDButton").GetComponent<Image>().color = (DD) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DIRButton").GetComponent<Image>().color = (DIR) ? setcolor : notsetcolor;
gameObject.transform.FindChild("AAButton").GetComponent<Image>().color = (AA) ? setcolor : notsetcolor;
gameObject.transform.FindChild("TVButton").GetComponent<Image>().color = (TV) ? setcolor : notsetcolor;
gameObject.transform.FindChild("SCButton").GetComponent<Image>().color = (SC) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DIFButton").GetComponent<Image>().color = (DIF) ? setcolor : notsetcolor;
gameObject.transform.FindChild("NFButton").GetComponent<Image>().color = (NF) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DPButton").GetComponent<Image>().color = (DP) ? setcolor : notsetcolor;
gameObject.transform.FindChild("SLButton").GetComponent<Image>().color = (SL) ? setcolor : notsetcolor;
}
public void AllClicked()
{
auralizationMode.TriggerAuraStringChanged("all");
}
public void DefaultClicked()
{
auralizationMode.TriggerAuraStringChanged("default");
}
public void DSClicked()
{
if (DS)
{
auralizationMode.TriggerAuraStringChanged("-DS");
DS = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DS");
DS = true;
}
gameObject.transform.Find("DSButton").GetComponent<Image>().color = (DS) ? setcolor : notsetcolor;
}
public void DDClicked()
{
if (DD)
{
auralizationMode.TriggerAuraStringChanged("-DD");
DD = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DD");
DD = true;
}
gameObject.transform.Find("DDButton").GetComponent<Image>().color = (DD) ? setcolor : notsetcolor;
}
public void DIRClicked()
{
if (DIR)
{
auralizationMode.TriggerAuraStringChanged("-DIR");
DIR = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DIR");
DIR = true;
}
gameObject.transform.Find("DIRButton").GetComponent<Image>().color = (DIR) ? setcolor : notsetcolor;
}
public void AAClicked()
{
if (AA)
{
auralizationMode.TriggerAuraStringChanged("-AA");
AA = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+AA");
AA = true;
}
gameObject.transform.Find("AAButton").GetComponent<Image>().color = (AA) ? setcolor : notsetcolor;
}
public void TVClicked()
{
if (TV)
{
auralizationMode.TriggerAuraStringChanged("-TV");
TV = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+TV");
TV = true;
}
gameObject.transform.Find("TVButton").GetComponent<Image>().color = (TV) ? setcolor : notsetcolor;
}
public void SCClicked()
{
if (SC)
{
auralizationMode.TriggerAuraStringChanged("-SC");
SC = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+SC");
SC = true;
}
gameObject.transform.Find("SCButton").GetComponent<Image>().color = (SC) ? setcolor : notsetcolor;
}
public void DIFClicked()
{
if (DIF)
{
auralizationMode.TriggerAuraStringChanged("-DIF");
DIF = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DIF");
DIF = true;
}
gameObject.transform.Find("DIFButton").GetComponent<Image>().color = (DIF) ? setcolor : notsetcolor;
}
public void NFClicked()
{
if (NF)
{
auralizationMode.TriggerAuraStringChanged("-NF");
NF = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+NF");
NF = true;
}
gameObject.transform.Find("NFButton").GetComponent<Image>().color = (NF) ? setcolor : notsetcolor;
}
public void DPClicked()
{
if (DP)
{
auralizationMode.TriggerAuraStringChanged("-DP");
DP = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DP");
DP = true;
}
gameObject.transform.Find("DPButton").GetComponent<Image>().color = (DP) ? setcolor : notsetcolor;
}
public void SLClicked()
{
if (SL)
{
auralizationMode.TriggerAuraStringChanged("-SL");
SL = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+SL");
SL = true;
}
gameObject.transform.Find("SLButton").GetComponent<Image>().color = (SL) ? setcolor : notsetcolor;
}
public void ERClicked()
{
if (ER)
{
auralizationMode.TriggerAuraStringChanged("-ER");
ER = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+ER");
ER = true;
}
gameObject.transform.Find("ERButton").GetComponent<Image>().color = (ER) ? setcolor : notsetcolor;
}
}
using UnityEngine;
using System.Collections;
using VA;
using UnityEngine.UI;
public class LHMAuraMenuSoundSource : MonoBehaviour {
public Color setcolor;
public Color notsetcolor;
private VAUAuralizationMode auralizationMode;
private string auraMode;
private bool DS;
private bool ER;
private bool DD;
private bool DIR;
private bool AA;
private bool TV;
private bool SC;
private bool DIF;
private bool NF;
private bool DP;
private bool SL;
void Start()
{
auralizationMode = FindObjectOfType<VAUSoundSource>().gameObject.GetComponent<VAUAuralizationMode>();
if (auralizationMode == null)
Debug.Log("[VAU] No SoundSources in Scene.");
auralizationMode.AuraStringChanged += AuralizationMode_AuraStringChanged;
GetComponentInChildren<LHMSoundSourceSlider>().ActSoundSourceChanged += LHMAuraMenuSoundSource_ActSoundSourceChanged;
RefreshAuraMode();
}
private void LHMAuraMenuSoundSource_ActSoundSourceChanged(VAUSoundSource actSoundSource)
{
auralizationMode = actSoundSource.gameObject.GetComponent<VAUAuralizationMode>();
RefreshAuraMode();
}
private void AuralizationMode_AuraStringChanged(string sAuraString)
{
RefreshAuraMode();
}
void RefreshAuraMode()
{
DS = auralizationMode.DirectSound;
ER = auralizationMode.EarlyReflections;
DD = auralizationMode.DiffuseDecay;
DIR = auralizationMode.SourceDirectivity;
AA = auralizationMode.AirAbsorption;
TV = auralizationMode.AtmosphericTemporalVariations;
SC = auralizationMode.Scattering;
DIF = auralizationMode.Diffraction;
NF = auralizationMode.NearFielEffects;
DP = auralizationMode.DopplerShifts;
SL = auralizationMode.SphericalSpreadingLoss;
gameObject.transform.FindChild("DSButton").GetComponent<Image>().color = (DS) ? setcolor : notsetcolor;
gameObject.transform.FindChild("ERButton").GetComponent<Image>().color = (ER) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DDButton").GetComponent<Image>().color = (DD) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DIRButton").GetComponent<Image>().color = (DIR) ? setcolor : notsetcolor;
gameObject.transform.FindChild("AAButton").GetComponent<Image>().color = (AA) ? setcolor : notsetcolor;
gameObject.transform.FindChild("TVButton").GetComponent<Image>().color = (TV) ? setcolor : notsetcolor;
gameObject.transform.FindChild("SCButton").GetComponent<Image>().color = (SC) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DIFButton").GetComponent<Image>().color = (DIF) ? setcolor : notsetcolor;
gameObject.transform.FindChild("NFButton").GetComponent<Image>().color = (NF) ? setcolor : notsetcolor;
gameObject.transform.FindChild("DPButton").GetComponent<Image>().color = (DP) ? setcolor : notsetcolor;
gameObject.transform.FindChild("SLButton").GetComponent<Image>().color = (SL) ? setcolor : notsetcolor;
}
public void AllClicked()
{
auralizationMode.TriggerAuraStringChanged("all");
}
public void DefaultClicked()
{
auralizationMode.TriggerAuraStringChanged("default");
}
public void DSClicked()
{
if (DS)
{
auralizationMode.TriggerAuraStringChanged("-DS");
DS = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DS");
DS = true;
}
gameObject.transform.Find("DSButton").GetComponent<Image>().color = (DS) ? setcolor : notsetcolor;
}
public void DDClicked()
{
if (DD)
{
auralizationMode.TriggerAuraStringChanged("-DD");
DD = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DD");
DD = true;
}
gameObject.transform.Find("DDButton").GetComponent<Image>().color = (DD) ? setcolor : notsetcolor;
}
public void DIRClicked()
{
if (DIR)
{
auralizationMode.TriggerAuraStringChanged("-DIR");
DIR = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DIR");
DIR = true;
}
gameObject.transform.Find("DIRButton").GetComponent<Image>().color = (DIR) ? setcolor : notsetcolor;
}
public void AAClicked()
{
if (AA)
{
auralizationMode.TriggerAuraStringChanged("-AA");
AA = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+AA");
AA = true;
}
gameObject.transform.Find("AAButton").GetComponent<Image>().color = (AA) ? setcolor : notsetcolor;
}
public void TVClicked()
{
if (TV)
{
auralizationMode.TriggerAuraStringChanged("-TV");
TV = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+TV");
TV = true;
}
gameObject.transform.Find("TVButton").GetComponent<Image>().color = (TV) ? setcolor : notsetcolor;
}
public void SCClicked()
{
if (SC)
{
auralizationMode.TriggerAuraStringChanged("-SC");
SC = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+SC");
SC = true;
}
gameObject.transform.Find("SCButton").GetComponent<Image>().color = (SC) ? setcolor : notsetcolor;
}
public void DIFClicked()
{
if (DIF)
{
auralizationMode.TriggerAuraStringChanged("-DIF");
DIF = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DIF");
DIF = true;
}
gameObject.transform.Find("DIFButton").GetComponent<Image>().color = (DIF) ? setcolor : notsetcolor;
}
public void NFClicked()
{
if (NF)
{
auralizationMode.TriggerAuraStringChanged("-NF");
NF = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+NF");
NF = true;
}
gameObject.transform.Find("NFButton").GetComponent<Image>().color = (NF) ? setcolor : notsetcolor;
}
public void DPClicked()
{
if (DP)
{
auralizationMode.TriggerAuraStringChanged("-DP");
DP = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+DP");
DP = true;
}
gameObject.transform.Find("DPButton").GetComponent<Image>().color = (DP) ? setcolor : notsetcolor;
}
public void SLClicked()
{
if (SL)
{
auralizationMode.TriggerAuraStringChanged("-SL");
SL = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+SL");
SL = true;
}
gameObject.transform.Find("SLButton").GetComponent<Image>().color = (SL) ? setcolor : notsetcolor;
}
public void ERClicked()
{
if (ER)
{
auralizationMode.TriggerAuraStringChanged("-ER");
ER = false;
}
else
{
auralizationMode.TriggerAuraStringChanged("+ER");
ER = true;
}
gameObject.transform.Find("ERButton").GetComponent<Image>().color = (ER) ? setcolor : notsetcolor;
}
}
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
public class LHMSoundSourceSlider : MonoBehaviour {
private Slider sl;
private VAUSoundSource[] SoundSources;
private VAUSoundSource activeSoundSource;
private Text Tooltip;
public VAUSoundSource actSoundSource
{
get
{
return activeSoundSource;
}
}
public delegate void OnActSoundSourceChangedDelegate(VAUSoundSource actSoundSource);
public event OnActSoundSourceChangedDelegate ActSoundSourceChanged;
// Use this for initialization
void Start () {
sl = gameObject.GetComponent<Slider>();
SoundSources = FindObjectsOfType<VAUSoundSource>();
sl.maxValue = SoundSources.Length - 1;
if (sl.maxValue == 0)
{
GetComponentInParent<Renderer>().enabled = false;
//return;
}
sl.onValueChanged.AddListener(delegate { ChangeSoundSource(); });
activeSoundSource = SoundSources[(int)sl.value];
ActSoundSourceChanged(activeSoundSource);
Tooltip = transform.parent.GetComponentInChildren<Text>();
Tooltip.text = "SoundSource" + activeSoundSource.ID;
}
void ChangeSoundSource()
{
activeSoundSource = SoundSources[(int)sl.value];
ActSoundSourceChanged(activeSoundSource);
Tooltip.text = "SoundSource" + activeSoundSource.ID;
}
}
using UnityEngine;
using System.Collections;
public class LHMTurnAroundMenuController : MonoBehaviour {
public float sensitivity = 100f;
private float distance = -0.03f;
private SteamVR_TrackedController trackedObjeckt;
private SteamVR_Controller.Device device;
private Transform pos;
private Vector3 posoffset;
private Vector2 actPadPos;
private Vector2 lastPadPos;
private float dif;
private bool istouched;
void Start()
{
trackedObjeckt = GetComponentInParent<SteamVR_TrackedController>();
trackedObjeckt.PadTouched += Controller_PadTouched;
trackedObjeckt.PadUntouched += Controller_PadUntouched;
device = SteamVR_Controller.Input((int)trackedObjeckt.controllerIndex);
pos = gameObject.transform.parent.FindChild("Model").transform;
posoffset.Set(0f, distance, 0f);
gameObject.transform.localPosition = posoffset;
}
void LateUpdate()
{
if (istouched)
{
actPadPos = device.GetAxis();
dif = lastPadPos.x - actPadPos.x;
gameObject.transform.RotateAround(pos.position + posoffset, pos.forward, dif * sensitivity);
gameObject.transform.localPosition = posoffset;
lastPadPos = actPadPos;
}
}
private void Controller_PadUntouched(object sender, ClickedEventArgs e)
{
istouched = false;
}
private void Controller_PadTouched(object sender, ClickedEventArgs e)
{
lastPadPos = device.GetAxis();
actPadPos = device.GetAxis();
istouched = true;
}
}
using UnityEngine;
using UnityEditor;
using System;
using System.Collections;
using System.Collections.Generic;
......@@ -75,8 +74,8 @@ public class VAUAdapter : MonoBehaviour {
_VA = new VANet();
Init();
DeactivateUnitySound();
if (! (_VA.AddSearchPath(Application.dataPath + "/..")))
Debug.Log("[VA] Could not add SearchPath:" + Application.dataPath + "/..");
// if (! (_VA.AddSearchPath(Application.dataPath + "/..")))
// Debug.Log("[VA] Could not add SearchPath:" + Application.dataPath + "/..");
}
void OnEnable()
......
using UnityEngine;
using UnityEditor;
using System.Collections;
using System.IO;
using System.Collections.Generic;
using VA;
......@@ -54,7 +53,7 @@ public class VAUSoundSource : MonoBehaviour {
{
if (GetComponent<AudioSource>().clip != null)
{
SignalSource = _VA.CreateAudiofileSignalSource(AssetDatabase.GetAssetPath(GetComponent<AudioSource>().clip), this.name + "_signal");
SignalSource = _VA.CreateAudiofileSignalSource( "Audiofiles/" + GetComponent<AudioSource>().clip.name + ".wav", this.name + "_signal");
_VA.SetSoundSourceSignalSource(SoundSource, SignalSource);
Debug.Log("[VAU]" + SignalSource + " connected to SoundSource " + SoundSource);
_VA.SetAudiofileSignalSourcePlaybackAction(SignalSource, "PLAYING");
......
namespace VRTK
{
using UnityEngine;
using System.Collections;
using VA;
public class VAUVRTKOnTeleportMute : MonoBehaviour {
public float mutetime = 0.2F;
private float mutetimecounter;
private VANet _VA;
void Start()
{
_VA = VAUAdapter.VA;
GetComponent<VRTK_BasicTeleport>().Teleporting += VAUVRTKOnTeleportMute_Teleporting;
GetComponent<VRTK_BasicTeleport>().Teleported += VAUVRTKOnTeleportMute_Teleported;
}
private void VAUVRTKOnTeleportMute_Teleported(object sender, DestinationMarkerEventArgs e)
{
_VA.SetOutputMuted(false);
}
private void VAUVRTKOnTeleportMute_Teleporting(object sender, DestinationMarkerEventArgs e)
{