Commit Graph

290 Commits

Author SHA1 Message Date
Emil Axelsson
c3cc53f08d Make it possible to rescale web gui 2019-01-19 19:16:56 -05:00
Emil Axelsson
0c6b5e95c6 Introduce ability to configure ports etc for external applications. (#785)
Introduce ability to configure ports etc for external applications, including webgui
2019-01-04 10:23:28 +01:00
Emil Axelsson
0d2935c43b Feature/gaia mission merge (#766)
* Add Adam Aslegård's module that renders Gaia mission stars
 * Add module for Gaia mission
 * Add CCfits and cfitsio submodules and the implemented fitsfilereader module from the OpenSpace-sun-earth-event branch
 * Add a TaskRunner to read from a fits file
2018-11-20 18:19:08 -05:00
Alexander Bock
267879878b Beta-3 Release Candidate branch (#753)
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
2018-11-05 20:51:48 -05:00
Emil Axelsson
7181de4673 Feature/webgui ops (#723)
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
2018-11-05 20:45:38 -05:00
Alexander Bock
cdfd0d12da Add option for automatic caching of WMS servers into openspace.cfg
Remove all manual specification of caching and offline mode from manual wms servers
2018-11-02 15:34:36 -04:00
Alexander Bock
04846e3adf Disable progress bar on default 2018-09-03 00:58:26 -04:00
Alexander Bock
6ee31384d7 Add option to disable the console key (closes 655) 2018-07-18 14:25:04 -04:00
micahnyc
c9833197ff Feature/messenger mission (#627)
* mercury / messenger assets and scene
2018-06-25 11:29:47 -04:00
Emil Axelsson
af32212876 Use default scene by default 2018-06-25 09:55:24 +02:00
Alexander Bock
0f5fd2c4bc Feature/torrent removal (#630)
* Remove torrent-based synchronization downloads
 * Add download URL to error message if HTTPSynchronization download fails
 * Add a grace factor to the distance conversion
 * Don't use scientific notation when displaying distances
2018-06-23 22:20:03 -04:00
Jonathas Costa
18f771b02a Merged master 2018-05-14 15:36:44 -04:00
Jonathas Costa
25fbaf4294 Removed extra comma from configuration file. 2018-05-14 13:38:45 -04:00
Jonathas Costa
7ca335a324 New size control configurations for a few assets. 2018-04-21 16:38:54 -04:00
Jonathas Costa
fc71ad1a83 Copied changes from previous branch and added new size control system. 2018-04-21 15:17:41 -04:00
Jonathas Costa
4197bb8200 Merged master. 2018-04-20 21:37:40 -04:00
Alexander Bock
b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
62eca12e25 Enable 'tracked' viewports on default 2018-04-09 14:33:02 -04:00
Jonathas Costa
7583586178 Merge branch 'master' into feature/stereo-atm-merge 2018-03-21 18:44:33 -04:00
Gene Payne
9a44d9c9df Modified SGCT configuration commands to allow aspect ratio tracked keyword in openspace config file (#560) 2018-03-20 10:24:01 -04:00
Emil Axelsson
2eae7ac26d Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/PerformanceATM_and_Stereo 2018-03-20 13:45:15 +01:00
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Jonathas Costa
785d0ad294 Changes in framebuffer and atm code fixing wrong merge (still need clean up). 2018-03-19 12:29:05 -04:00
Emil Axelsson
4675554471 One Property Tree (#500)
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
Alexander Bock
9a00f38e09 Feature/jenkins warnings (#538)
* Remove warnings from Jenkins
 * Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
Alexander Bock
3ce9f523a6 Add new dedicated directory for screenshots
* Add ability to have current date in file name path
 * Remove SGCT_ prefix for screenshots (closes #449)
2018-02-26 23:46:03 -05:00
Alexander Bock
51551bc291 Move VRT specification into separate customization asset
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
Alexander Bock
cac2f24b40 Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary 2017-12-31 17:32:40 -05:00
Alexander Bock
1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
Alexander Bock
59916bc0c1 Renaming path tokens
- ${BASE_PATH} -> ${BASE}
  - ${OPENSPACE_DATA} -> ${DATA}
  - Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
Alexander Bock
339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
2017-12-26 20:13:23 +01:00
Alexander Bock
1079d67c9a Have the documentation print out more information if an error occurs
Add other scene files (commented out) to the openspace.cfg
2017-12-25 09:10:22 +01:00
Emil Axelsson
ab52504ec8 Restructure asset files 2017-12-18 18:55:12 +01:00
Emil Axelsson
90243cf388 Improve loading screen 2017-12-18 15:00:57 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock
7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Alexander Bock
2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
Alexander Bock
c9aedb084b Add Lua functions to query keyboard bindings and remove individual keybinds
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
2017-12-08 14:58:18 -05:00
Jonathas Costa
b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -05:00
Jonathas Costa
28fc1d08a7 Disabled OpenGL logging. 2017-12-05 11:02:12 -05:00
Emil Axelsson
fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Jonathas Costa
a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock
8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Jonathas Costa
cd1c695944 Improved RendedrablePlanesCloud rendering times. 2017-11-22 11:55:37 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00