Skip to content

Commit d44b1db

Browse files
JeroMiyaJeroMiya
committed
Untabified changes to DeviceDescriptor and DisplayInterface.
1 parent 784f1d4 commit d44b1db

2 files changed

Lines changed: 118 additions & 118 deletions

File tree

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

Lines changed: 100 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -229,105 +229,105 @@ public override string ToString()
229229
return jsonPrinter.ToString();
230230
}
231231

232-
/// <summary>
233-
/// This function will parse the device parameters from a device descriptor json file using Newstonsoft
234-
///
235-
/// Returns a DeviceDescriptor object containing stored json values.
236-
/// </summary>
237-
public static DeviceDescriptor Parse(string deviceDescriptorJson)
238-
{
239-
if (deviceDescriptorJson == null) {
240-
throw new ArgumentNullException ("deviceDescriptorJson");
241-
}
232+
/// <summary>
233+
/// This function will parse the device parameters from a device descriptor json file using Newstonsoft
234+
///
235+
/// Returns a DeviceDescriptor object containing stored json values.
236+
/// </summary>
237+
public static DeviceDescriptor Parse(string deviceDescriptorJson)
238+
{
239+
if (deviceDescriptorJson == null) {
240+
throw new ArgumentNullException ("deviceDescriptorJson");
241+
}
242242

243-
//create a device descriptor object for storing the parsed json in an object
244-
DeviceDescriptor deviceDescriptor;
245-
JsonTextReader reader;
246-
247-
248-
reader = new JsonTextReader(new StringReader(deviceDescriptorJson));
249-
if(reader != null)
250-
{
251-
deviceDescriptor = new DeviceDescriptor();
252-
}
253-
else
254-
{
255-
Debug.LogError("No Device Descriptor detected.");
256-
return null;
257-
}
258-
259-
//parsey
260-
while (reader.Read())
261-
{
262-
if (reader.Value != null && reader.ValueType == typeof(String))
263-
{
264-
string parsedJson = reader.Value.ToString().ToLower();
265-
switch(parsedJson)
266-
{
267-
case "vendor":
268-
deviceDescriptor.Vendor = reader.ReadAsString();
269-
break;
270-
case "model":
271-
deviceDescriptor.Model = reader.ReadAsString();
272-
break;
273-
case "version":
274-
deviceDescriptor.Version = reader.ReadAsString();
275-
break;
276-
case "note":
277-
deviceDescriptor.Note = reader.ReadAsString();
278-
break;
279-
case "monocular_horizontal":
280-
deviceDescriptor.MonocularHorizontal = float.Parse(reader.ReadAsString());
281-
break;
282-
case "monocular_vertical":
283-
deviceDescriptor.MonocularVertical = float.Parse(reader.ReadAsString());
284-
break;
285-
case "overlap_percent":
286-
deviceDescriptor.OverlapPercent = float.Parse(reader.ReadAsString());
287-
break;
288-
case "pitch_tilt":
289-
deviceDescriptor.PitchTilt = float.Parse(reader.ReadAsString());
290-
break;
291-
case "width":
292-
deviceDescriptor.Width = int.Parse(reader.ReadAsString());
293-
break;
294-
case "height":
295-
deviceDescriptor.Height = int.Parse(reader.ReadAsString());
296-
break;
297-
case "video_inputs":
298-
deviceDescriptor.VideoInputs = int.Parse(reader.ReadAsString());
299-
break;
300-
case "display_mode":
301-
deviceDescriptor.DisplayMode = reader.ReadAsString();
302-
break;
303-
case "k1_red":
304-
deviceDescriptor.K1Red = float.Parse(reader.ReadAsString());
305-
break;
306-
case "k1_green":
307-
deviceDescriptor.K1Green = float.Parse(reader.ReadAsString());
308-
break;
309-
case "k1_blue":
310-
deviceDescriptor.K1Blue = float.Parse(reader.ReadAsString());
311-
break;
312-
case "right_roll":
313-
deviceDescriptor.RightRoll = float.Parse(reader.ReadAsString());
314-
break;
315-
case "left_roll":
316-
deviceDescriptor.LeftRoll = float.Parse(reader.ReadAsString());
317-
break;
318-
case "center_proj_x":
319-
deviceDescriptor.CenterProjX = float.Parse(reader.ReadAsString());
320-
break;
321-
case "center_proj_y":
322-
deviceDescriptor.CenterProjY = float.Parse(reader.ReadAsString());
323-
break;
324-
case "rotate_180":
325-
deviceDescriptor.Rotate180 = int.Parse(reader.ReadAsString());
326-
break;
327-
}
328-
}
329-
}
330-
331-
return deviceDescriptor;
332-
}
243+
//create a device descriptor object for storing the parsed json in an object
244+
DeviceDescriptor deviceDescriptor;
245+
JsonTextReader reader;
246+
247+
248+
reader = new JsonTextReader(new StringReader(deviceDescriptorJson));
249+
if(reader != null)
250+
{
251+
deviceDescriptor = new DeviceDescriptor();
252+
}
253+
else
254+
{
255+
Debug.LogError("No Device Descriptor detected.");
256+
return null;
257+
}
258+
259+
//parsey
260+
while (reader.Read())
261+
{
262+
if (reader.Value != null && reader.ValueType == typeof(String))
263+
{
264+
string parsedJson = reader.Value.ToString().ToLower();
265+
switch(parsedJson)
266+
{
267+
case "vendor":
268+
deviceDescriptor.Vendor = reader.ReadAsString();
269+
break;
270+
case "model":
271+
deviceDescriptor.Model = reader.ReadAsString();
272+
break;
273+
case "version":
274+
deviceDescriptor.Version = reader.ReadAsString();
275+
break;
276+
case "note":
277+
deviceDescriptor.Note = reader.ReadAsString();
278+
break;
279+
case "monocular_horizontal":
280+
deviceDescriptor.MonocularHorizontal = float.Parse(reader.ReadAsString());
281+
break;
282+
case "monocular_vertical":
283+
deviceDescriptor.MonocularVertical = float.Parse(reader.ReadAsString());
284+
break;
285+
case "overlap_percent":
286+
deviceDescriptor.OverlapPercent = float.Parse(reader.ReadAsString());
287+
break;
288+
case "pitch_tilt":
289+
deviceDescriptor.PitchTilt = float.Parse(reader.ReadAsString());
290+
break;
291+
case "width":
292+
deviceDescriptor.Width = int.Parse(reader.ReadAsString());
293+
break;
294+
case "height":
295+
deviceDescriptor.Height = int.Parse(reader.ReadAsString());
296+
break;
297+
case "video_inputs":
298+
deviceDescriptor.VideoInputs = int.Parse(reader.ReadAsString());
299+
break;
300+
case "display_mode":
301+
deviceDescriptor.DisplayMode = reader.ReadAsString();
302+
break;
303+
case "k1_red":
304+
deviceDescriptor.K1Red = float.Parse(reader.ReadAsString());
305+
break;
306+
case "k1_green":
307+
deviceDescriptor.K1Green = float.Parse(reader.ReadAsString());
308+
break;
309+
case "k1_blue":
310+
deviceDescriptor.K1Blue = float.Parse(reader.ReadAsString());
311+
break;
312+
case "right_roll":
313+
deviceDescriptor.RightRoll = float.Parse(reader.ReadAsString());
314+
break;
315+
case "left_roll":
316+
deviceDescriptor.LeftRoll = float.Parse(reader.ReadAsString());
317+
break;
318+
case "center_proj_x":
319+
deviceDescriptor.CenterProjX = float.Parse(reader.ReadAsString());
320+
break;
321+
case "center_proj_y":
322+
deviceDescriptor.CenterProjY = float.Parse(reader.ReadAsString());
323+
break;
324+
case "rotate_180":
325+
deviceDescriptor.Rotate180 = int.Parse(reader.ReadAsString());
326+
break;
327+
}
328+
}
329+
}
330+
331+
return deviceDescriptor;
332+
}
333333
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,24 @@ public DeviceDescriptor GetDisplayParameters(TextAsset jsonDescriptor)
6262
return GetDeviceDescription();
6363
}
6464

65-
/// <summary>
66-
/// This function will parse the device parameters from a device descriptor json file using Newstonsoft
67-
///
68-
/// Returns a DeviceDescriptor object containing stored json values.
69-
/// </summary>
70-
public DeviceDescriptor GetDeviceDescription()
71-
{
72-
//create a device descriptor object for storing the parsed json in an object
73-
DeviceDescriptor deviceDescriptor = DeviceDescriptor.Parse(_deviceDescriptorJson);
74-
if (deviceDescriptor != null) {
75-
if (JsonDescriptorFile != null) {
76-
deviceDescriptor.FileName = JsonDescriptorFile.name;
77-
} else {
78-
deviceDescriptor.FileName = "No descriptor file has been assigned. Using parameters from /display";
79-
}
80-
}
81-
return deviceDescriptor;
82-
}
65+
/// <summary>
66+
/// This function will parse the device parameters from a device descriptor json file using Newstonsoft
67+
///
68+
/// Returns a DeviceDescriptor object containing stored json values.
69+
/// </summary>
70+
public DeviceDescriptor GetDeviceDescription()
71+
{
72+
//create a device descriptor object for storing the parsed json in an object
73+
DeviceDescriptor deviceDescriptor = DeviceDescriptor.Parse(_deviceDescriptorJson);
74+
if (deviceDescriptor != null) {
75+
if (JsonDescriptorFile != null) {
76+
deviceDescriptor.FileName = JsonDescriptorFile.name;
77+
} else {
78+
deviceDescriptor.FileName = "No descriptor file has been assigned. Using parameters from /display";
79+
}
80+
}
81+
return deviceDescriptor;
82+
}
8383
}
8484
}
8585
}

0 commit comments

Comments
 (0)