Merge pull request #59 from CognitiveVR/develop

1.0.7 Release

Author: calderarchinuk

Editor/DynamicObjectInspector.cs

@@ -49,6 +49,7 @@ public override void OnInspectorGUI()
             bool basicGUIChanged = false;
             EditorGUI.BeginChangeCheck();
 
+            //consider adding an actual property for id source - instead of infering from useCustomId and objectPool references. should simplify property display in inspector
             var script = serializedObject.FindProperty("m_Script");
             var updateRate = serializedObject.FindProperty("UpdateRate");
             var positionThreshold = serializedObject.FindProperty("PositionThreshold");
@@ -119,73 +120,104 @@ public override void OnInspectorGUI()
                 }
             }
 
+            int targetIdType = -1;
+            bool allSelectedShareIdType = true;
+
             //dynamic id sources - custom id, generate at runtime, id pool asset
-            if (idType == -1)
+            var primaryDynamic = targets[0] as DynamicObject;
+            if (primaryDynamic.UseCustomId)
             {
-                var dyn = target as DynamicObject;
-                if (dyn.UseCustomId) idType = 0;
-                else if (dyn.IdPool != null) idType = 2;
-                else idType = 1;
+                targetIdType = 0;
+                idType = 0;
             }
-            GUILayout.BeginHorizontal();
-            idType = EditorGUILayout.Popup(new GUIContent("Id Source"),idType, idTypeNames);
-
-            if (idType == 0) //custom id
+            else if (primaryDynamic.IdPool != null)
             {
-                EditorGUILayout.PropertyField(customId, new GUIContent(""));
-                useCustomId.boolValue = true;
-                idPool.objectReferenceValue = null;
+                targetIdType = 2;
+                idType = 2;
             }
-            else if (idType == 1) //generate id
+            else
             {
-                EditorGUI.BeginDisabledGroup(true);
-                EditorGUILayout.LabelField(new GUIContent("Id will be generated at runtime", "This object will not be included in aggregation metrics on the dashboard"));
-                EditorGUI.EndDisabledGroup();
-                customId.stringValue = string.Empty;
-                useCustomId.boolValue = false;
-                idPool.objectReferenceValue = null;
+                targetIdType = 1;
+                idType = 1;
             }
-            else if (idType == 2) //id pool
+
+            //check if all selected objects have the same idtype
+            foreach (var t in targets)
             {
-                EditorGUILayout.ObjectField(idPool, new GUIContent("", "Provides a consistent list of Ids to be used at runtime. Allows aggregated data from objects spawned at runtime"));
-                customId.stringValue = string.Empty;
-                useCustomId.boolValue = false;
+                var tdyn = (DynamicObject)t;
+                if (tdyn.UseCustomId) { if (targetIdType != 0) { allSelectedShareIdType = false; break; } }
+                else if (tdyn.IdPool != null) {if (targetIdType != 2) { allSelectedShareIdType = false; break; } }
+                else if (targetIdType != 1) { allSelectedShareIdType = false; break; }
             }
-            GUILayout.EndHorizontal();
 
-            if (idType == 2) //id pool
+            //if all id sources from selected objects are the same, display shared property fields
+            //otherwise display 'multiple values'
+            if (!allSelectedShareIdType)
+            {
+                EditorGUILayout.LabelField("Id Source", "Multiple Values");
+            }
+            else
             {
-                var dyn = target as DynamicObject;
-                if (dyn.IdPool == null)
+                GUILayout.BeginHorizontal();
+                idType = EditorGUILayout.Popup(new GUIContent("Id Source"), idType, idTypeNames);
+
+                if (idType == 0) //custom id
                 {
-                    if (GUILayout.Button("New Dynamic Object Id Pool")) //this can overwrite an existing id pool with the same name. should this just find a pool?
-                    {
-                        string poolMeshName = dyn.MeshName;
-                        string assetPath = "Assets/" + poolMeshName + " Id Pool.asset";
+                    EditorGUILayout.PropertyField(customId, new GUIContent(""));
+                    useCustomId.boolValue = true;
+                    idPool.objectReferenceValue = null;
+                }
+                else if (idType == 1) //generate id
+                {
+                    EditorGUI.BeginDisabledGroup(true);
+                    EditorGUILayout.LabelField(new GUIContent("Id will be generated at runtime", "This object will not be included in aggregation metrics on the dashboard"));
+                    EditorGUI.EndDisabledGroup();
+                    customId.stringValue = string.Empty;
+                    useCustomId.boolValue = false;
+                    idPool.objectReferenceValue = null;
+                }
+                else if (idType == 2) //id pool
+                {
+                    EditorGUILayout.ObjectField(idPool, new GUIContent("", "Provides a consistent list of Ids to be used at runtime. Allows aggregated data from objects spawned at runtime"));
+                    customId.stringValue = string.Empty;
+                    useCustomId.boolValue = false;
+                }
+                GUILayout.EndHorizontal();
 
-                        //check if asset exists
-                        var foundPool = (DynamicObjectIdPool)AssetDatabase.LoadAssetAtPath(assetPath, typeof(DynamicObjectIdPool));
-                        if (foundPool == null)
-                        {
-                            var pool = GenerateNewIDPoolAsset(assetPath, dyn);
-                            idPool.objectReferenceValue = pool;
-                        }
-                        else
+                if (idType == 2) //id pool
+                {
+                    var dyn = target as DynamicObject;
+                    if (dyn.IdPool == null)
+                    {
+                        if (GUILayout.Button("New Dynamic Object Id Pool")) //this can overwrite an existing id pool with the same name. should this just find a pool?
                         {
-                            //popup - new pool asset, add to existing pool (if matching mesh name), cancel
-                            int result = EditorUtility.DisplayDialogComplex("Found Id Pool", "An existing Id Pool with the same mesh name was found. Do you want to use this Id Pool instead?", "New Asset", "Cancel", "Use Existing");
+                            string poolMeshName = dyn.MeshName;
+                            string assetPath = "Assets/" + poolMeshName + " Id Pool.asset";
 
-                            if (result == 0)//new asset with unique name
+                            //check if asset exists
+                            var foundPool = (DynamicObjectIdPool)AssetDatabase.LoadAssetAtPath(assetPath, typeof(DynamicObjectIdPool));
+                            if (foundPool == null)
                             {
-                                string finalAssetPath = UnityEditor.AssetDatabase.GenerateUniqueAssetPath(assetPath);
-                                var pool = GenerateNewIDPoolAsset(finalAssetPath, dyn);
+                                var pool = GenerateNewIDPoolAsset(assetPath, dyn);
                                 idPool.objectReferenceValue = pool;
                             }
-                            if (result == 2) //reference existing pool
+                            else
                             {
-                                idPool.objectReferenceValue = foundPool;
+                                //popup - new pool asset, add to existing pool (if matching mesh name), cancel
+                                int result = EditorUtility.DisplayDialogComplex("Found Id Pool", "An existing Id Pool with the same mesh name was found. Do you want to use this Id Pool instead?", "New Asset", "Cancel", "Use Existing");
+
+                                if (result == 0)//new asset with unique name
+                                {
+                                    string finalAssetPath = UnityEditor.AssetDatabase.GenerateUniqueAssetPath(assetPath);
+                                    var pool = GenerateNewIDPoolAsset(finalAssetPath, dyn);
+                                    idPool.objectReferenceValue = pool;
+                                }
+                                if (result == 2) //reference existing pool
+                                {
+                                    idPool.objectReferenceValue = foundPool;
+                                }
+                                if (result == 1) { }//cancel
                             }
-                            if (result == 1) { }//cancel
                         }
                     }
                 }

Editor/ExportUtility.cs

@@ -400,7 +400,7 @@ static void PostSceneUploadResponse(int responseCode, string error, string text)
                 AssetDatabase.SaveAssets();
             }
 
-            UploadSceneSettings.LastRevision = System.DateTime.UtcNow.ToBinary();
+            UploadSceneSettings.LastRevision = System.DateTime.UtcNow.ToString(System.Globalization.CultureInfo.InvariantCulture);
             GUI.FocusControl("NULL");
             EditorUtility.SetDirty(Cognitive3D_Preferences.Instance);
             AssetDatabase.SaveAssets();

Editor/InitWizard.cs

@@ -277,7 +277,7 @@ public SDKDefine(string name, string define, string tooltip="")
             new SDKDefine("SRanipal Runtime","C3D_SRANIPAL","Adds Eyetracking for the Vive Pro Eye" ), //previously C3D_VIVEPROEYE
             new SDKDefine("Varjo XR 3.0.0","C3D_VARJOXR", "Adds Eye Tracking for Varjo Headsets"),
             new SDKDefine("Vive Wave 5.0.2","C3D_VIVEWAVE", "Adds Eye Tracking for Focus 3" ),
-            new SDKDefine("Pico Unity XR Platform 1.2.3","C3D_PICOXR", "Adds Eye Tracking for Pico Neo 3 Eye" ),
+            new SDKDefine("Pico Unity XR Platform 2.1.3","C3D_PICOXR", "Adds Eye Tracking for Pico Neo 3 Eye" ),
             new SDKDefine("MRTK 2.5.4","C3D_MRTK", "Adds Eye Tracking for Hololens 2" ),
             new SDKDefine("Windows Mixed Reality XR","C3D_WINDOWSMR", "Deprecated. Select 'Default'" ), //legacy
             new SDKDefine("Varjo VR","C3D_VARJOVR", "Prefer to upgrade to Varjo XR instead" ), //legacy

Editor/Setup360Window.cs

@@ -11,6 +11,7 @@ namespace Cognitive3D
     public class Setup360Window : EditorWindow
     {
         UnityEngine.Video.VideoClip selectedClip;
+        UnityEngine.Camera userCamera;
         bool latlong = true;
 
         public static void Init()
@@ -35,7 +36,8 @@ void OnGUI()
             }
             GUILayout.FlexibleSpace();
             GUILayout.EndHorizontal();
-            selectedClip = (UnityEngine.Video.VideoClip)EditorGUILayout.ObjectField(selectedClip, typeof(UnityEngine.Video.VideoClip), true);
+            selectedClip = (UnityEngine.Video.VideoClip)EditorGUILayout.ObjectField("Video Clip", selectedClip, typeof(UnityEngine.Video.VideoClip), true);
+            userCamera = (UnityEngine.Camera)EditorGUILayout.ObjectField("Main Camera", userCamera, typeof(UnityEngine.Camera), true);
 
             if (EditorCore.MediaSources.Length == 0)
             {
@@ -73,7 +75,7 @@ void OnGUI()
             GUILayout.EndHorizontal();
 
 
-            EditorGUI.BeginDisabledGroup(selectedClip == null || string.IsNullOrEmpty(EditorCore.MediaSources[_choiceIndex].name));
+            EditorGUI.BeginDisabledGroup(selectedClip == null || string.IsNullOrEmpty(EditorCore.MediaSources[_choiceIndex].name) || userCamera == null);
             if (GUILayout.Button("Create"))
             {
                 CreateAssets();
@@ -133,6 +135,9 @@ void CreateAssets()
                 sphere = (GameObject)PrefabUtility.InstantiatePrefab(Resources.Load("invertedspherecube"));
             }
             sphere.gameObject.name = "360 Video Player";
+            sphere.transform.position = userCamera.transform.position;
+            Cognitive3D.Components.GazeSphere360 myGaze = sphere.AddComponent<Cognitive3D.Components.GazeSphere360>();
+            myGaze.UserCamera = userCamera;
 
             //setup video source to write to render texture
             var vp = sphere.GetComponentInChildren<UnityEngine.Video.VideoPlayer>();
@@ -172,20 +177,6 @@ void CreateAssets()
                 internalGo.AddComponent<DynamicObject>();
             }
 
-            //find the main camera and move it to the origin
-            var camMain = Camera.main;
-            if (camMain == null)
-            {
-                Debug.LogError("Cognitive3D 360 Setup: Could not find Camera.Main! Creating a new camera");
-                var cameraGo = new GameObject("Main Camera");
-                cameraGo.tag = "MainCamera";
-                cameraGo.AddComponent<Camera>();
-            }
-            else
-            {
-                camMain.transform.position = Vector3.zero;
-            }
-
             UnityEditor.SceneManagement.EditorSceneManager.MarkAllScenesDirty();
             Selection.activeGameObject = internalGo;