Commit Graph

324 Commits

Author SHA1 Message Date
Emil Axelsson
f60371bdbc Pass on modifier keys to CEF for mouse events (#790)
* Update sgct
* Pass on modifier keys to CEF for mouse events
2019-02-04 15:14:51 +01: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
1632c09af3 Coordinate Axes
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
2018-11-13 08:09:14 -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
Gene Payne
b671ad35e6 Feature/session recording (#737)
* In progress with new version of session recording

* Session recording coding pass for both record and playback, not building yet.

* Working on getting first build of prototype

* Code changes to get playback working with all 3 timing modes

* Fixing session recording interactions with the timemanager

* Bug fixes for newly discovered timing issues, mothballing recording of timing updates

* Fixed camera jitter issue

* Updated new reference to latest ghoul

* Got session recording/playback working with changes made in master

* Added threshold for differences in camera movement as criteria for saving to recording file

* Added support for binary file for session recording/playback

* Minor changes with handling timeManager keyframes in playback

* New timeline structure & keyframes specific to session recording

* Fixed bug with fixed-script size

* Switched to new timeline specific to session recording, bug fixes, currently debugging camera position & rotation

* Formatting changes only

* Fixed scripts not working after timeline change

* Add session recording test scene

* Fixed problem with re-running the same playback multiple times

* Fixed problems with camera interpolation

* Fixed detection of camera playback finishing, and improved camera interpolation

* Added comments for interface of externInteraction include

* Fixed view frustum culling issues in session playback due to not appropiate camera scaling. Also made function in datamessagestructures to read and write this data to streams.

* Added camera scaling fix to code that supports Ascii format

* Added startPlayback default command for playing back while forcing simulation time to match the recording

* Fixed camera jump in sessionRecording after playback finished. Cleanup in playback of camera to re-use same functionality in keyframenavigator.

* Superb fix to sessionRecording. Realized focusNode of globalNavigationHandler needed to be activly update when camera change for either position of camera to be accurate or for rendered objects to be calculated without precision issues. Can now achieve a correct playback, even close to chunks/renderable, which was not possible before.

* sessionRecording cleanup, fixed all warnings and renamed files to lowercase to match current standards.

* Added error handling for bad input playback filename, protection from corrupted playback file

* Implemented code review changes on pull request #737 for sessionRecording
2018-11-01 18:24:10 -06:00
Alexander Bock
f630944fd8 Feature/minvr (#744)
* Move SGCT external library from ext/sgct to apps/OpenSpace/ext/sgct
 * Remove all GLFW dependencies from openspace-core
 * Add MinVR dependency
 * Add new executable OpenSpace-MinVR that uses MinVR instead of SGCT
2018-10-29 22:10:35 -04:00
Alexander Bock
8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Alexander Bock
c03ddf76cc Remove external control callback 2018-09-17 15:13:54 -04:00
Alexander Bock
f429959bba Register path tokens before the sgct configuration is loaded 2018-09-02 12:08:50 -04:00
Alexander Bock
24ef67afa0 Add helper methods to quickly render boxes (finalizing and #closes 696) 2018-09-02 02:18:40 -04:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock
1f7b482efa Add Lua functions to print cluster id (closes #704) 2018-08-28 13:58:32 -04:00
Alexander Bock
4d901b688b Make it possible to not load an asset on default and later load it at runtime (closes #694) 2018-08-24 02:34:55 -06:00
Alexander Bock
6ee31384d7 Add option to disable the console key (closes 655) 2018-07-18 14:25:04 -04:00
Alexander Bock
190952e4f5 Feature/jenkins fixes (#634)
Jenkins compile fixes
2018-06-26 16:53:22 -04:00
Alexander Bock
f4d67893b4 Add support for checking of OpenGL extensions to provide better error messages 2018-06-26 11:51:21 -04:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Jonathas Costa
29d0a94782 Automatic billboard orientation based on projection type. 2018-06-04 16:28:54 -04:00
Jonathas Costa
f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
Alexander Bock
7068637c9d Make it possible to click on the friction markers in the image to toggle the friction (closes issue #576) 2018-04-21 19:04:47 +00:00
Alexander Bock
5e1f26cc6b Issue/372 (#606)
* Add commandline argument that applies a Lua script to the configuration
2018-04-21 09:54:05 -04:00
Alexander Bock
db66084ad8 Fix warnings and coding style issues 2018-04-21 08:27:20 -04:00
Alexander Bock
818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -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
Alexander Bock
3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Jonathas Costa
5079beba78 Added new method to get the right viewport size in stereo (side-by-side) and fix font rendering. 2018-04-20 11:22:23 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Alexander Bock
40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Alexander Bock
ae7e22dfe0 Adapt to typesafe ghoul::Boolean parameters 2018-03-30 13:03:17 -04:00
Emil Axelsson
6b10441222 Fix comment 2018-03-22 18:18:37 +01:00
Emil Axelsson
e8b260915e Render GUI on whole screen when rendering side-by-side and top-bottom stereo 2018-03-22 18:15:56 +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
Alexander Bock
db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Alexander Bock
9709b22bac Turn Configuration keys from std::string to constexpr const char* for better startup performance 2018-03-08 19:24:03 +01: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
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
475a9f6937 Hide the overlay information on slave nodes 2018-02-15 10:37:49 -05:00
Emil Axelsson
a85eddff4e Clean up lua stack and weak pointers 2018-02-09 16:44:34 +01: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
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
b337c3aa1e Windows compile fix 2017-12-28 14:15:06 -05: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
Emil Axelsson
09182c9274 Cleanup code 2017-12-19 11:48:30 +01:00
Emil Axelsson
ff317d4b2f Show loading screen when loading assets 2017-12-18 11:55:14 +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
Alexander Bock
167222c814 Feature/dashboard (#431)
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00