Skip to content

Commit 03c56be

Browse files
DuFF14rpavlik
DuFF14
authored and
rpavlik
committed
Added num_displays field to json config files and DeviceDescriptor.
Added updated json config files for Sensics HMDs. Updated camera projection matrix to accommodate HMDs with multiple displays.
1 parent b54e7d8 commit 03c56be

44 files changed

Lines changed: 753 additions & 231 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎OSVR-Unity/Assets/Materials.meta‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OSVR-Unity/Assets/OSVRUnity/Displays/HMD.json‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
{
22
"hmd": {
3+
"device": {
4+
"vendor": "OSVR",
5+
"model": "HDK",
6+
"Version": "1.1",
7+
"num_displays": 1,
8+
"Note": "Settings are also good for HDK 1.0"
9+
},
310
"field_of_view": {
411
"monocular_horizontal": 90,
512
"monocular_vertical": 101.25,
613
"overlap_percent": 100,
714
"pitch_tilt": 0
815
},
9-
"resolutions": [
10-
{
11-
"width": 1920,
12-
"height": 1080,
13-
"video_inputs": 1,
14-
"display_mode": "horz_side_by_side"
15-
}
16-
],
17-
"distortion": {
18-
"k1_red": 0,
19-
"k1_green": 0,
20-
"k1_blue": 0
21-
},
22-
"rendering": {
23-
"right_roll": 0,
24-
"left_roll": 0
25-
},
26-
"eyes": [
27-
{
28-
"center_proj_x": 0.5,
29-
"center_proj_y": 0.5,
30-
"rotate_180": 0
31-
}
32-
]
33-
}
16+
"resolutions": [
17+
{
18+
"width": 1920,
19+
"height": 1080,
20+
"video_inputs": 1,
21+
"display_mode": "horz_side_by_side"
22+
}
23+
],
24+
"distortion": {
25+
"k1_red": 0,
26+
"k1_green": 0,
27+
"k1_blue": 0
28+
},
29+
"rendering": {
30+
"right_roll": 0,
31+
"left_roll": 0
32+
},
33+
"eyes": [
34+
{
35+
"center_proj_x": 0.5,
36+
"center_proj_y": 0.5,
37+
"rotate_180": 0
38+
}
39+
]
40+
}
3441
}

‎OSVR-Unity/Assets/OSVRUnity/Displays/HMD_Vuzix1200dx.json‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
{
22
"hmd": {
3+
"device": {
4+
"vendor": "Vuzix",
5+
"model": "Wrap 1200dx",
6+
"Version": "1.0",
7+
"num_displays": 2,
8+
"Note": ""
9+
},
310
"field_of_view": {
411
"monocular_horizontal": 17.6,
512
"monocular_vertical": 30.7,
613
"overlap_percent": 100,
714
"pitch_tilt": 0
815
},
9-
"resolutions": [
10-
{
11-
"width": 852,
12-
"height": 480,
13-
"video_inputs": 1,
14-
"display_mode": "horz_side_by_side"
15-
}
16-
],
17-
"distortion": {
18-
"k1_red": 0,
19-
"k1_green": 0,
20-
"k1_blue": 0
21-
},
22-
"rendering": {
23-
"right_roll": 0,
24-
"left_roll": 0
25-
},
26-
"eyes": [
27-
{
28-
"center_proj_x": 0.5,
29-
"center_proj_y": 0.5,
30-
"rotate_180": 0
31-
}
32-
]
33-
}
16+
"resolutions": [
17+
{
18+
"width": 852,
19+
"height": 480,
20+
"video_inputs": 1,
21+
"display_mode": "horz_side_by_side"
22+
}
23+
],
24+
"distortion": {
25+
"k1_red": 0,
26+
"k1_green": 0,
27+
"k1_blue": 0
28+
},
29+
"rendering": {
30+
"right_roll": 0,
31+
"left_roll": 0
32+
},
33+
"eyes": [
34+
{
35+
"center_proj_x": 0.5,
36+
"center_proj_y": 0.5,
37+
"rotate_180": 0
38+
}
39+
]
40+
}
3441
}

‎OSVR-Unity/Assets/OSVRUnity/Displays/HMD_Vuzix720.json‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
11
{
22
"hmd": {
3+
"device": {
4+
"vendor": "Vuzix",
5+
"model": "IWear 720",
6+
"Version": "1.0",
7+
"num_displays": 2,
8+
"Note": ""
9+
},
310
"field_of_view": {
411
"monocular_horizontal": 51,
512
"monocular_vertical": 30,
613
"overlap_percent": 100,
714
"pitch_tilt": 0
815
},
9-
"resolutions": [
10-
{
11-
"width": 1280,
12-
"height": 720,
13-
"video_inputs": 1,
14-
"display_mode": "horz_side_by_side"
15-
}
16-
],
17-
"distortion": {
18-
"k1_red": 0,
19-
"k1_green": 0,
20-
"k1_blue": 0
21-
},
22-
"rendering": {
23-
"right_roll": 0,
24-
"left_roll": 0
25-
},
26-
"eyes": [
27-
{
28-
"center_proj_x": 0.5,
29-
"center_proj_y": 0.5,
30-
"rotate_180": 0
31-
}
32-
]
33-
}
16+
"resolutions": [
17+
{
18+
"width": 1280,
19+
"height": 720,
20+
"video_inputs": 1,
21+
"display_mode": "horz_side_by_side"
22+
}
23+
],
24+
"distortion": {
25+
"k1_red": 0,
26+
"k1_green": 0,
27+
"k1_blue": 0
28+
},
29+
"rendering": {
30+
"right_roll": 0,
31+
"left_roll": 0
32+
},
33+
"eyes": [
34+
{
35+
"center_proj_x": 0.5,
36+
"center_proj_y": 0.5,
37+
"rotate_180": 0
38+
}
39+
]
40+
}
3441
}

‎OSVR-Unity/Assets/OSVRUnity/Displays/OSVR_HDK_1_1.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"vendor": "OSVR",
55
"model": "HDK",
66
"Version": "1.1",
7+
"num_displays": 1,
78
"Note": "Settings are also good for HDK 1.0"
89
},
910
"field_of_view": {
@@ -17,7 +18,7 @@
1718
"width": 1920,
1819
"height": 1080,
1920
"video_inputs": 1,
20-
"display_mode": "horz_side_by_side"
21+
"display_mode": "horz_side_by_side"
2122
}
2223
],
2324
"distortion": {

OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape.json renamed to OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape_1input_sbs.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"vendor": "Sensics",
55
"model": "dSight",
66
"Version": "landscape",
7-
"Note": "Suitable when dSight receives 1080x1920 landscape-mode video"
7+
"num_displays": 2,
8+
"Note": "Suitable when dSight receives 1080x1920 landscape-mode video, 1 video input"
89
},
910
"field_of_view": {
1011
"monocular_horizontal": 95,
@@ -21,9 +22,9 @@
2122
}
2223
],
2324
"distortion": {
24-
"k1_red": 0.5,
25-
"k1_green": 0.5,
26-
"k1_blue": 0.5
25+
"k1_red": 0.5,
26+
"k1_green": 0.5,
27+
"k1_blue": 0.5
2728
},
2829
"rendering": {
2930
"right_roll": 0,

OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape.json.meta renamed to OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape_1input_sbs.json.meta

File renamed without changes.

‎OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape_2inputs.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"hmd": {
3+
"device": {
4+
"vendor": "Sensics",
5+
"model": "dSight",
6+
"Version": "landscape",
7+
"num_displays": 2,
8+
"Note": "Suitable when dSight receives 1080x1920 landscape-mode video, 2 video inputs"
9+
},
10+
"field_of_view": {
11+
"monocular_horizontal": 95,
12+
"monocular_vertical": 53.43,
13+
"overlap_percent": 73.68,
14+
"pitch_tilt": 0
15+
},
16+
"resolutions": [
17+
{
18+
"width": 1920,
19+
"height": 1080,
20+
"video_inputs": 2,
21+
"display_mode": "full_screen"
22+
}
23+
],
24+
"distortion": {
25+
"k1_red": 0.5,
26+
"k1_green": 0.5,
27+
"k1_blue": 0.5
28+
},
29+
"rendering": {
30+
"right_roll": 0,
31+
"left_roll": 0
32+
},
33+
"eyes": [
34+
{
35+
"center_proj_x": 0.5,
36+
"center_proj_y": 0.5
37+
}
38+
]
39+
}
40+
}

OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_zSight_1_1.json.meta renamed to OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_landscape_2inputs.json.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_portrait.json renamed to OSVR-Unity/Assets/OSVRUnity/Displays/Sensics_dSight_portrait_1input_sbs.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"vendor": "Sensics",
55
"model": "dSight",
66
"Version": "portrait",
7-
"Note": "Suitable when dSight receives 1080x1920 portrait-mode video"
7+
"num_displays": 2,
8+
"Note": "Suitable when dSight receives 1080x1920 portrait-mode video, 1 video input"
89
},
910
"field_of_view": {
1011
"monocular_horizontal": 95,
@@ -13,12 +14,6 @@
1314
"pitch_tilt": 0
1415
},
1516
"resolutions": [
16-
{
17-
"width": 1920,
18-
"height": 1080,
19-
"video_inputs": 2,
20-
"display_mode": "full_screen"
21-
},
2217
{
2318
"width": 1920,
2419
"height": 1080,
@@ -27,9 +22,9 @@
2722
}
2823
],
2924
"distortion": {
30-
"k1_red": 0,
31-
"k1_green": 0,
32-
"k1_blue": 0
25+
"k1_red": 0.5,
26+
"k1_green": 0.5,
27+
"k1_blue": 0.5
3328
},
3429
"rendering": {
3530
"right_roll": 180,

0 commit comments

Comments
 (0)