Modified DisplayInterface to look for json in _Data folder at runtime.

If it's not there, load json from Unity scene as usual.

Author: DuFF14

OSVR-Unity/Assets/OSVRUnity/src/DisplayInterface.cs

@@ -22,6 +22,7 @@
 using UnityEngine;
 using Newtonsoft.Json;
 using System.IO;
+using System.Collections;
 
 namespace OSVR
 {
@@ -35,20 +36,51 @@ namespace Unity
         /// </summary>
         public class DisplayInterface : MonoBehaviour
         {
+            const string HmdJsonFileName = "hmd.json";
             private string _deviceDescriptorJson; //a string that is the JSON file to be parsed
             public TextAsset JsonDescriptorFile; //drop the json file into this slot in the Unity inspector
+
+            public bool Initialized
+            {
+                get { return _initialized; }
+            }
+            private bool _initialized = false;
+
             void Awake()
             {
-                if (JsonDescriptorFile != null)
+                //check to see if "hmd.json" is provided in the Data folder
+                //if so, load it
+                string filePath = Application.dataPath + "/" + HmdJsonFileName;
+                if (System.IO.File.Exists(filePath))
                 {
-                    _deviceDescriptorJson = JsonDescriptorFile.text; //read JSON file directly from Unity if provided
-                }
-                else
+                    StartCoroutine(LoadJsonFile(filePath));
+                }                  
+                else //if not, load the json file provided in the Unity editor
                 {
-                    _deviceDescriptorJson = ClientKit.instance.context.getStringParameter("/display"); //otherwise read from /display
+                    
+                    if (JsonDescriptorFile != null)
+                    {
+                        _deviceDescriptorJson = JsonDescriptorFile.text; //read JSON file directly from Unity if provided
+                    }
+                    else
+                    {
+                        _deviceDescriptorJson = ClientKit.instance.context.getStringParameter("/display"); //otherwise read from /display
+                    }
+                    _initialized = true;
                 }
+                    
+                
             }
 
+            private IEnumerator LoadJsonFile(string filePath)
+            {
+                WWW jsonFile = new WWW("file://"+filePath);
+                yield return jsonFile;
+                _initialized = true;
+                _deviceDescriptorJson = jsonFile.text;
+            }
+
+
 
 
             /// <summary>
@@ -72,7 +104,6 @@ public DeviceDescriptor GetDeviceDescription()
                 //create a device descriptor object for storing the parsed json in an object
                 DeviceDescriptor deviceDescriptor;
                 JsonTextReader reader;
-               
 
                 reader = new JsonTextReader(new StringReader(_deviceDescriptorJson));
                 if(reader != null)

OSVR-Unity/Assets/OSVRUnity/src/VRHead.cs

@@ -53,6 +53,7 @@ public class VRHead : MonoBehaviour
             private Camera _camera;
             private DeviceDescriptor _deviceDescriptor;
             private OsvrDistortion _distortionEffect;
+            private bool _initDisplayInterface = false;
             #endregion
 
             #region Init
@@ -65,23 +66,24 @@ void Start()
                 {
                     _distortionEffect.enabled = (viewMode == ViewMode.mono);
                 }
-                GetDeviceDescription();
-                MatchEyes(); //copy camera properties to each eye
-                //rotate each eye based on overlap percent, must do this after match eyes
-                if (_deviceDescriptor != null)
+
+                //update VRHead with info from the display interface if it has been initialized
+                //it might not be initialized if it is still loading/parsing a display json file
+                //in that case, we will try to initialize asap in the update function
+                if (GetComponent<DisplayInterface>().Initialized)
                 {
-                    SetEyeRotation(_deviceDescriptor.OverlapPercent, _deviceDescriptor.MonocularHorizontal);
-                    SetEyeRoll(_deviceDescriptor.LeftRoll, _deviceDescriptor.RightRoll);
-                }
-                
-                
-                
-            }
+                    UpdateDisplayInterface();                  
+                }              
+            }         
             #endregion
 
             #region Loop
             void Update()
             {
+                if(!_initDisplayInterface && GetComponent<DisplayInterface>().Initialized)
+                {
+                    UpdateDisplayInterface();
+                }
                 UpdateStereoAmount();
                 UpdateViewMode();
             }
@@ -91,6 +93,18 @@ void Update()
             #endregion
 
             #region Private Methods
+            private void UpdateDisplayInterface()
+            {
+                GetDeviceDescription();
+                MatchEyes(); //copy camera properties to each eye
+                //rotate each eye based on overlap percent, must do this after match eyes
+                if (_deviceDescriptor != null)
+                {
+                    SetEyeRotation(_deviceDescriptor.OverlapPercent, _deviceDescriptor.MonocularHorizontal);
+                    SetEyeRoll(_deviceDescriptor.LeftRoll, _deviceDescriptor.RightRoll);
+                }
+                _initDisplayInterface = true;
+            }
             void UpdateViewMode()
             {
                 if (Time.realtimeSinceStartup < 100 || _previousViewMode != viewMode)
@@ -170,6 +184,8 @@ void Init()
 
                 //60 FPS whenever possible:
                 Application.targetFrameRate = 60;
+
+                _initDisplayInterface = false;
             }
 
             /// <summary>
@@ -178,10 +194,10 @@ void Init()
             /// </summary>
             private void GetDeviceDescription()
             {
-                _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();
-                Debug.Log(_deviceDescriptor.ToString());
+                _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();              
                 if (_deviceDescriptor != null)
                 {
+                    Debug.Log(_deviceDescriptor.ToString());
                     switch (_deviceDescriptor.DisplayMode)
                     {
                         case "full_screen":