Commit Graph

86 Commits

Author SHA1 Message Date
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
Alexander Bock
a2cad36772 Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
	data/scene/default.scene
	scripts/bind_keys.lua
2016-06-01 19:46:23 +02:00
Alexander Bock
46107e9492 Add anti-aliasing to stereo configuration file 2016-05-31 18:25:34 +02:00
Michael Nilsson
8ca457b14c solve merge conflict with develop 2016-05-20 09:33:41 -04:00
Alexander Bock
8a5b087d12 Remove frame limitation on single.xml 2016-05-17 19:26:11 +02:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Alexander Bock
13eb07c87c Set correct window name in Single and fisheye configuration files 2016-05-01 13:39:26 +02:00
Alexander Bock
3fbff9c0a3 Remove unused files 2016-05-01 13:14:19 +02:00
Michael Nilsson
f4964b1628 request file extension 2016-04-01 16:32:18 -04:00
Emil Axelsson
c87eb5dd26 - increase fisheye resolution
- set correct aspect ratio of planar projection
2016-02-09 11:48:32 +01:00
Alexander Bock
312d52c038 Minor changes 2016-02-07 14:05:59 +01:00
Alexander Bock
71f7a1958b Change single.xml to use PlanarProjection and (0,0,0) user pos instead
Remove computed detection of view direction
2016-02-07 14:05:44 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
c644f5adcb Updated ghoul version
Place window in default configuration file in the top left
2015-10-27 14:10:21 -05:00
Alexander Bock
410e0137eb Updated single_fisheye configuration file to use new SGCT format
Correctly set clear color for nonlinear projections
2015-10-05 00:36:09 +02:00
Alexander Bock
8f5ba101e4 Remove stereo setting from single.xml
Create TimelineView in a bundle on Mac
2015-05-14 12:15:51 +02:00
Michal Marcinkowski
0a1c0164ef Fixes to trails, fov and adding some keybindings 2015-05-04 20:15:34 -04:00
Alexander Bock
6a6114ab84 Fix single side-by-side stereo configuration file
Add __CONTEXT__ lines to last shader files
2015-04-07 00:08:53 +02:00