diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index e7859b22cf..19e7e21435 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit e7859b22cf11f7b7be16ebab5e6c44ec8637c540 +Subproject commit 19e7e21435fe4df71eb89d53599b46b68758273d diff --git a/config/equirectangular_gui.json b/config/equirectangular_gui.json index fe744ef269..7d3d2dc303 100644 --- a/config/equirectangular_gui.json +++ b/config/equirectangular_gui.json @@ -54,5 +54,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1280x720 window with equirectangular projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/fullscreen1080.json b/config/fullscreen1080.json index 59ef891571..6b8afbcd3e 100644 --- a/config/fullscreen1080.json +++ b/config/fullscreen1080.json @@ -43,5 +43,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1920x1080 fullscreen window with planar projection rendering. The display will automatically be set to 1920x1080, regardless of native resolution.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/gui_projector.json b/config/gui_projector.json index 155af25705..c4affe89fd 100644 --- a/config/gui_projector.json +++ b/config/gui_projector.json @@ -59,5 +59,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows for a side-by-side dual-monitor configuration, where the right-side monitor can be considered a projector. Primary 1920x1080 window with menu and text overlays minus rendering, and a secondary 1920x1080 fullscreen window with planar projection rendering without menu or text overlays.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single.json b/config/single.json index 925ab5df8f..38004b58c5 100644 --- a/config/single.json +++ b/config/single.json @@ -43,5 +43,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1280x720 window with planar projection rendering at 2560x1440 resolution.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_fisheye.json b/config/single_fisheye.json index adfacbe680..1309a8e623 100644 --- a/config/single_fisheye.json +++ b/config/single_fisheye.json @@ -33,5 +33,12 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1024x1024 window with fisheye projection rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_fisheye_gui.json b/config/single_fisheye_gui.json index 1d1ca3a909..ef67552cbd 100644 --- a/config/single_fisheye_gui.json +++ b/config/single_fisheye_gui.json @@ -57,5 +57,13 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1024x1024 window with menu and text overlays minus rendering, and a secondary 1024x1024 window with fisheye projection rendering without menu and text overlays.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } + } diff --git a/config/single_gui.json b/config/single_gui.json index 0483f62baa..6d67ed64f9 100644 --- a/config/single_gui.json +++ b/config/single_gui.json @@ -66,5 +66,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_gui_spout.json b/config/single_gui_spout.json index 7f95acd344..5f54282976 100644 --- a/config/single_gui_spout.json +++ b/config/single_gui_spout.json @@ -63,5 +63,12 @@ "eyeseparation": 0.06499999761581421, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1280x720 window with Spout output (name 'OpenSpace') planar projection rendering without menu or text overlays, and a secondary with menu and text overlays minus rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_gui_with_graphics.json b/config/single_gui_with_graphics.json index c866040411..31d1b630ab 100644 --- a/config/single_gui_with_graphics.json +++ b/config/single_gui_with_graphics.json @@ -67,5 +67,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1280x720 window with planar projection rendering without menu or text overlays, and a secondary with menu and text overlays plus rendering from the primary.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_sbs_stereo.json b/config/single_sbs_stereo.json index 2c0019f083..e1fa34337b 100644 --- a/config/single_sbs_stereo.json +++ b/config/single_sbs_stereo.json @@ -42,5 +42,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1280x720 window containing side-by-side stereo planar projection rendering views.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/single_two_win.json b/config/single_two_win.json index 9e88325d39..6d35594ef0 100644 --- a/config/single_two_win.json +++ b/config/single_two_win.json @@ -55,5 +55,13 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two 1280x720 windows each with identical planar projection rendering. Only the primary window has menu controls, but both have text overlays.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } + } diff --git a/config/spherical_mirror.json b/config/spherical_mirror.json index f8f1e5669c..a422b34d35 100644 --- a/config/spherical_mirror.json +++ b/config/spherical_mirror.json @@ -36,5 +36,12 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1280x720 window with spherical projection rendering at 2048x2048 resolution.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/spherical_mirror_gui.json b/config/spherical_mirror_gui.json index 5fbd9baf4e..e96ba89936 100644 --- a/config/spherical_mirror_gui.json +++ b/config/spherical_mirror_gui.json @@ -61,5 +61,12 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two windows: Primary 1280x720 window with menu and text overlays minus rendering, and a secondary 1280x720 window at 2048x2048 resolution with spherical mirror projection rendering without the menu or text overlays.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/spout_output_cubemap.json b/config/spout_output_cubemap.json index 064f48ecfc..a8c2621064 100644 --- a/config/spout_output_cubemap.json +++ b/config/spout_output_cubemap.json @@ -56,5 +56,12 @@ "eyeseparation": 0.05999999865889549, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1024x1024 window with spout output cubemap projection rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/spout_output_equirectangular.json b/config/spout_output_equirectangular.json index 87a3bd98c2..39de1154a2 100644 --- a/config/spout_output_equirectangular.json +++ b/config/spout_output_equirectangular.json @@ -56,5 +56,12 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1024x1024 window with spout output equirectangular projection rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/spout_output_fisheye.json b/config/spout_output_fisheye.json index cd1b2a490e..f95628bd50 100644 --- a/config/spout_output_fisheye.json +++ b/config/spout_output_fisheye.json @@ -56,5 +56,12 @@ "eyeseparation": 0.06, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1024x1024 window with spout output fisheye projection rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/spout_output_flat.json b/config/spout_output_flat.json index 585a0830e7..c7c8ff2d06 100644 --- a/config/spout_output_flat.json +++ b/config/spout_output_flat.json @@ -55,5 +55,12 @@ "eyeseparation": 0.05999999865889549, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "A single 1024x1024 window with spout output planar/flat projection rendering at 1920x1080 resolution.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } } diff --git a/config/two_nodes.json b/config/two_nodes.json index 621bfbbeb0..9bb4f8cf13 100644 --- a/config/two_nodes.json +++ b/config/two_nodes.json @@ -60,5 +60,12 @@ "eyeseparation": 0.065, "pos": { "x": 0.0, "y": 0.0, "z": 0.0 } } - ] + ], + "meta": { + "author": "OpenSpace Team", + "description": "Two individual nodes, each with a 1280x720 window with planar projection rendering.", + "license": "MIT License", + "name": "Single", + "version": "1.0" + } }