From e3f92a4a993b9494cc94c048bb690e212906588a Mon Sep 17 00:00:00 2001 From: Greg Aring Date: Wed, 30 Mar 2016 14:24:59 -0400 Subject: [PATCH 1/5] Changed default numBuffers to 2 with vsync enabled. --- apps/sample-configs/renderManager.direct.landscape.json | 4 ++-- apps/sample-configs/renderManager.direct.portrait.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/sample-configs/renderManager.direct.landscape.json b/apps/sample-configs/renderManager.direct.landscape.json index 700d2c973..b2908b2cf 100644 --- a/apps/sample-configs/renderManager.direct.landscape.json +++ b/apps/sample-configs/renderManager.direct.landscape.json @@ -6,8 +6,8 @@ "directModeEnabled": true, "directDisplayIndex": 0, "directHighPriorityEnabled": true, - "numBuffers": 1, - "verticalSyncEnabled": false, + "numBuffers": 2, + "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, "renderOverfillFactor": 1.5, diff --git a/apps/sample-configs/renderManager.direct.portrait.json b/apps/sample-configs/renderManager.direct.portrait.json index 95fe2eb25..88e480498 100644 --- a/apps/sample-configs/renderManager.direct.portrait.json +++ b/apps/sample-configs/renderManager.direct.portrait.json @@ -6,8 +6,8 @@ "directModeEnabled": true, "directDisplayIndex": 0, "directHighPriorityEnabled": true, - "numBuffers": 1, - "verticalSyncEnabled": false, + "numBuffers": 2, + "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, "renderOverfillFactor": 1.5, From 9ee23ea0325cf768bfe13b652c1c485a888cd9f1 Mon Sep 17 00:00:00 2001 From: Greg Aring Date: Wed, 13 Apr 2016 14:21:27 -0400 Subject: [PATCH 2/5] Added renderOversampleFactor = 1.0 to default RenderManager directmode config. --- apps/sample-configs/renderManager.direct.landscape.json | 1 + apps/sample-configs/renderManager.direct.portrait.json | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/sample-configs/renderManager.direct.landscape.json b/apps/sample-configs/renderManager.direct.landscape.json index b2908b2cf..d85de8fde 100644 --- a/apps/sample-configs/renderManager.direct.landscape.json +++ b/apps/sample-configs/renderManager.direct.landscape.json @@ -10,6 +10,7 @@ "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, "renderOverfillFactor": 1.5, + "renderOversampleFactor": 1.0, "window": { "title": "OSVR", diff --git a/apps/sample-configs/renderManager.direct.portrait.json b/apps/sample-configs/renderManager.direct.portrait.json index 88e480498..d827f41b4 100644 --- a/apps/sample-configs/renderManager.direct.portrait.json +++ b/apps/sample-configs/renderManager.direct.portrait.json @@ -10,6 +10,7 @@ "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, "renderOverfillFactor": 1.5, + "renderOversampleFactor": 1.0, "window": { "title": "OSVR", From 27985f16c960c1884f5a217e5684a0e1815deee7 Mon Sep 17 00:00:00 2001 From: Greg Aring Date: Tue, 31 May 2016 17:25:01 -0400 Subject: [PATCH 3/5] Updated OSVR_HDK_1_3_with_mesh to use the new FOV values and OSVR_HDK_13_V2 disotrtion mesh rather than V1. --- apps/displays/OSVR_HDK_1_3_with_mesh.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/displays/OSVR_HDK_1_3_with_mesh.json b/apps/displays/OSVR_HDK_1_3_with_mesh.json index e97d4f1b6..56e1cdaf7 100644 --- a/apps/displays/OSVR_HDK_1_3_with_mesh.json +++ b/apps/displays/OSVR_HDK_1_3_with_mesh.json @@ -11,8 +11,8 @@ "Note": "Specific to the optics of 1.3, with a specialized distortion correction requiring apps to use RenderManager 0.6.40 or newer." }, "field_of_view": { - "monocular_horizontal": 92, - "monocular_vertical": 92, + "monocular_horizontal": 87.2628, + "monocular_vertical": 87.2628, "overlap_percent": 100, "pitch_tilt": 0 }, @@ -25,7 +25,7 @@ }], "distortion": { "type": "mono_point_samples", - "mono_point_samples_built_in": "OSVR_HDK_13_V1" + "mono_point_samples_built_in": "OSVR_HDK_13_V2" }, "rendering": { "right_roll": 0, From e229a0ac560dc8f79f8bb64eae97c4fedb7d88d3 Mon Sep 17 00:00:00 2001 From: Greg Aring Date: Tue, 31 May 2016 17:26:23 -0400 Subject: [PATCH 4/5] Updated osvr_server_config.renderManager.sample.json to use built-in distortion mesh v2. Added client-side prediction section and updated values. --- ...vr_server_config.renderManager.sample.json | 67 +++++++++++-------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/apps/sample-configs/osvr_server_config.renderManager.sample.json b/apps/sample-configs/osvr_server_config.renderManager.sample.json index 094fe6899..29e1b3b21 100644 --- a/apps/sample-configs/osvr_server_config.renderManager.sample.json +++ b/apps/sample-configs/osvr_server_config.renderManager.sample.json @@ -1,4 +1,5 @@ { + "description" : "Combined RenderManager config with HDK 1.3 display and client-side prediction. Disabled server-side prediction.", "renderManagerConfig": { "meta": { "schemaVersion": 1 @@ -8,11 +9,11 @@ "directDisplayIndex": 0, "directHighPriorityEnabled": true, "numBuffers": 2, - "verticalSyncEnabled": false, + "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, - "renderOverfillFactor": 2.0, + "renderOverfillFactor": 1.2, "renderOversampleFactor": 1.0, - + "window": { "title": "OSVR", "fullScreenEnabled": true, @@ -25,6 +26,14 @@ "bitsPerColor": 8 }, + "prediction": { + "enabled": true, + "staticDelayMS": 29, + "leftEyeDelayMS": 7.5, + "rightEyeDelayMS": 0, + "localTimeOverride": true + }, + "timeWarp": { "enabled": true, "asynchronous": false, @@ -42,49 +51,49 @@ "properties": { "vendor": "OSVR", "model": "HDK", - "num_displays": 1, + "num_displays": 2, "Version": "1.3", - "Note": "OSVR HDK portrait mode" + "Note": "OSVR HDK 1.3 in DirectMode" } }, "field_of_view": { - "monocular_horizontal": 90, - "monocular_vertical": 96.73, + "monocular_horizontal": 87.2628, + "monocular_vertical": 87.2628, "overlap_percent": 100, - "pitch_tilt": 0 + "pitch_tilt": 0 }, "resolutions": [ { "width": 1920, "height": 1080, - "video_inputs": 1, + "video_inputs": 2, "display_mode": "horz_side_by_side", "swap_eyes": 0 } ], - "distortion": { - "distance_scale_x": 1, - "distance_scale_y": 1, - "polynomial_coeffs_red": [ 0, 1 ], - "polynomial_coeffs_green": [ 0, 1 ], - "polynomial_coeffs_blue": [ 0, 1 ] - }, + "distortion": { + "type": "mono_point_samples", + "mono_point_samples_built_in": "OSVR_HDK_13_V2" + }, "rendering": { "right_roll": 0, "left_roll": 0 }, - "eyes": [ - { - "center_proj_x": 0.5, - "center_proj_y": 0.5, - "rotate_180": 0 - }, - { - "center_proj_x": 0.5, - "center_proj_y": 0.5, - "rotate_180": 0 - } - ] + "eyes": [{ + "center_proj_x": 0.5574, + "center_proj_y": 0.5, + "rotate_180": 0 + }, { + "center_proj_x": 0.4426, + "center_proj_y": 0.5, + "rotate_180": 0 + }] } - } + }, + "aliases": { + "/me/head": { + "translate": [0.0, 0.0, -0.06], + "child": "/com_osvr_Multiserver/OSVRHackerDevKit0/semantic/hmd" + } + } } From 3f9d474d7dbc365d61dce91b6e6734d8a8ac4afc Mon Sep 17 00:00:00 2001 From: Greg Aring Date: Tue, 31 May 2016 17:27:56 -0400 Subject: [PATCH 5/5] Updated renderOverfillFactor to 1.2, and updated vsync settings. --- apps/sample-configs/renderManager.direct.landscape.json | 4 ++-- apps/sample-configs/renderManager.direct.portrait.json | 6 +++--- apps/sample-configs/renderManager.extended.landscape.json | 8 ++++---- apps/sample-configs/renderManager.extended.portrait.json | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/sample-configs/renderManager.direct.landscape.json b/apps/sample-configs/renderManager.direct.landscape.json index d6aee5351..ce40dc6a5 100644 --- a/apps/sample-configs/renderManager.direct.landscape.json +++ b/apps/sample-configs/renderManager.direct.landscape.json @@ -9,8 +9,8 @@ "numBuffers": 2, "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, - "renderOverfillFactor": 1.5, - "renderOversampleFactor": 1.0, + "renderOverfillFactor": 1.2, + "renderOversampleFactor": 1.0, "window": { "title": "OSVR", diff --git a/apps/sample-configs/renderManager.direct.portrait.json b/apps/sample-configs/renderManager.direct.portrait.json index 3700e1557..3a5189463 100644 --- a/apps/sample-configs/renderManager.direct.portrait.json +++ b/apps/sample-configs/renderManager.direct.portrait.json @@ -6,10 +6,10 @@ "directModeEnabled": true, "directDisplayIndex": 0, "directHighPriorityEnabled": true, - "numBuffers": 1, - "verticalSyncEnabled": false, + "numBuffers": 2, + "verticalSyncEnabled": true, "verticalSyncBlockRenderingEnabled": true, - "renderOverfillFactor": 1.5, + "renderOverfillFactor": 1.2, "renderOversampleFactor": 1.0, "window": { diff --git a/apps/sample-configs/renderManager.extended.landscape.json b/apps/sample-configs/renderManager.extended.landscape.json index d9df725aa..5fe57fb43 100644 --- a/apps/sample-configs/renderManager.extended.landscape.json +++ b/apps/sample-configs/renderManager.extended.landscape.json @@ -5,11 +5,11 @@ "renderManagerConfig": { "directModeEnabled": false, "directDisplayIndex": 0, - "directHighPriorityEnabled": true, + "directHighPriorityEnabled": false, "numBuffers": 2, - "verticalSyncEnabled": true, - "verticalSyncBlockRenderingEnabled": true, - "renderOverfillFactor": 1.5, + "verticalSyncEnabled": false, + "verticalSyncBlockRenderingEnabled": false, + "renderOverfillFactor": 1.2, "renderOversampleFactor": 1.0, "window": { diff --git a/apps/sample-configs/renderManager.extended.portrait.json b/apps/sample-configs/renderManager.extended.portrait.json index f1fe61686..9e189f38e 100644 --- a/apps/sample-configs/renderManager.extended.portrait.json +++ b/apps/sample-configs/renderManager.extended.portrait.json @@ -5,11 +5,11 @@ "renderManagerConfig": { "directModeEnabled": false, "directDisplayIndex": 0, - "directHighPriorityEnabled": true, + "directHighPriorityEnabled": false, "numBuffers": 2, - "verticalSyncEnabled": true, - "verticalSyncBlockRenderingEnabled": true, - "renderOverfillFactor": 1.5, + "verticalSyncEnabled": false, + "verticalSyncBlockRenderingEnabled": false, + "renderOverfillFactor": 1.2, "renderOversampleFactor": 1.0, "window": {