From 2fb7a9eca2f8596122546d604dae56458c435ae3 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 21 Jan 2022 16:36:13 +0100 Subject: [PATCH] Update SGCT repository, change configuration files accordingly --- apps/OpenSpace/ext/sgct | 2 +- config/equirectangular_gui.json | 12 ++++++------ config/fullscreen1080.json | 14 +++++++------- config/gui_projector.json | 18 +++++++++--------- config/single.json | 14 +++++++------- config/single_fisheye.json | 4 ++-- config/single_fisheye_gui.json | 14 +++++++------- config/single_gui.json | 24 ++++++++++++------------ config/single_sbs_stereo.json | 14 +++++++------- config/single_two_win.json | 16 ++++++++-------- config/spherical_mirror.json | 4 ++-- config/spherical_mirror_gui.json | 14 +++++++------- config/spout_output.json | 6 +++--- config/two_nodes.json | 16 ++++++++-------- 14 files changed, 86 insertions(+), 86 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index aba49a1f3d..4c1474c4c2 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit aba49a1f3d2917f4e3427723272098741f1719f0 +Subproject commit 4c1474c4c209676d94dee29778009bbf86ebf239 diff --git a/config/equirectangular_gui.json b/config/equirectangular_gui.json index 3a605c26f2..7157768ade 100644 --- a/config/equirectangular_gui.json +++ b/config/equirectangular_gui.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -15,7 +15,7 @@ { "name": "OpenSpace", "fullscreen": false, - "draw2D": false, + "draw2d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1280, "y": 720 }, @@ -35,7 +35,7 @@ "name": "GUI", "tags": [ "GUI" ], "fullscreen": false, - "draw3D": false, + "draw3d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1280, "y": 720 }, @@ -51,7 +51,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/fullscreen1080.json b/config/fullscreen1080.json index b4c10b45cb..9c8e7b54c9 100644 --- a/config/fullscreen1080.json +++ b/config/fullscreen1080.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -27,10 +27,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -40,7 +40,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/gui_projector.json b/config/gui_projector.json index 92eb74ca04..e9b0add218 100644 --- a/config/gui_projector.json +++ b/config/gui_projector.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -16,7 +16,7 @@ "fullscreen": true, "monitor": 1, "name": "OpenSpace", - "draw2D": false, + "draw2d": false, "stereo": "none", "pos": { "x": 0, "y": 0 }, "size": { "x": 1920, "y": 1080 }, @@ -28,10 +28,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -41,7 +41,7 @@ "border": false, "name": "GUI", "tags": [ "GUI" ], - "draw3D": false, + "draw3d": false, "stereo": "none", "pos": { "x": 0, "y": 0 }, "size": { "x": 1920, "y": 1080 }, @@ -57,7 +57,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single.json b/config/single.json index d2ddb5103f..dedac0aaf8 100644 --- a/config/single.json +++ b/config/single.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -26,10 +26,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -39,7 +39,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single_fisheye.json b/config/single_fisheye.json index 9e3ed6423b..d997f1c0fe 100644 --- a/config/single_fisheye.json +++ b/config/single_fisheye.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "localhost", + "masteraddress": "localhost", "nodes": [ { "address": "localhost", @@ -30,7 +30,7 @@ ], "users": [ { - "eyeSeparation": 0.06, + "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single_fisheye_gui.json b/config/single_fisheye_gui.json index 291bdddc33..f66bcca54e 100644 --- a/config/single_fisheye_gui.json +++ b/config/single_fisheye_gui.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "localhost", + "masteraddress": "localhost", "nodes": [ { "address": "localhost", @@ -9,7 +9,7 @@ { "name": "OpenSpace", "fullscreen": false, - "draw2D": false, + "draw2d": false, "stereo": "none", "size": { "x": 1024, "y": 1024 }, "viewports": [ @@ -30,7 +30,7 @@ "name": "GUI", "tags": [ "GUI" ], "fullscreen": false, - "draw3D": false, + "draw3d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1024, "y": 1024 }, @@ -41,10 +41,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -54,7 +54,7 @@ ], "users": [ { - "eyeSeparation": 0.06, + "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single_gui.json b/config/single_gui.json index 269ecd571c..c1d988a2a4 100644 --- a/config/single_gui.json +++ b/config/single_gui.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -15,7 +15,7 @@ { "name": "OpenSpace", "fullscreen": false, - "draw2D": false, + "draw2d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1280, "y": 720 }, @@ -27,10 +27,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -39,7 +39,7 @@ "name": "GUI", "tags": [ "GUI" ], "fullscreen": false, - "draw3D": false, + "draw3d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1280, "y": 720 }, @@ -50,10 +50,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -63,7 +63,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single_sbs_stereo.json b/config/single_sbs_stereo.json index 24edc5033f..597337eb94 100644 --- a/config/single_sbs_stereo.json +++ b/config/single_sbs_stereo.json @@ -1,10 +1,10 @@ { "version": 1, - "masterAddress": "localhost", - "externalControlPort": 20500, + "masteraddress": "localhost", + "externalcontrolport": 20500, "settings": { "display": { - "swapInterval": 0 + "swapinterval": 0 } }, "nodes": [ @@ -26,10 +26,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -39,7 +39,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/single_two_win.json b/config/single_two_win.json index 8f3017271c..d944e93ef3 100644 --- a/config/single_two_win.json +++ b/config/single_two_win.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "127.0.0.1", + "masteraddress": "127.0.0.1", "nodes": [ { "address": "127.0.0.1", @@ -19,10 +19,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -39,10 +39,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -52,7 +52,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 4.0 } } ] diff --git a/config/spherical_mirror.json b/config/spherical_mirror.json index b618a36165..a43a0af9e2 100644 --- a/config/spherical_mirror.json +++ b/config/spherical_mirror.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "127.0.0.1", + "masteraddress": "127.0.0.1", "nodes": [ { "address": "127.0.0.1", @@ -33,7 +33,7 @@ ], "users": [ { - "eyeSeparation": 0.06, + "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/spherical_mirror_gui.json b/config/spherical_mirror_gui.json index 36828b0333..c593bf2f0f 100644 --- a/config/spherical_mirror_gui.json +++ b/config/spherical_mirror_gui.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "127.0.0.1", + "masteraddress": "127.0.0.1", "nodes": [ { "address": "127.0.0.1", @@ -10,7 +10,7 @@ "fullscreen": false, "name": "Spherical Projection", "stereo": "none", - "draw2D": false, + "draw2d": false, "pos": { "x": 0, "y": 100 }, "size": { "x": 1280, "y": 720 }, "res": { "x": 2048, "y": 2048 }, @@ -33,7 +33,7 @@ "fullscreen": false, "name": "GUI", "tags": [ "GUI" ], - "draw3D": false, + "draw3d": false, "stereo": "none", "pos": { "x": 50, "y": 50 }, "size": { "x": 1280, "y": 720 }, @@ -45,10 +45,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -58,7 +58,7 @@ ], "users": [ { - "eyeSeparation": 0.06, + "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/spout_output.json b/config/spout_output.json index 03352217ab..82e2114da1 100644 --- a/config/spout_output.json +++ b/config/spout_output.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "localhost", + "masteraddress": "localhost", "nodes": [ { "address": "localhost", @@ -18,7 +18,7 @@ "projection": { "type": "SpoutOutputProjection", "quality": "1k", - "mappingSpoutName": "OpenSpace", + "mappingspoutname": "OpenSpace", "background": { "r": 0.1, "g": 0.1, "b": 0.1, "a": 1.0 } } } @@ -29,7 +29,7 @@ ], "users": [ { - "eyeSeparation": 0.06, + "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } ] diff --git a/config/two_nodes.json b/config/two_nodes.json index fc3051cc09..a7d65cd0fb 100644 --- a/config/two_nodes.json +++ b/config/two_nodes.json @@ -1,6 +1,6 @@ { "version": 1, - "masterAddress": "127.0.0.1", + "masteraddress": "127.0.0.1", "nodes": [ { "address": "127.0.0.1", @@ -18,10 +18,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -44,10 +44,10 @@ "projection": { "type": "PlanarProjection", "fov": { - "hFov": 80.0, - "vFov": 50.534015846724 + "hfov": 80.0, + "vfov": 50.534015846724 }, - "orientation": { "heading": 0.0, "pitch": 0.0, "roll": 0.0 } + "orientation": { "yaw": 0.0, "pitch": 0.0, "roll": 0.0 } } } ] @@ -57,7 +57,7 @@ ], "users": [ { - "eyeSeparation": 0.065, + "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 4.0 } } ]