Merge branch 'master' into HTK-local

Author: Stephen Hodgson

Assets/HoloToolkit-Examples/SharingWithUNET/Scripts/PlayerController.cs

@@ -78,6 +78,14 @@ private void Start()
             transform.SetParent(sharedWorldAnchorTransform);
         }
 
+        private void OnDestroy()
+        {
+            if (isLocalPlayer)
+            {
+                InputManager.Instance.RemoveGlobalListener(gameObject);
+            }
+        }
+
         private void Update()
         {
             // If we aren't the local player, we just need to make sure that the position of this object is set properly

Assets/HoloToolkit-Examples/SpatialUnderstanding/SpatialUnderstanding-FeatureOverview/Scripts/AppState.cs

@@ -198,6 +198,11 @@ private void Start()
         InputManager.Instance.AddGlobalListener(gameObject);
     }
 
+    protected override void OnDestroy()
+    {
+        InputManager.Instance.RemoveGlobalListener(gameObject);
+    }
+
     private void Update_DebugDisplay(float deltaTime)
     {
         // Basic checks

Assets/HoloToolkit/Input/Scripts/SetGlobalListener.cs

@@ -14,5 +14,10 @@ private void Start()
         {
             InputManager.Instance.AddGlobalListener(gameObject);
         }
+
+        private void OnDestroy()
+        {
+            InputManager.Instance.RemoveGlobalListener(gameObject);
+        }
     }
 }

Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/Editor/UAudioProfiler.cs

@@ -99,18 +99,23 @@ private void OnGUI()
                 return;
             }
 
-            this.currentFrame = EditorGUILayout.IntSlider(this.currentFrame, 0, this.eventTimeline.Count - 1);
-            scrollOffset = EditorGUILayout.BeginScrollView(scrollOffset);
-
-            if (this.eventTimeline.Count > this.currentFrame)
+            //Fix null reference exception when launching with profiler is open
+            if(eventTimeline!=null)
             {
-                for (int i = 0; i < this.eventTimeline[this.currentFrame].Length; i++)
+                this.currentFrame = EditorGUILayout.IntSlider(this.currentFrame, 0, this.eventTimeline.Count - 1);
+                scrollOffset = EditorGUILayout.BeginScrollView(scrollOffset);
+
+                if (this.eventTimeline.Count > this.currentFrame)
                 {
-                    DrawEventButton(this.eventTimeline[this.currentFrame][i], i);
+                    for (int i = 0; i < this.eventTimeline[this.currentFrame].Length; i++)
+                    {
+                        DrawEventButton(this.eventTimeline[this.currentFrame][i], i);
+                    }
                 }
-            }
 
-            EditorGUILayout.EndScrollView();
+                EditorGUILayout.EndScrollView();
+            }
+           
         }
 
         private void DrawEventButton(ProfilerEvent currentEvent, int id)

Assets/HoloToolkit/SpatialSound/Scripts/UAudioManager/UAudioManager.cs

@@ -53,13 +53,6 @@ public static UAudioManager Instance
             base.Awake();
 
             CreateEventsDictionary();
-
-            if (events.Length > 0)
-            {
-                string key = events[0].name;
-                PlayEvent(key);
-                StopEvent(key);
-            }
         }
 
         /// <summary>
@@ -135,14 +128,15 @@ private void PlayEvent(string eventName,
             emitter = ApplyAudioEmitterTransform(emitter);
             if (emitter == null)
             {
-                return;
+                //if emitter is null, use the uaudiomanager gameobject(2dsound)
+                emitter = gameObject;
             }
 
             AudioEvent currentEvent;
 
             if (!eventsDictionary.TryGetValue(eventName, out currentEvent))
             {
-                Debug.LogErrorFormat(this, "Could not find event \"{0}\"", eventName);
+                Debug.LogFormat( "Could not find event \"{0}\"", eventName);
                 return;
             }
 
@@ -196,80 +190,85 @@ private void PlayEvent(AudioEvent audioEvent,
         }
 
         /// <summary>
-        /// Stops all events with the name matching eventName.
+        /// Stop event by gameObject.
         /// </summary>
-        /// <param name="eventName">The name associated with the AudioEvents.</param>
-        public void StopAllEvents(string eventName)
+        /// <param name="eventName"></param>
+        /// <param name="gameObjectToStop"></param>
+        /// <param name="fadeOutTime"></param>
+        public void StopEventsOnGameObject(string eventName, GameObject gameObjectToStop, float fadeOutTime = 0f)
         {
             for (int i = activeEvents.Count - 1; i >= 0; i--)
             {
-                if (activeEvents[i].audioEvent.name == eventName)
+                ActiveEvent activeEvent = activeEvents[i];
+
+                if (activeEvent.AudioEmitter == gameObjectToStop)
                 {
-                    StopEvent(activeEvents[i]);
+                    StopEvent(activeEvent.audioEvent.name, gameObjectToStop, fadeOutTime);
                 }
             }
         }
 
+
         /// <summary>
-        /// Stops an AudioEvent.
+        /// Stops all events by name.
         /// </summary>
         /// <param name="eventName">The name associated with the AudioEvent.</param>
-        public void StopEvent(string eventName)
+        /// <param name="fadeOutTime">The amount of time in seconds to completely fade out the sound.</param>
+        public void StopAllEvents(string eventName, GameObject emitter = null, float fadeOutTime = 0f)
         {
-            //if there's a default fade out time specified in the event, use it
+
             for (int i = activeEvents.Count - 1; i >= 0; i--)
             {
-                if (activeEvents[i].audioEvent.name == eventName)
+                ActiveEvent activeEvent = activeEvents[i];
+
+                if (activeEvent.audioEvent.name == eventName)
                 {
-                    StopEvent(eventName, activeEvents[i].audioEvent.fadeOutTime);
+                    if (fadeOutTime > 0)
+                    {
+                        StartCoroutine(StopEventWithFadeCoroutine(activeEvent, fadeOutTime));
+                    }
+                    else
+                    {
+                        StartCoroutine(StopEventWithFadeCoroutine(activeEvent, activeEvent.audioEvent.fadeOutTime));
+                    }
                 }
             }
         }
 
         /// <summary>
-        /// Stops an AudioEvent.
+        /// Stops all.
         /// </summary>
-        /// <param name="eventName">The name associated with the AudioEvent.</param>
-        /// <param name="emitter">The GameObject on which the AudioEvent will stopped.</param>
-        public void StopEvent(string eventName, GameObject emitter)
+        /// <param name="fadeOutTime">The amount of time in seconds to completely fade out the sound.</param>
+        public void StopAll(GameObject emitter = null, float fadeOutTime = 0f)
         {
-            emitter = ApplyAudioEmitterTransform(emitter);
-            if (emitter == null)
+            foreach (ActiveEvent activeEvent in activeEvents)
             {
-                return;
-            }
-
-            for (int i = activeEvents.Count - 1; i >= 0; i--)
-            {
-                if (activeEvents[i].audioEvent.name == eventName && activeEvents[i].AudioEmitter == emitter)
+                if (fadeOutTime > 0)
                 {
-                    StopEvent(activeEvents[i].audioEvent.name, emitter, activeEvents[i].audioEvent.fadeOutTime);
+                    StartCoroutine(StopEventWithFadeCoroutine(activeEvent, fadeOutTime));
+                }
+                else
+                {
+                    StartCoroutine(StopEventWithFadeCoroutine(activeEvent, activeEvent.audioEvent.fadeOutTime));
                 }
             }
         }
 
-        /// <summary>
-        /// Stops an AudioEvent.
-        /// </summary>
-        /// <param name="eventName">The name associated with the AudioEvent.</param>
-        /// <param name="fadeTime">The amount of time in seconds to completely fade out the sound.</param>
-        public void StopEvent(string eventName, float fadeTime)
-        {
-            StopEvent(eventName, gameObject, fadeTime);
-        }
+
 
         /// <summary>
         /// Stops an AudioEvent.
         /// </summary>
         /// <param name="eventName">The name associated with the AudioEvent.</param>
         /// <param name="emitter">The GameObject on which the AudioEvent will stopped.</param>
         /// <param name="fadeTime">The amount of time in seconds to completely fade out the sound.</param>
-        public void StopEvent(string eventName, GameObject emitter, float fadeTime)
+        public void StopEvent(string eventName, GameObject emitter = null, float fadeOutTime = 0f)
         {
             emitter = ApplyAudioEmitterTransform(emitter);
             if (emitter == null)
             {
-                return;
+                //if emitter is null, use the uaudiomanager gameobject(2dsound)
+                emitter = gameObject;
             }
 
             for (int i = activeEvents.Count - 1; i >= 0; i--)
@@ -278,7 +277,16 @@ public void StopEvent(string eventName, GameObject emitter, float fadeTime)
 
                 if (activeEvent.audioEvent.name == eventName && activeEvent.AudioEmitter == emitter)
                 {
-                    StartCoroutine(StopEventWithFadeCoroutine(activeEvent, fadeTime));
+                    //if there's no fade specified, use the fade stored in the event
+                    if (fadeOutTime > 0f)
+                    {
+                        StartCoroutine(StopEventWithFadeCoroutine(activeEvent, fadeOutTime));
+                    }
+                    else
+                    {
+                        StartCoroutine(StopEventWithFadeCoroutine(activeEvent, activeEvents[i].audioEvent.fadeOutTime));
+
+                    }
                 }
             }
         }

Assets/HoloToolkit/Utilities/Editor/AutoConfigureMenu.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using UnityEditor;
+using UnityEngine;
+
+namespace HoloToolkit.Unity
+{
+    /// <summary>
+    /// Configuration options derived from here: 
+    /// https://developer.microsoft.com/en-us/windows/holographic/unity_development_overview#Configuring_a_Unity_project_for_HoloLens
+    /// </summary>
+
+    
+    public class AutoConfigureMenu : MonoBehaviour
+    {
+		/// <summary>
+		/// Displays a help page for the HoloToolkit.
+		/// </summary>
+		[MenuItem("HoloToolkit/Configure/Show Help", false, 3)]
+        public static void ShowHelp()
+        {
+            Application.OpenURL("https://github.com/Microsoft/HoloToolkit-Unity/wiki");
+        }
+
+        /// <summary>
+        /// Applies recommended scene settings to the current scenes
+        /// </summary>
+        [MenuItem("HoloToolkit/Configure/Apply HoloLens Scene Settings", false, 1)]
+        public static void ApplySceneSettings()
+        {
+			SceneSettingsWindow window = (SceneSettingsWindow)EditorWindow.GetWindow(typeof(SceneSettingsWindow), true, "Apply HoloLens Scene Settings");
+			window.Show();
+		}
+
+		/// <summary>
+		/// Applies recommended project settings to the current project
+		/// </summary>
+		[MenuItem("HoloToolkit/Configure/Apply HoloLens Project Settings", false, 1)]
+        public static void ApplyProjectSettings()
+        {
+			ProjectSettingsWindow window = (ProjectSettingsWindow)EditorWindow.GetWindow(typeof(ProjectSettingsWindow), true, "Apply HoloLens Project Settings");
+			window.Show();
+		}
+
+		/// <summary>
+		/// Applies recommended capability settings to the current project
+		/// </summary>
+		[MenuItem("HoloToolkit/Configure/Apply HoloLens Capability Settings", false, 2)]
+        static void ApplyHoloLensCapabilitySettings()
+        {
+			CapabilitySettingsWindow window = (CapabilitySettingsWindow)EditorWindow.GetWindow(typeof(CapabilitySettingsWindow), true, "Apply HoloLens Capability Settings");
+            window.Show();
+        }
+    }
+}