Commit Graph

103 Commits

Author SHA1 Message Date
Gene Payne
cec6e05ff1 Allow Window Config GUI to Edit Files (#2574)
* Added pboettch/json-schema-validator submodule

* Added initial code for selecting window config to edit

* Use updated sgct submodule with json-validate

* Bump sgct submodule version reference

* Bump sgct submodule version reference

* Version checking of sgct window config in progress

* Json schema validator submodule is now in sgct

* Added support for read-only window configs, and additional changes

* More changes with opening config in window edit, plus schema files added

* Update sgct schema version with more defs to work with sgctedit schema

* Fixes to get sgct edit schema working with dialog for error messages

* Improvements in exception handling

* Improved handling of multiple sgct & json exception types

* Minor improvements in exception messages

* Extra spaces in error message output

* Fixing importing of json config data from launcher to sgctedit

* Fixed window size & position update

* Changes for preserving settings in edit vs new mode

* Changes to import settings from config file

* More changes for importing testing of config file based on file tests

* Fixed window placement dims in monitor, and some code refactoring

* Move json validation before initial read

* Add CMake copy of sgct schema file to OpenSpace post-build

* Bump sgct submodule reference

* Modify calls for json schema validation and bump to latest sgct

* Bump to new sgct repo with unit testing and updated schema

* Added first test for window config editor schema

* Finished tests for sgcteditor validation

* Code cleanup pass

* Fix of sgctedit test for remove description

* CMake and include config changes to fix build after merge

* Bump sgct submodule version

* Improve paths in sgctedit test

* Bump sgct reference for test path fix

* Check for imported monitor number being in valid range

* Make sgct config 'monitor' key/value optional

* Have 'save' or 'save as' buttons depending on edit or new modes

* Code review feedback changes

* Fix to include the last file in the user config dir list

* Addressing some PR request

* Change to pass-by-reference in editRefusalDialog

* Separating errors into summary and detailed messages in error dialog

* Disable edit button with hover text if config read shows invalid format

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-04-14 18:28:31 -06:00
Alexander Bock
3f35fa992a Fix spout_output_flat 2023-03-11 16:28:29 +01:00
Gene Payne
7ed1e33fc8 Improve behavior for gui window and separate render window (#2515)
* Improve behavior for gui window and separate render window

* Code review fix for using size_t in windows indexing
2023-03-06 16:00:48 -07:00
Alexander Bock
a711591c09 Update Doxygen (#2537)
* Modernizing Doxygen
* Remove warnings for Doxygen
2023-03-06 23:41:24 +01:00
Alexander Bock
a94ef12cc1 Add new configuration file that also adds graphics to the UI window (closes #2530) 2023-02-27 17:46:15 +01:00
Micah
c48c06926f update config files with legacy user position 2022-07-26 11:14:20 -04:00
Micah Acinapura
82214224a1 Swapped order of rendering/gui windows for config files, allowing gui resize (#2087) 2022-05-06 13:32:58 -04:00
Alexander Bock
6a708b1f18 Implement new Spout input methods to Tileproviders and new Renderables (#1901)
* Implement new Spout input methods to Tileproviders and new Renderables

Co-authored-by: Marco Silva <marco@elumenati.com>
2022-03-03 23:47:09 +01:00
Alexander Bock
5050b27d09 Address PR comments 2022-01-25 12:08:24 +01:00
Alexander Bock
2fb7a9eca2 Update SGCT repository, change configuration files accordingly 2022-01-21 16:36:13 +01:00
Emma Broman
01c19f9842 Remove broken/irrelevant configs 2022-01-17 14:12:26 +01:00
Alexander Bock
73a43041fd Convert XML to JSON files 2021-12-18 00:44:35 +04:00
Micah
4493726aae update sbs stereo config 2021-07-08 07:46:48 -04:00
Micah Acinapura
04ab698120 config file fixes 2021-07-05 14:47:04 -04:00
Micah Acinapura
c5c5793da4 adding equirectangular_gui config 2021-05-31 22:07:52 -04:00
Micah Acinapura
73c0bc1d9c Update gui_projector.xml
update capitalization on fullscreen in config
2021-04-12 10:44:11 -04:00
Micah Acinapura
9ef11c4c0d Update spherical_mirror.xml
fixing path for mesh
2021-04-06 10:44:18 -04:00
Alexander Bock
f138708fd9 Update SGCT to not require the specification of projection planes if 3D rendering in not required
Remove comments as it is the preferred way of handling the web gui
2020-06-23 15:18:25 +02:00
Micah Acinapura
386e7d9312 fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes 2020-06-22 10:23:04 -04:00
Alexander Bock
606fa74817 Adapt configuration files and fix old SGCT style in them 2020-04-14 10:47:59 +02:00
Micah Acinapura
1b4e32d8f2 cleanup of ringshader; fix singlefisheyegui 2020-01-31 10:28:37 -05:00
eriksunden
e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +01:00
Micah Acinapura
a84ef147cb fix for gui projector config 2019-09-27 10:23:58 -04:00
Micah Acinapura
17233cfa2a updated config files to remove msaa sampling; added new configs; 2019-09-14 21:02:39 -04:00
Micah Acinapura
6c84170a59 readded globebrowsing cusomization asset;temp disabled fxaa on mac; temp not unsetting directories on deinit of webgui; added single_fisheye_gui.xml; 2019-08-23 13:47:27 -04:00
Micah Acinapura
339af98d3a Updated number of samples for configs to make gui work on macs (#900)
Closes #894
2019-06-04 02:22:44 -06:00
Micah Acinapura
1308317b87 added viewport tracking to configs (#895)
* Added viewport tracking to configs; updated fov to match default window. cleanup of openspace.cfg
* Update SGCT
2019-06-03 03:27:51 -06:00
Emil Axelsson
53e07d90e1 Feature/documentation topic (#822)
- Implement documentation topic that can be used to query documentation using the network API.
- Implement a way to pass arguments to lua scripts using json (rather than formatting entire lua string clientside)
- Implement ability to attach callback to lua script executions
- Implement abillity to transport return values from lua scripts back to network API clients.
- Do not initialize server interface on slave nodes.
- Implement Dictionary -> json converter using nlohmann json library
2019-04-03 10:30:28 +02:00
Micah Acinapura
a1a1ee71db added res tag for gui window in spherical config 2019-02-04 17:35:56 -05:00
Alexander Bock
d7cb847dda Add spherical mirror configuration file with GUI window 2018-09-09 11:31:22 -04:00
Alexander Bock
389290d657 Update SGCT repository
Set dashboard framerate default to average framerate
Change Spout_output cube resolution to 1536 (1.5k)
2018-01-01 15:02:10 -05:00
Alexander Bock
2c4bcc7f7c Add code for disabling vSync to spout_output.xml file 2018-01-01 13:19:22 -05:00
Alexander Bock
4d58a2ae98 Render On-Screne Dashboard also for non-linear projections 2018-01-01 13:17:32 -05:00
Alexander Bock
da41ca0582 Update Spout Output to create a separate window for GUI control 2018-01-01 11:37:43 -05:00
Alexander Bock
db668b5342 Some changes to PR #432 2017-12-18 16:25:02 -05:00
Jonathas Costa
089cfe727f Improved ATM perfomance (still working on it). Debugging billboards alingment (in progress). 2017-11-03 17:10:03 -04:00
Alexander Bock
3ea8f0e129 Add constellation files to GitIgnore
Add spherical mirror configuration file
Add the Spout output configration file
2017-10-31 08:12:27 -04:00
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Alexander Bock
c26fe4b279 Move SGCT config files into main config folder and remove unused transferfunctions 2017-07-08 16:06:45 -04:00
Emil Axelsson
755d984667 Fix malformed sgct config 2017-04-25 15:16:54 +02:00
Alexander Bock
8910aac834 - Replace window name check with tag check for GUI code (closing #258)
- Only show GUI, console, and screenlog on the GUI window
2017-02-28 20:38:58 -05:00
eriksunden
87f5654bf8 Feature/openvr (#180)
* Updated SGCT to latest commit, to include OpenVR convenience functions.

* Made OpenSpace application support OpenVR. Check CMake option "OPENSPACE_OPENVR_SUPPORT" to enable this functionality.

* Merged latest SGCT to remove ogl_header dependency in SGCTOpenVR header

* Merged latest SGCT with minor Mac gl/glew include fix for including SGCTOpenVR as it relies on inclusion of gl headers.

* CMake fix in OpenSpace app for resetting variables after unchecking OPENVR_SUPPORT.

* Created separate SGCT config files for Oculus Rift and HTC Vive HMD

* Update Ghoul to enable experimental GLM features

* Update SGCT repository

* Updated to latest SGCT version for latest fixes.
2017-02-24 20:41:40 -05:00
Alexander Bock
85c3de9152 Feature/modular sgct config (#239)
* Initial work to create SGCT configuration files from Lua

* More work on modularizing the SGCT configs
 - Removing almost all pregenerated config files
 - Working functions to create configurations with single and fisheye
   rendering viewports

* Some more work on modular SGCT configurations
  - Make more objects configurable
  - Add documentation
  - Make use of new `sgct.config.single` and `sgct.config.fisheye` functions

* Fix accidental commit

* Enable single configuration as default

* Do not remove single_fisheye.xml for inspiration

* Update single_fisheye.xml

* Update configuration_helper.lua

* Place multiview and multinode configuration files back
2017-02-22 15:35:55 -05:00
Alexander Bock
f909c32dde Add single_4k.xml configuration file for high resolution screenshots 2016-09-07 16:31:52 +02:00
Alexander Bock
abb40e24b6 Space cleanup 2016-08-30 11:06:58 +02:00
Alexander Bock
6e9d299dda Update Ghoul repository
Adapt to Ghoul changes in function names
2016-07-07 13:49:36 +02:00
Alexander Bock
a25eb0f690 Clean up single.xml
Update Ghoul repository
2016-06-27 15:01:43 +02:00
Alexander Bock
438e34b272 Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup 2016-06-27 02:11:49 +02:00
Alexander Bock
c913979d6f Add Resolution tag to the single file, enforcing a smaller framebuffer resolution on Mac systems 2016-06-22 10:00:27 +02:00
Michael Nilsson
6573a6dfce add heroku baseurl and key bindings 2016-06-15 11:07:20 -04:00