Merge branch 'master' of https://github.com/Microsoft/HoloToolkit-Unity into feature/cross_platform

Zod- · Zod- · commit f7be60a69a1c · 2017-06-29T10:32:28.000+02:00
diff --git a/Assets/HoloToolkit/Input/Scripts/Microphone/MicStream.cs b/Assets/HoloToolkit/Input/Scripts/Microphone/MicStream.cs
@@ -2,21 +2,22 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using System.Runtime.InteropServices;
-using UnityEngine;
 using System.Text;
+using UnityEngine;
 
 namespace HoloToolkit.Unity.InputModule
 {
     public class MicStream
     {
-        // This class replaces Unity's Microphone object
-        // This class is made for HoloLens mic stream selection, but should work well on all windows 10 devices
-        // chooses from one of three possible microphone modes on HoloLens
-        // There is an example of how to use this script in HoloToolkit\Input\Tests\Scripts\MicStreamDemo.cs
-
-        // Streams: LOW_QUALITY_VOICE is optimized for speech analysis, COMMUNICATIONS is higher quality voice and is probably preferred
-        //          ROOM_CAPTURE tries to get the sounds of the room more than the voice of the suer
-        // can only be set on initialization
+        // This class replaces Unity's Microphone object.
+        // This class is made for HoloLens mic stream selection but should work well on all Windows 10 devices.
+        // Choose from one of three possible microphone modes on HoloLens.
+        // There is an example of how to use this script in HoloToolkit-Tests\Input\Scripts\MicStreamDemo.cs.
+
+        // Streams: LOW_QUALITY_VOICE is optimized for speech analysis.
+        //          COMMUNICATIONS is higher quality voice and is probably preferred.
+        //          ROOM_CAPTURE tries to get the sounds of the room more than the voice of the user.
+        // This can only be set on initialization.
         public enum StreamCategory { LOW_QUALITY_VOICE, HIGH_QUALITY_VOICE, ROOM_CAPTURE }
 
         public enum ErrorCodes { ALREADY_RUNNING = -10, NO_AUDIO_DEVICE, NO_INPUT_DEVICE, ALREADY_RECORDING, GRAPH_NOT_EXIST, CHANNEL_COUNT_MISMATCH, FILE_CREATION_PERMISSION_ERROR, NOT_ENOUGH_DATA, NEED_ENABLED_MIC_CAPABILITY };
@@ -192,4 +193,4 @@ public static bool CheckForErrorOnCall(int returnCode)
             return true;
         }
     }
-}
+}
diff --git a/Assets/HoloToolkit/Input/Scripts/SetGlobalListener.cs b/Assets/HoloToolkit/Input/Scripts/SetGlobalListener.cs
@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace HoloToolkit.Unity.InputModule.Tests
+namespace HoloToolkit.Unity.InputModule
 {
     /// <summary>
     /// Register this game object on the InputManager as a global listener.
diff --git a/Assets/HoloToolkit/Sharing/Scripts/Extensions.meta b/Assets/HoloToolkit/Sharing/Scripts/Extensions.meta
diff --git a/Assets/HoloToolkit/Sharing/Scripts/Extensions/SessionExtensions.cs b/Assets/HoloToolkit/Sharing/Scripts/Extensions/SessionExtensions.cs
diff --git a/Assets/HoloToolkit/Sharing/Scripts/Extensions/SessionExtensions.cs.meta b/Assets/HoloToolkit/Sharing/Scripts/Extensions/SessionExtensions.cs.meta
diff --git a/Assets/HoloToolkit/Utilities/Scripts/Billboard.cs b/Assets/HoloToolkit/Utilities/Scripts/Billboard.cs
@@ -24,8 +24,16 @@ public class Billboard : MonoBehaviour
         [Tooltip("Specifies the axis about which the object will rotate.")]
         public PivotAxis PivotAxis = PivotAxis.Free;
 
+        [Tooltip("Specifies the target we will orient to. If no Target is specified the main camera will be used.")]
+        public Transform TargetTransform;
+
         private void OnEnable()
         {
+            if (TargetTransform == null)
+            {
+                TargetTransform = Camera.main.transform;
+            }
+
             Update();
         }
 
@@ -34,13 +42,13 @@ private void OnEnable()
         /// </summary>
         private void Update()
         {
-            if (!Camera.main)
+            if (TargetTransform == null)
             {
                 return;
             }
 
             // Get a Vector that points from the target to the main camera.
-            Vector3 directionToTarget = Camera.main.transform.position - transform.position;
+            Vector3 directionToTarget = TargetTransform.position - transform.position;
 
             // Adjust for the pivot axis.
             switch (PivotAxis)
@@ -65,4 +73,4 @@ private void Update()
             transform.rotation = Quaternion.LookRotation(-directionToTarget);
         }
     }
-}
+}
diff --git a/Assets/HoloToolkit/Utilities/Scripts/Extensions/ComponentExtensions.cs b/Assets/HoloToolkit/Utilities/Scripts/Extensions/ComponentExtensions.cs
@@ -9,7 +9,7 @@ namespace HoloToolkit.Unity
 {
     /// <summary>
     /// Extensions methods for the Unity Component class.
-    /// This also includes some component-related extensions for the GameObjet class.
+    /// This also includes some component-related extensions for the GameObject class.
     /// </summary>
     public static class ComponentExtensions
     {
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -328,6 +328,7 @@ PlayerSettings:
   switchSocketMemoryPoolSize: 6144
   switchSocketAllocatorPoolSize: 128
   switchSocketConcurrencyLimit: 14
+  switchScreenResolutionBehavior: 2
   switchUseCPUProfiler: 0
   switchApplicationID: 0x0005000C10000001
   switchNSODependencies: 
@@ -343,9 +344,6 @@ PlayerSettings:
   switchTitleNames_9: 
   switchTitleNames_10: 
   switchTitleNames_11: 
-  switchTitleNames_12: 
-  switchTitleNames_13: 
-  switchTitleNames_14: 
   switchPublisherNames_0: 
   switchPublisherNames_1: 
   switchPublisherNames_2: 
@@ -358,9 +356,6 @@ PlayerSettings:
   switchPublisherNames_9: 
   switchPublisherNames_10: 
   switchPublisherNames_11: 
-  switchPublisherNames_12: 
-  switchPublisherNames_13: 
-  switchPublisherNames_14: 
   switchIcons_0: {fileID: 0}
   switchIcons_1: {fileID: 0}
   switchIcons_2: {fileID: 0}
@@ -373,9 +368,6 @@ PlayerSettings:
   switchIcons_9: {fileID: 0}
   switchIcons_10: {fileID: 0}
   switchIcons_11: {fileID: 0}
-  switchIcons_12: {fileID: 0}
-  switchIcons_13: {fileID: 0}
-  switchIcons_14: {fileID: 0}
   switchSmallIcons_0: {fileID: 0}
   switchSmallIcons_1: {fileID: 0}
   switchSmallIcons_2: {fileID: 0}
@@ -388,9 +380,6 @@ PlayerSettings:
   switchSmallIcons_9: {fileID: 0}
   switchSmallIcons_10: {fileID: 0}
   switchSmallIcons_11: {fileID: 0}
-  switchSmallIcons_12: {fileID: 0}
-  switchSmallIcons_13: {fileID: 0}
-  switchSmallIcons_14: {fileID: 0}
   switchManualHTML: 
   switchAccessibleURLs: 
   switchLegalInformation: 
@@ -406,7 +395,7 @@ PlayerSettings:
   switchApplicationErrorCodeCategory: 
   switchUserAccountSaveDataSize: 0
   switchUserAccountSaveDataJournalSize: 0
-  switchAttribute: 0
+  switchApplicationAttribute: 0
   switchCardSpecSize: 4
   switchCardSpecClock: 25
   switchRatingsMask: 0
@@ -433,6 +422,15 @@ PlayerSettings:
   switchParentalControl: 0
   switchAllowsScreenshot: 1
   switchDataLossConfirmation: 0
+  switchSupportedNpadStyles: 3
+  switchSocketConfigEnabled: 0
+  switchTcpInitialSendBufferSize: 32
+  switchTcpInitialReceiveBufferSize: 64
+  switchTcpAutoSendBufferSizeMax: 256
+  switchTcpAutoReceiveBufferSizeMax: 256
+  switchUdpSendBufferSize: 9
+  switchUdpReceiveBufferSize: 42
+  switchSocketBufferEfficiency: 4
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 5.6.1f1
+m_EditorVersion: 5.6.2f1
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 This is effectively part of the existing HoloToolkit, but this is the repository that will contain all Unity specific components.
 The HoloToolkit is a collection of scripts and components intended to accelerate development of holographic applications targeting Windows Holographic.
 
-**Required Unity Editor Version: 5.6.1f1**
+**Required Unity Editor Version: 5.6.2f1**
 
 HoloToolkit contains the following feature areas:
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using UnityEngine;`
`5`	`5`
`6`		`-namespace HoloToolkit.Unity.InputModule.Tests`
	`6`	`+namespace HoloToolkit.Unity.InputModule`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Register this game object on the InputManager as a global listener.`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,16 @@ public class Billboard : MonoBehaviour`
`24`	`24`	`[Tooltip("Specifies the axis about which the object will rotate.")]`
`25`	`25`	`public PivotAxis PivotAxis = PivotAxis.Free;`
`26`	`26`
	`27`	`+ [Tooltip("Specifies the target we will orient to. If no Target is specified the main camera will be used.")]`
	`28`	`+ public Transform TargetTransform;`
	`29`	`+`
`27`	`30`	`private void OnEnable()`
`28`	`31`	`{`
	`32`	`+ if (TargetTransform == null)`
	`33`	`+ {`
	`34`	`+ TargetTransform = Camera.main.transform;`
	`35`	`+ }`
	`36`	`+`
`29`	`37`	`Update();`
`30`	`38`	`}`
`31`	`39`
`@@ -34,13 +42,13 @@ private void OnEnable()`
`34`	`42`	`/// </summary>`
`35`	`43`	`private void Update()`
`36`	`44`	`{`
`37`		`- if (!Camera.main)`
	`45`	`+ if (TargetTransform == null)`
`38`	`46`	`{`
`39`	`47`	`return;`
`40`	`48`	`}`
`41`	`49`
`42`	`50`	`// Get a Vector that points from the target to the main camera.`
`43`		`- Vector3 directionToTarget = Camera.main.transform.position - transform.position;`
	`51`	`+ Vector3 directionToTarget = TargetTransform.position - transform.position;`
`44`	`52`
`45`	`53`	`// Adjust for the pivot axis.`
`46`	`54`	`switch (PivotAxis)`
`@@ -65,4 +73,4 @@ private void Update()`
`65`	`73`	`transform.rotation = Quaternion.LookRotation(-directionToTarget);`
`66`	`74`	`}`
`67`	`75`	`}`
`68`		`-}`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace HoloToolkit.Unity`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Extensions methods for the Unity Component class.`
`12`		`- /// This also includes some component-related extensions for the GameObjet class.`
	`12`	`+ /// This also includes some component-related extensions for the GameObject class.`
`13`	`13`	`/// </summary>`
`14`	`14`	`public static class ComponentExtensions`
`15`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-m_EditorVersion: 5.6.1f1`
	`1`	`+m_EditorVersion: 5.6.2f1`