From c26fe4b2792397eb4286a49b941eeb8212b49840 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 8 Jul 2017 16:06:45 -0400 Subject: [PATCH] Move SGCT config files into main config folder and remove unused transferfunctions --- config/{sgct => }/openvr_htcVive.xml | 46 ++--- config/{sgct => }/openvr_oculusRiftCv1.xml | 46 ++--- config/{sgct => }/single.xml | 48 +++--- config/{sgct => }/single_fisheye.xml | 74 ++++---- config/{sgct => }/single_gui.xml | 74 ++++---- config/{sgct => }/single_two_win.xml | 62 +++---- config/transferfunctions/blue.txt | 8 - config/transferfunctions/fire.txt | 15 -- config/transferfunctions/ml.txt | 8 - config/transferfunctions/plain.txt | 5 - config/transferfunctions/test.txt | 14 -- config/{sgct => }/two_nodes.xml | 70 ++++---- ext/ghoul | 2 +- openspace.cfg | 191 ++++++++++----------- 14 files changed, 306 insertions(+), 357 deletions(-) rename config/{sgct => }/openvr_htcVive.xml (97%) rename config/{sgct => }/openvr_oculusRiftCv1.xml (97%) rename config/{sgct => }/single.xml (97%) rename config/{sgct => }/single_fisheye.xml (97%) rename config/{sgct => }/single_gui.xml (97%) rename config/{sgct => }/single_two_win.xml (97%) delete mode 100644 config/transferfunctions/blue.txt delete mode 100644 config/transferfunctions/fire.txt delete mode 100644 config/transferfunctions/ml.txt delete mode 100644 config/transferfunctions/plain.txt delete mode 100644 config/transferfunctions/test.txt rename config/{sgct => }/two_nodes.xml (97%) diff --git a/config/sgct/openvr_htcVive.xml b/config/openvr_htcVive.xml similarity index 97% rename from config/sgct/openvr_htcVive.xml rename to config/openvr_htcVive.xml index e663b11521..b239d0283b 100644 --- a/config/sgct/openvr_htcVive.xml +++ b/config/openvr_htcVive.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sgct/openvr_oculusRiftCv1.xml b/config/openvr_oculusRiftCv1.xml similarity index 97% rename from config/sgct/openvr_oculusRiftCv1.xml rename to config/openvr_oculusRiftCv1.xml index e264dd3788..917991d559 100644 --- a/config/sgct/openvr_oculusRiftCv1.xml +++ b/config/openvr_oculusRiftCv1.xml @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sgct/single.xml b/config/single.xml similarity index 97% rename from config/sgct/single.xml rename to config/single.xml index 6f8f58b23b..ed397f50fe 100644 --- a/config/sgct/single.xml +++ b/config/single.xml @@ -1,24 +1,24 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sgct/single_fisheye.xml b/config/single_fisheye.xml similarity index 97% rename from config/sgct/single_fisheye.xml rename to config/single_fisheye.xml index b9bc7415dd..da491287e5 100644 --- a/config/sgct/single_fisheye.xml +++ b/config/single_fisheye.xml @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sgct/single_gui.xml b/config/single_gui.xml similarity index 97% rename from config/sgct/single_gui.xml rename to config/single_gui.xml index 129232a9ea..d17ab77c79 100644 --- a/config/sgct/single_gui.xml +++ b/config/single_gui.xml @@ -1,37 +1,37 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/sgct/single_two_win.xml b/config/single_two_win.xml similarity index 97% rename from config/sgct/single_two_win.xml rename to config/single_two_win.xml index 2f7f49efc6..3c20b3191e 100644 --- a/config/sgct/single_two_win.xml +++ b/config/single_two_win.xml @@ -1,32 +1,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/transferfunctions/blue.txt b/config/transferfunctions/blue.txt deleted file mode 100644 index eb6b9b98d5..0000000000 --- a/config/transferfunctions/blue.txt +++ /dev/null @@ -1,8 +0,0 @@ -width 1024 -lower 0.0 -upper 0.7 -mappingkey 0.001 0 0 1 1 -mappingkey 0.01 2 2 0 2 -mappingkey 0.2 50 50 25 50 -mappingkey 0.35 100 100 100 100 -mappingkey 0.51 200 200 100 200 diff --git a/config/transferfunctions/fire.txt b/config/transferfunctions/fire.txt deleted file mode 100644 index 1e67f2dac9..0000000000 --- a/config/transferfunctions/fire.txt +++ /dev/null @@ -1,15 +0,0 @@ -width 1024 -lower 0.0 -upper 0.99 -mappingkey 0.0035 1 1 1 1 -mappingkey 0.0045 3 0 0 1 -mappingkey 0.0060 3 0 0 2 -mappingkey 0.0100 4 1 0 3 -mappingkey 0.0200 6 2 0 3 -mappingkey 0.0300 8 3 0 3 -mappingkey 0.0350 10 4 0 4 -mappingkey 0.0400 12 6 0 5 -mappingkey 0.0800 14 10 0 5 -mappingkey 0.1000 16 12 0 5 -mappingkey 0.2000 50 50 10 10 -mappingkey 0.2500 200 200 200 200 diff --git a/config/transferfunctions/ml.txt b/config/transferfunctions/ml.txt deleted file mode 100644 index f3e0ff894c..0000000000 --- a/config/transferfunctions/ml.txt +++ /dev/null @@ -1,8 +0,0 @@ -width 1024 -lower 0.0 -upper 1.0 -mappingkey 0.0 0 0 0 0 -mappingkey 0.45 5 0 0 5 -mappingkey 0.5 0 100 0 100 -mappingkey 0.55 0 0 5 5 -mappingkey 0.99 0 0 0 0 diff --git a/config/transferfunctions/plain.txt b/config/transferfunctions/plain.txt deleted file mode 100644 index 3fef1c1c21..0000000000 --- a/config/transferfunctions/plain.txt +++ /dev/null @@ -1,5 +0,0 @@ -width 1024 -lower 0.0 -upper 1.0 -mappingkey 0.1 20 20 20 10 -mappingkey 0.9 20 20 20 10 diff --git a/config/transferfunctions/test.txt b/config/transferfunctions/test.txt deleted file mode 100644 index 3e4abfbbcc..0000000000 --- a/config/transferfunctions/test.txt +++ /dev/null @@ -1,14 +0,0 @@ -width 1024 -lower 0.0 -upper 0.5 -mappingkey 0.0035 1 1 1 1 -mappingkey 0.0045 3 0 0 1 -mappingkey 0.0060 3 0 0 2 -mappingkey 0.0100 4 1 0 3 -mappingkey 0.0200 6 2 0 3 -mappingkey 0.0300 8 3 0 3 -mappingkey 0.0400 12 6 0 5 -mappingkey 0.0800 14 10 0 5 -mappingkey 0.1000 16 12 0 5 -mappingkey 0.2000 50 50 10 10 -mappingkey 0.2500 200 200 200 200 diff --git a/config/sgct/two_nodes.xml b/config/two_nodes.xml similarity index 97% rename from config/sgct/two_nodes.xml rename to config/two_nodes.xml index b4ae20f8c0..941fb90cb8 100644 --- a/config/sgct/two_nodes.xml +++ b/config/two_nodes.xml @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ext/ghoul b/ext/ghoul index 5b75ba44ca..5244f74176 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 5b75ba44caec9ee798f7a3390dbdcb4870398886 +Subproject commit 5244f7417681128b60c34150f28c201ca6e6c024 diff --git a/openspace.cfg b/openspace.cfg index 79bb18dad3..526eaec369 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -1,96 +1,95 @@ --- The configuration has an implict --- require('scripts/configuration_helper.lua') --- which defines helper functions useful to customize the configuration - -return { - -- Determines which SGCT configuration file is loaded, that is, if there rendering - -- occurs in a single window, a fisheye projection, or a dome cluster system - - -- A regular 1280x720 window - SGCTConfig = sgct.config.single{}, - - -- A regular 1920x1080 window - -- SGCTConfig = sgct.config.single{1920, 1080}, - - -- A 1k fisheye rendering - -- SGCTConfig = sgct.config.fisheye{1024, 1024}, - - -- A 4k fisheye rendering in a 1024x1024 window - -- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27}, - - -- Streaming OpenSpace via Spout to OBS - -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"}, - - - --SGCTConfig = "${SGCT}/openvr_oculusRiftCv1.xml", - --SGCTConfig = "${SGCT}/openvr_htcVive.xml", - - -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description - -- of all entities that will be visible during an instance of OpenSpace - Scene = "${SCENE}/default.scene", - -- Scene = "${SCENE}/globebrowsing.scene", - -- Scene = "${SCENE}/rosetta.scene", - -- Scene = "${SCENE}/dawn.scene", - -- Scene = "${SCENE}/newhorizons.scene", - -- Scene = "${SCENE}/osirisrex.scene", - - Task = "${TASKS}/default.task", - - Paths = { - SGCT = "${BASE_PATH}/config/sgct", - SCRIPTS = "${BASE_PATH}/scripts", - SHADERS = "${BASE_PATH}/shaders", - OPENSPACE_DATA = "${BASE_PATH}/data", - SCENE = "${OPENSPACE_DATA}/scene", - TASKS = "${OPENSPACE_DATA}/tasks", - SPICE = "${OPENSPACE_DATA}/spice", - MODULES = "${BASE_PATH}/modules", - TESTDIR = "${BASE_PATH}/tests", - CONFIG = "${BASE_PATH}/config", - CACHE = "${BASE_PATH}/cache", - FONTS = "${OPENSPACE_DATA}/fonts", - DOCUMENTATION = "${BASE_PATH}/documentation" - }, - Fonts = { - Mono = "${FONTS}/Droid_Sans_Mono/DroidSansMono.ttf", - Light = "${FONTS}/Roboto/Roboto-Regular.ttf", - Console = "${FONTS}/Inconsolata/Inconsolata-Regular.ttf" - }, - Logging = { - -- LogLevel = "Trace", - LogLevel = "Debug", - ImmediateFlush = true, - Logs = { - { Type = "html", File = "${BASE_PATH}/log.html", Append = false } - }, - CapabilitiesVerbosity = "Full" - }, - Launcher = { - LogLevel = "None" - }, - LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html", - PropertyDocumentation = "${DOCUMENTATION}/Properties.html", - ScriptLog = "${BASE_PATH}/ScriptLog.txt", - KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html", - Documentation = "${DOCUMENTATION}/Documentation.html", - FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html", - - ShutdownCountdown = 3, - -- OnScreenTextScaling = "framebuffer", - -- PerSceneCache = true, - -- DisableRenderingOnMaster = true, - -- DisableSceneOnMaster = true, - DownloadRequestURL = "http://data.openspaceproject.com/request.cgi", - RenderingMethod = "Framebuffer", - OpenGLDebugContext = { - Activate = true, - FilterIdentifier = { - { Type = "Other", Source = "API", Identifier = 131185 }, - { Type = "Performance", Source = "API", Identifier = 131186 }, --Buffer performance warning: "copied/moved from VIDEO memory to HOST memory" - { Type = "Deprecated", Source = "API", Identifier = 7} -- API_ID_LINE_WIDTH deprecated behavior warning has been generated - }, --- FilterSeverity = { } - - } - --RenderingMethod = "ABuffer" -- alternative: "Framebuffer" -} +-- The configuration has an implict +-- require('scripts/configuration_helper.lua') +-- which defines helper functions useful to customize the configuration + +return { + -- Determines which SGCT configuration file is loaded, that is, if there rendering + -- occurs in a single window, a fisheye projection, or a dome cluster system + + -- A regular 1280x720 window + SGCTConfig = sgct.config.single{}, + + -- A regular 1920x1080 window + -- SGCTConfig = sgct.config.single{1920, 1080}, + + -- A 1k fisheye rendering + -- SGCTConfig = sgct.config.fisheye{1024, 1024}, + + -- A 4k fisheye rendering in a 1024x1024 window + -- SGCTConfig = sgct.config.fisheye{1024, 1024, res={4096, 4096}, quality="2k", tilt=27}, + + -- Streaming OpenSpace via Spout to OBS + -- SGCTConfig = sgct.config.single{2560, 1440, shared=true, name="WV_OBS_SPOUT1"}, + + + --SGCTConfig = "${CONFIG}/openvr_oculusRiftCv1.xml", + --SGCTConfig = "${CONFIG}/openvr_htcVive.xml", + + -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description + -- of all entities that will be visible during an instance of OpenSpace + Scene = "${SCENE}/default.scene", + -- Scene = "${SCENE}/globebrowsing.scene", + -- Scene = "${SCENE}/rosetta.scene", + -- Scene = "${SCENE}/dawn.scene", + -- Scene = "${SCENE}/newhorizons.scene", + -- Scene = "${SCENE}/osirisrex.scene", + + Task = "${TASKS}/default.task", + + Paths = { + SCRIPTS = "${BASE_PATH}/scripts", + SHADERS = "${BASE_PATH}/shaders", + OPENSPACE_DATA = "${BASE_PATH}/data", + SCENE = "${OPENSPACE_DATA}/scene", + TASKS = "${OPENSPACE_DATA}/tasks", + SPICE = "${OPENSPACE_DATA}/spice", + MODULES = "${BASE_PATH}/modules", + TESTDIR = "${BASE_PATH}/tests", + CONFIG = "${BASE_PATH}/config", + CACHE = "${BASE_PATH}/cache", + FONTS = "${OPENSPACE_DATA}/fonts", + DOCUMENTATION = "${BASE_PATH}/documentation" + }, + Fonts = { + Mono = "${FONTS}/Droid_Sans_Mono/DroidSansMono.ttf", + Light = "${FONTS}/Roboto/Roboto-Regular.ttf", + Console = "${FONTS}/Inconsolata/Inconsolata-Regular.ttf" + }, + Logging = { + -- LogLevel = "Trace", + LogLevel = "Debug", + ImmediateFlush = true, + Logs = { + { Type = "html", File = "${BASE_PATH}/log.html", Append = false } + }, + CapabilitiesVerbosity = "Full" + }, + Launcher = { + LogLevel = "None" + }, + LuaDocumentation = "${DOCUMENTATION}/LuaScripting.html", + PropertyDocumentation = "${DOCUMENTATION}/Properties.html", + ScriptLog = "${BASE_PATH}/ScriptLog.txt", + KeyboardShortcuts = "${DOCUMENTATION}/KeyboardMapping.html", + Documentation = "${DOCUMENTATION}/Documentation.html", + FactoryDocumentation = "${DOCUMENTATION}/FactoryDocumentation.html", + + ShutdownCountdown = 3, + -- OnScreenTextScaling = "framebuffer", + -- PerSceneCache = true, + -- DisableRenderingOnMaster = true, + -- DisableSceneOnMaster = true, + DownloadRequestURL = "http://data.openspaceproject.com/request.cgi", + RenderingMethod = "Framebuffer", + OpenGLDebugContext = { + Activate = true, + FilterIdentifier = { + { Type = "Other", Source = "API", Identifier = 131185 }, + { Type = "Performance", Source = "API", Identifier = 131186 }, --Buffer performance warning: "copied/moved from VIDEO memory to HOST memory" + { Type = "Deprecated", Source = "API", Identifier = 7} -- API_ID_LINE_WIDTH deprecated behavior warning has been generated + }, +-- FilterSeverity = { } + + } + --RenderingMethod = "ABuffer" -- alternative: "Framebuffer" +}