VRHead will now ping DisplayInterface in Update if DisplayInterface hasn't read from /display yet.

Removed filename from device descriptor.

Author: DuFF14

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

@@ -30,14 +30,6 @@
 
 public class DeviceDescriptor
 {
-
-    //filename
-    private string _fileName = "";
-    public string FileName
-    {
-        get { return _fileName; }
-        set { _fileName = value; }
-    }
     //hmd
     private string _vendor = "";
     public string Vendor
@@ -173,11 +165,10 @@ public int Rotate180
 
     //constructors
     public DeviceDescriptor() { }
-    public DeviceDescriptor(string fileName, string vendor, string model, string version, int numDisplays, string note, float monocularHorizontal, 
+    public DeviceDescriptor(string vendor, string model, string version, int numDisplays, string note, float monocularHorizontal, 
         float monocularVertical, float overlapPercent, float pitchTilt, int width, int height, int videoInputs, string displayMode, float k1Red, 
         float k1Green, float k1Blue, float leftRoll, float rightRoll, float centerProjX, float centerProjY, int rotate180)
     {
-        this._fileName = fileName;
         this._vendor = vendor;
         this._model = model;
         this._version = version;
@@ -203,15 +194,9 @@ public DeviceDescriptor(string fileName, string vendor, string model, string ver
 
     public override string ToString()
     {
-
-        if (FileName.Equals(""))
-        {
-            return "No json file has been provided.";
-        }
         //print
         StringBuilder jsonPrinter = new StringBuilder(64);
         jsonPrinter.AppendLine("Json File Device Description:")
-        .Append("filename = ").AppendLine(FileName)
         .Append("HMD\n")
         .Append("vendor = ").AppendLine(Vendor)
         .Append("model = ").AppendLine(Model)

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

@@ -38,9 +38,7 @@ public class DisplayInterface : MonoBehaviour
         {
             private string _deviceDescriptorJson; //a string that is the JSON file to be parsed
 
-            //TODO: remove this field. It was added when external JSON files were being loaded rather than
-            //being read from /display. _initalized exists to make sure display config has been parsed before trying to read it
-            //this probably isn't necessary anymore now that it comes from /display, but leaving this here for now just to be safe.
+            //_initalized exists to make sure the display config has been parsed before trying to read it
             public bool Initialized
             {
                 get { return _initialized; }
@@ -49,8 +47,21 @@ public bool Initialized
 
             void Start()
             {
-                _deviceDescriptorJson = ClientKit.instance.context.getStringParameter("/display");
-                _initialized = true;
+                ReadDisplayPath();
+            }
+
+            //this function attemtps to retrieve display configuration from the /display path
+            //this data is in JSON format. Once it has initialized, the data is used to configure Camera and other settings.
+            public void ReadDisplayPath()
+            {
+                if (!_initialized)
+                {
+                    _deviceDescriptorJson = ClientKit.instance.context.getStringParameter("/display");
+                    if (_deviceDescriptorJson != "")
+                    {
+                        _initialized = true;
+                    }
+                }
             }
 
             /// <summary>

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

@@ -80,13 +80,24 @@ void Start()
             #region Loop
             void Update()
             {
-                //make sure we have display config info from /display.
-                if(!_initDisplayInterface && GetComponent<DisplayInterface>().Initialized)
+                
+                if(!_initDisplayInterface && !GetComponent<DisplayInterface>().Initialized)
+                {
+                    //if the display configuration hasn't initialized, ping the DisplayInterface to retrieve it from the ClientKit
+                    //this would mean DisplayInterface was unable to retrieve that data in its Start() function.
+                    GetComponent<DisplayInterface>().ReadDisplayPath();
+                }
+                else if (!_initDisplayInterface && GetComponent<DisplayInterface>().Initialized)
                 {
+                    //once the DisplayInterface has initialized, meaning it has read data from the /display path which contains
+                    //display configuration, update the Camera and other settings with properties from the display configuration.
                     UpdateDisplayInterface();
                 }
-                UpdateStereoAmount();
-                UpdateViewMode();
+                else if (_initDisplayInterface)
+                {
+                    UpdateStereoAmount();
+                    UpdateViewMode();
+                }
             }
             #endregion
 
@@ -198,7 +209,6 @@ private void GetDeviceDescription()
                 _deviceDescriptor = GetComponent<DisplayInterface>().GetDeviceDescription();              
                 if (_deviceDescriptor != null)
                 {
-                    Debug.Log(_deviceDescriptor.ToString());
                     switch (_deviceDescriptor.DisplayMode)
                     {
                         case "full_screen":

OSVR-Unity/Assets/Plugins/osvr-ver.txt

@@ -1 +1 @@
-v0.2-1-g0f15a69
+v0.2-5-g1d72171