Added dependency checker for the editor

Author: jemmec

Assets/CoReality/Scripts/AvatarSystem/AvatarModule.cs

@@ -128,16 +128,21 @@ void Awake()
 
             //Check for network module (Ensure this is after NetworkModule in Script Execution Order)
             if (!NetworkModule.Instance)
-                throw new System.Exception("NetworkModule not present in scene? Can't start AvatarModule until it exists.");
+                throw new System.Exception("NetworkModule not present in scene? Can't start AvatarModule without it.");
 
             //Add HandPose to Photon's known serializable data types
             PhotonPeer.RegisterType(typeof(HandPose), 0x68, HandPose.SerializeHandPose, HandPose.DeserializeHandPose);
             PhotonNetwork.AddCallbackTarget(this);
         }
 
-
+        /// <summary>
+        /// Spawns either a remote or local avatar
+        /// </summary>
+        /// <param name="remote">flag to spawn a remote or local avatar</param>
+        /// <param name="viewID"> the avatar's view idea, only needed for remote spawning</param>
         private void SpawnAvatar(bool remote, int viewID = -1)
         {
+            print("Spawn Avatar Start");
             //spawn local avatar
             HoloAvatar avatar = Instantiate(_holoAvatarPrefab);
             avatar.Initalize(remote);
@@ -154,11 +159,11 @@ private void SpawnAvatar(bool remote, int viewID = -1)
                         new RaiseEventOptions
                         {
                             Receivers = ReceiverGroup.Others,
-                            CachingOption = EventCaching.AddToRoomCache
+                            CachingOption = EventCaching.AddToRoomCache,
                         },
                         new SendOptions
                         {
-                            Reliability = true
+                            DeliveryMode = DeliveryMode.Reliable
                         }
                     );
                     _onAvatarCreated?.Invoke(avatar);
@@ -184,8 +189,12 @@ private void SpawnAvatar(bool remote, int viewID = -1)
             _localAvatar.Name = _randomAdjectives[UnityEngine.Random.Range(0, _randomAdjectives.Count)] + " "
                                 + _randomNouns[UnityEngine.Random.Range(0, _randomNouns.Count)];
             _localAvatar.Color = _randomColors[UnityEngine.Random.Range(0, _randomColors.Count)];
+
+            print("Spawn Avatar End");
         }
 
+        #region PUN Callbacks
+
         public void OnJoinedRoom()
         {
             //Spawn local avatar
@@ -218,6 +227,7 @@ public void OnPlayerLeftRoom(Player otherPlayer)
 
         public void OnEvent(EventData photonEvent)
         {
+            print("On Event");
             if (photonEvent.Code == AVATAR_EVENT)
                 SpawnAvatar(true, (int)photonEvent.CustomData);
         }
@@ -242,6 +252,8 @@ public void OnPlayerPropertiesUpdate(Player targetPlayer, ExitGames.Client.Photo
         public void OnMasterClientSwitched(Player newMasterClient)
         { }
 
+        #endregion
+
     }
 
     [Serializable]

Assets/CoReality/Scripts/Editor.meta

@@ -0,0 +1,103 @@
+#if UNITY_EDITOR
+
+using UnityEditor;
+using UnityEngine;
+using System.IO;
+
+namespace CoReality
+{
+    public class DependencyChecker : EditorWindow
+    {
+
+
+        static bool _hasMRTK;
+        static bool _hasVuforia;
+        static bool _hasPhoton;
+
+        [MenuItem("CoReality/DependencyChecker")]
+        public static void InitPopup()
+        {
+            DependencyChecker window = (DependencyChecker)EditorWindow.GetWindow(typeof(DependencyChecker));
+            window.position = new Rect((Screen.width / 2) - 150, (Screen.height / 2) - 110, 300, 220);
+            window.ShowPopup();
+
+            Refresh();
+        }
+
+        static void Refresh()
+        {
+            //Do Check
+            string mrtkVersion = Application.dataPath + "/MRTK/SDK/Version.txt";
+            if (File.Exists(mrtkVersion))
+            {
+                if (File.ReadAllText(mrtkVersion)
+                .Contains("Microsoft Mixed Reality Toolkit 2.7.2"))
+                {
+                    _hasMRTK = true;
+                }
+            }
+
+            _hasPhoton = Directory.Exists(Application.dataPath + "/Photon");
+
+        }
+
+        void OnGUI()
+        {
+            EditorGUILayout.Separator();
+
+            GUIStyle headerStyle = EditorStyles.label;
+            headerStyle.fontSize = 18;
+            headerStyle.alignment = TextAnchor.MiddleCenter;
+
+            EditorGUILayout.LabelField("CoReality Dependencies", headerStyle);
+
+            GUIStyle labelStyle = EditorStyles.label;
+            labelStyle.fontSize = 14;
+            headerStyle.alignment = TextAnchor.MiddleLeft;
+
+            EditorGUILayout.Separator();
+
+            EditorGUILayout.LabelField("Mixed Reality Toolkit 2.7.2", labelStyle);
+            if (!_hasMRTK)
+            {
+                EditorGUILayoutExtensions.LinkLabel("Download there", Color.blue, Vector2.zero, 14, "https://github.com/microsoft/MixedRealityToolkit-Unity/releases/tag/v2.7.2");
+            }
+            else
+            {
+                EditorGUILayout.LabelField("Installation found ✓", labelStyle);
+            }
+
+            EditorGUILayout.Separator();
+
+            EditorGUILayout.LabelField("Vuforia (latest)", labelStyle);
+            if (!_hasVuforia)
+            {
+                EditorGUILayoutExtensions.LinkLabel("Download here", Color.blue, Vector2.zero, 14, "https://developer.vuforia.com/");
+            }
+            else
+            {
+                EditorGUILayout.LabelField("Installation found ✓", labelStyle);
+            }
+
+            EditorGUILayout.Separator();
+
+            EditorGUILayout.LabelField("Photon PUN 2 Unity", labelStyle);
+            if (!_hasPhoton)
+            {
+                EditorGUILayoutExtensions.LinkLabel("Download here", Color.blue, Vector2.zero, 14, "https://assetstore.unity.com/packages/tools/network/pun-2-free-119922");
+            }
+            else
+            {
+                EditorGUILayout.LabelField("Installation found ✓", labelStyle);
+            }
+
+            EditorGUILayout.Separator();
+
+            if (GUILayout.Button("Refresh")) Refresh();
+            if (GUILayout.Button("Close")) this.Close();
+        }
+    }
+
+}
+
+#endif

Assets/CoReality/Scripts/Editor/DependencyChecker.cs

@@ -0,0 +1,88 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using UnityEngine;
+using UnityEditor;
+
+//Here is a static class to hold my gui stuff.
+
+    public static class EditorGUILayoutExtensions
+    {
+
+        //Alternate Method
+        public static bool LinkLabel(string labelText)
+        {
+            return LinkLabel(labelText, Color.black, new Vector2(), 0);
+        }
+
+        //Alternate Method
+        public static bool LinkLabel(string labelText, Color labelColor)
+        {
+            return LinkLabel(labelText, labelColor, new Vector2(), 0);
+        }
+
+        //Alternate Method
+        public static bool LinkLabel(string labelText, Color labelColor, Vector2 contentOffset)
+        {
+            return LinkLabel(labelText, labelColor, contentOffset, 0);
+        }
+
+        //The Main Method
+        public static bool LinkLabel(string labelText, Color labelColor, Vector2 contentOffset, int fontSize)
+        {
+            //Let's use Unity's label style for this
+            GUIStyle stl = EditorStyles.label;
+            //Next let's record the settings for Unity's label style because we will have to make sure these settings get returned back to
+            //normal after we are done changing them and drawing our LinkLabel.
+            Color col = stl.normal.textColor;
+            Vector2 os = stl.contentOffset;
+            int size = stl.fontSize;
+            //Now we can modify the label's settings via the editor style : EditorStyles.label (stl).
+            stl.normal.textColor = labelColor;
+            stl.contentOffset = contentOffset;
+            stl.fontSize = fontSize;
+            //We are now ready to draw our Linklabel. I will actually use a GUILayout.Button to do this and our "stl" style will
+            //make the button appear as a label.
+
+            //Note : You may include a web address parameter in this method and open a URL at this point if the button is clicked,
+            //however, I am going to just return bool based on weather or not the link was clicked. This gives me more control over
+            //what actually happens when a link label is used. I also will instead include a "URL version" of this method below.
+
+            //Since the button already returns bool, I will just return that result straight across like this.
+
+            try
+            {
+                return GUILayout.Button(labelText, stl);
+            }
+            finally
+            {
+                //Remember to set the editor style (stl) back to normal here. A try / finally clause will work perfectly for this!!!
+
+                stl.normal.textColor = col;
+                stl.contentOffset = os;
+                stl.fontSize = size;
+            }
+        }
+
+        //This is a modified version of link label that opens a URL automatically. Note : this can also return bool if you want.
+        public static void LinkLabel(string labelText, Color labelColor, Vector2 contentOffset, int fontSize, string webAddress)
+        {
+            if (LinkLabel(labelText, labelColor, contentOffset, fontSize))
+            {
+                try
+                {
+                    Application.OpenURL(@webAddress);
+                    //if returning bool, return true here.
+                }
+                catch
+                {
+                    //In most cases, the catch clause would not happen but in the interest of being thorough I will log an
+                    //error and have Unity "beep" if an exception gets thrown for any reason.
+                    Debug.LogError("Could not open URL. Please check your network connection and ensure the web address is correct.");
+                    EditorApplication.Beep();
+                }
+            }
+            //if returning bool, return false here.
+        }
+    }
+

Assets/CoReality/Scripts/Editor/DependencyChecker.cs.meta

@@ -34,8 +34,8 @@ public class NetworkModule : MonoBehaviour, IMatchmakingCallbacks, IConnectionCa
         [SerializeField, Tooltip("The OPTIONAL vuforia target. This marker is what is used to align each user's networked space.")]
         /// <summary>
         /// If no vuforia target is supplied the default position of the origin will be world zero
-        /// and all users will be aligned around their world zero (the spatial head position the
-        /// application was launched from).
+        /// and all users will be aligned around that position
+        /// On hololens this is the user's inital head position when the launch the application.
         /// </summary>
         protected DefaultTrackableEventHandler _vuforiaTarget;
 
@@ -139,43 +139,28 @@ public static void Disconnect()
         #region  PUN Callbacks
 
         public void OnFriendListUpdate(List<FriendInfo> friendList)
-        {
-
-        }
+        {}
 
         public void OnCreatedRoom()
-        {
-
-        }
+        {}
 
         public void OnCreateRoomFailed(short returnCode, string message)
-        {
-
-        }
+        {}
 
         public void OnJoinedRoom()
-        {
-
-        }
+        {}
 
         public void OnJoinRoomFailed(short returnCode, string message)
-        {
-
-        }
+        {}
 
         public void OnJoinRandomFailed(short returnCode, string message)
-        {
-
-        }
+        {}
 
         public void OnLeftRoom()
-        {
-
-        }
+        {}
 
         public void OnConnected()
-        {
-        }
+        {}
 
         public void OnConnectedToMaster()
         {

Assets/CoReality/Scripts/Editor/EditorGUILayoutExtensions.cs

@@ -6,12 +6,9 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/CoReality/Examples/3 Desktop Hololens Mode/3.1 Startup.unity
-    guid: 000844f5b22562846a892f5ac9d8c9fd
+    path: Assets/CoReality/Examples/1 Networked Object/1 Networked Object.unity
+    guid: f50610625c8ade24e87bc6de74eca77b
   - enabled: 1
-    path: Assets/CoReality/Examples/3 Desktop Hololens Mode/3.2 Desktop.unity
-    guid: af1d792426ea7804ca6ecffa736b7ae8
-  - enabled: 1
-    path: Assets/CoReality/Examples/3 Desktop Hololens Mode/3.3 Hololens.unity
-    guid: bcaa3e1a7829cef45832d078dccb5b27
+    path: Assets/CoReality/Examples/2 Hololens Avatars/2 Hololens Avatars.unity
+    guid: f0a2ab1031f83e64e84ecdbc62bfe8fb
   m_configObjects: {}