Merge pull request #2168 from davidkline-ms/specView

create HoloToolkit-Preview, moved SpectatorView there until OpenCV passes WACK

Author: David Kline

Assets/HoloToolkit-Preview.meta

@@ -1,11 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-using System;
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// In this instance the HoloLens will be listening to broadcasts from the mobile device to turn on the camera
@@ -40,7 +39,7 @@ private void Awake()
             {
                 OpenCVUtils.CheckOpenCVWrapperHasLoaded();
             }
-            catch (Exception e)
+            catch (System.Exception e)
             {
                 Debug.LogError(e);
                 gameObject.SetActive(false);

Assets/HoloToolkit/SpectatorView.meta renamed to Assets/HoloToolkit-Preview/SpectatorView.meta

@@ -1,13 +1,12 @@
 // 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.Collections;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// </summary>
@@ -113,7 +112,7 @@ private void Awake()
             {
                 OpenCVUtils.CheckOpenCVWrapperHasLoaded();
             }
-            catch (Exception e)
+            catch (System.Exception e)
             {
                 Debug.LogError(e);
                 gameObject.SetActive(false);

Assets/HoloToolkit/SpectatorView/Audio.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Audio.meta

@@ -1,12 +1,11 @@
 // 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.Collections;
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     public class SpectatorViewNetworkManager : NetworkManager
     {
@@ -112,7 +111,7 @@ private void Start()
             {
                 OpenCVUtils.CheckOpenCVWrapperHasLoaded();
             }
-            catch (Exception e)
+            catch (System.Exception e)
             {
                 Debug.LogError(e);
                 gameObject.SetActive(false);

Assets/HoloToolkit/SpectatorView/Audio/success.wav renamed to Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav

@@ -9,7 +9,7 @@
 using UnityEngine.Apple.ReplayKit;
 #endif
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Records and replays screencaptures recorded from the iPhone

Assets/HoloToolkit/SpectatorView/Audio/success.wav.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Audio/success.wav.meta

@@ -4,7 +4,7 @@
 using HoloToolkit.Unity.InputModule;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Controls the display of the recording UI.

Assets/HoloToolkit/SpectatorView/Images.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Images.meta

@@ -1,9 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+
 using UnityEngine;
 using UnityEngine.XR.iOS;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Detects when an anchor has been located

Assets/HoloToolkit/SpectatorView/Images/Marker.PNG renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG

@@ -13,7 +13,7 @@
 #endif
 #endif
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Manages the camera capture on the HoloLens

Assets/HoloToolkit/SpectatorView/Images/Marker.PNG.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/Marker.PNG.meta

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Manages the capture process on the HoloLens

Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG

@@ -6,29 +6,29 @@
 using System.Runtime.InteropServices;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Manages the OpenCV wrapper to detect a marker.
     /// </summary>
     public class MarkerDetector
     {
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_Initialize", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_Initialize")]
         internal static extern void InitalizeMarkerDetector();
 
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_Terminate", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_Terminate")]
         internal static extern void TerminateMarkerDetector();
 
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_DetectMarkers", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_DetectMarkers")]
         internal static extern bool DetectMarkers(int _imageWidth, int _imageHeight, IntPtr _imageDate, float _markerSize);
 
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetNumMarkersDetected", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetNumMarkersDetected")]
         internal static extern bool GetNumMarkersDetected(out int _numMarkersDetected);
 
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetDetectedMarkerIds", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetDetectedMarkerIds")]
         internal static extern bool GetDetectedMarkerIds(IntPtr _detectedMarkers);
 
-        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetDetectedMarkerPose", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="MarkerDetector_GetDetectedMarkerPose")]
         internal static extern bool GetDetectedMarkerPose(int _markerId, out float _xPos, out float _yPos, out float _zPos, out float _xRot, out float _yRot, out float _zRot);
 
         /// <summary>

Assets/HoloToolkit/SpectatorView/Images/PlatformSwitcher.PNG.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/PlatformSwitcher.PNG.meta

@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEditor;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     [CustomEditor(typeof(MarkerGeneration3D), true)]
     public class MarkerGeneration3DEditor : Editor

Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     public class MarkerGeneration3D : MonoBehaviour
     {

Assets/HoloToolkit/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/SpectatorViewNetworkDiscovery.PNG.meta

@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     public class SimpleMarkerGeneration3D : MarkerGeneration3D
     {

Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG

@@ -4,7 +4,7 @@
 using System.Collections;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Controls the generation of AR markers from a pool.

Assets/HoloToolkit/SpectatorView/Images/WorldRoot.PNG.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Images/WorldRoot.PNG.meta

@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Manages the scale of the marker to fit in different screen sizes

Assets/HoloToolkit/SpectatorView/Materials.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials.meta

@@ -8,7 +8,7 @@
 using UnityEngine.Events;
 using UnityEngine.Networking;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Manages the sync of the world between the HoloLens and the mobile

Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat

@@ -3,7 +3,7 @@
 
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Controls displaying of the AR marker on the mobile device

Assets/HoloToolkit/SpectatorView/Materials/MarkerBlack.mat.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerBlack.mat.meta

@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Controls an on screen text field to display connection status to the user

Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat

@@ -4,7 +4,7 @@
 using UnityEngine;
 using UnityEditor;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     [CustomEditor(typeof(PlatformSwitcher))]
     public class PlatformSwitcherEditor : Editor

Assets/HoloToolkit/SpectatorView/Materials/MarkerWhite.mat.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/MarkerWhite.mat.meta

@@ -2,9 +2,8 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.using UnityEngine;
 
 using System.Runtime.InteropServices;
-using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Utility function to ensure the OpenCVWrapper has been successfully loaded
@@ -14,7 +13,7 @@ public static class OpenCVUtils
         /// <summary>
         /// Utility function to ensure the OpenCVWrapper has been successfully loaded
         /// </summary>
-        [DllImport("SpectatorViewPlugin", EntryPoint="CheckLibraryHasLoaded", ExactSpelling=true)]
+        [DllImport("SpectatorViewPlugin", EntryPoint="CheckLibraryHasLoaded")]
         public static extern void CheckOpenCVWrapperHasLoaded();
     }
 }

Assets/HoloToolkit/SpectatorView/Materials/Plane.mat renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat

@@ -8,7 +8,7 @@
 using UnityEditor;
 #endif
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Utility to switch scene state between HoloLens and mobile platforms

Assets/HoloToolkit/SpectatorView/Materials/Plane.mat.meta renamed to Assets/HoloToolkit-Preview/SpectatorView/Materials/Plane.mat.meta

@@ -2,10 +2,9 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.using UnityEngine;
 
 using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 
-namespace HoloToolkit.Unity.SpectatorView
+namespace HoloToolkit.Unity.Preview.SpectatorView
 {
     /// <summary>
     /// Utility for fading out marker