mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Some more cleanup for configuration_helper script

Browse Source
This commit is contained in:
Alexander Bock
2021-12-20 22:42:32 +01:00
parent af1e5c8cf8
commit 6ddf62f2ab
2 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: d67a9bad53...21f5e8b123

35
scripts/configuration_helper.lua
View File

@@ -310,11 +310,11 @@ end
function check(type_string, arg, param, subparam_type)
function check(type_str, arg, param, subparam_type)
local t = type(arg[param])
assert(t == type_string or t == "nil", param .. " must be a " .. type_string .. " or nil")
assert(t == type_str or t == "nil", param .. " must be a " .. type_str .. " or nil")
if type_string == "table" and subparam_type and arg[param] then
if type_str == "table" and subparam_type and arg[param] then
for k, v in pairs(arg[param]) do
assert(
type(v == subparam_type),
@@ -368,8 +368,6 @@ function normalizeArg(arg)
arg[1] = nil
arg[2] = nil
end
return arg
end
@@ -385,7 +383,7 @@ end
function sgct.config.single(arg)
arg = normalizeArg(arg)
normalizeArg(arg)
check("table", arg, "size", "number")
check("table", arg, "fov", "number")
@@ -422,24 +420,20 @@ function sgct.config.single(arg)
arg["tracked"] = arg["tracked"] or true
local viewport = generateSingleViewportFOV(
arg["fov"]["down"],
arg["fov"]["up"],
arg["fov"]["left"],
arg["fov"]["right"],
arg["tracked"]
)
local viewport = generateSingleViewportFOV(arg["fov"]["down"], arg["fov"]["up"],
arg["fov"]["left"], arg["fov"]["right"], arg["tracked"])
return sgct.makeConfig(generateSingleWindowConfig(arg, viewport))
end
function sgct.config.fisheye(arg)
arg = normalizeArg(arg)
normalizeArg(arg)
check("number", arg, "fov")
check("string", arg, "quality")
check("number", arg, "tilt")
check("string", arg, "quality")
check("table", arg, "background", "number")
check("table", arg, "crop", "number")
check("table", arg, "offset", "number")
@@ -456,15 +450,8 @@ function sgct.config.fisheye(arg)
arg["background"] = arg["background"] or { r = 0.0, g = 0.0, b = 0.0, a = 1.0 }
arg["tracked"] = arg["tracked"] or false
local viewport = generateFisheyeViewport(
arg["fov"],
arg["quality"],
arg["tilt"],
arg["background"],
arg["crop"],
arg["offset"],
arg["tracked"]
)
local viewport = generateFisheyeViewport(arg["fov"], arg["quality"], arg["tilt"],
arg["background"], arg["crop"], arg["offset"], arg["tracked"])
return sgct.makeConfig(generateSingleWindowConfig(arg, viewport))
end